Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

# Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java # yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java # yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java # yudao-server/pom.xml # yudao-server/src/main/resources/application-local.yaml # yudao-server/src/main/resources/application.yaml # yudao-ui-admin/src/views/mall/CouponTemplete/index.vue # yudao-ui-admin/src/views/mall/product/property/index.vue # yudao-ui-admin/src/views/mall/product/spu/index.vue # yudao-ui-admin/src/views/mall/product/spu/save.vue # yudao-ui-admin/src/views/system/role/index.vue
2025-08-14 02:01:53 +08:00 · 2022-11-13 12:07:59 +08:00
parent 5934d6b029 29cd9b79de
commit afc76973ce
744 changed files with 31401 additions and 21982 deletions
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
@@ -53,8 +53,8 @@ public class AppTradeOrderController {

    @GetMapping("/get")
    @ApiOperation("获得交易订单")
-    @ApiImplicitParam(name = "id", value = "交易订单编号", required = true, dataTypeClass = Long.class)
-    public CommonResult<TradeOrderRespVO> getTradeOrder(@RequestParam("id") Integer id) {
+    @ApiImplicitParam(name = "tradeOrderId", value = "交易订单编号", required = true, dataTypeClass = Long.class)
+    public CommonResult<TradeOrderRespVO> getTradeOrder(@RequestParam("tradeOrderId") Integer tradeOrderId) {
 //        return success(tradeOrderService.getTradeOrder(tradeOrderId));
        return null;
    }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import java.util.Date;
+import java.time.LocalDateTime;

@ApiModel("交易订单项 Response VO")
@Data
@@ -47,7 +47,7 @@ public class TradeOrderItemRespVO {
    @ApiModelProperty(value = "售后订单编号")
    private Integer afterSaleOrderId;
    @ApiModelProperty(value = "创建时间", required = true)
-    private Date createTime;
+    private LocalDateTime createTime;


 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.trade.controller.app.order.vo;

 import lombok.*;
 import io.swagger.annotations.*;
+
+import java.time.LocalDateTime;
 import java.util.*;

@ApiModel("订单交易 Response VO")
@@ -19,7 +21,7 @@ public class TradeOrderRespVO {
    @ApiModelProperty(value = "备注")
    private String remark;
    @ApiModelProperty(value = "订单结束时间")
-    private Date endTime;
+    private LocalDateTime endTime;
    @ApiModelProperty(value = "订单金额(总金额)，单位：分", required = true)
    private Integer buyPrice;
    @ApiModelProperty(value = "优惠总金额，单位：分", required = true)
@@ -33,7 +35,7 @@ public class TradeOrderRespVO {
    @ApiModelProperty(value = "退款金额，单位：分", required = true)
    private Integer refundPrice;
    @ApiModelProperty(value = "付款时间")
-    private Date payTime;
+    private LocalDateTime payTime;
    @ApiModelProperty(value = "支付订单编号")
    private Integer payTransactionId;
    @ApiModelProperty(value = "支付渠道")
@@ -41,9 +43,9 @@ public class TradeOrderRespVO {
    @ApiModelProperty(value = "配送类型", required = true)
    private Integer deliveryType;
    @ApiModelProperty(value = "发货时间")
-    private Date deliveryTime;
+    private LocalDateTime deliveryTime;
    @ApiModelProperty(value = "收货时间")
-    private Date receiveTime;
+    private LocalDateTime receiveTime;
    @ApiModelProperty(value = "收件人名称", required = true)
    private String receiverName;
    @ApiModelProperty(value = "手机号", required = true)
@@ -57,7 +59,7 @@ public class TradeOrderRespVO {
    @ApiModelProperty(value = "优惠劵编号")
    private Integer couponCardId;
    @ApiModelProperty(value = "创建时间", required = true)
-    private Date createTime;
+    private LocalDateTime createTime;

    /**
     * 订单项数组
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;

-import java.util.Date;
+import java.time.LocalDateTime;

 /**
 * 交易订单 DO
@@ -79,11 +79,11 @@ public class TradeOrderDO extends BaseDO {
    /**
     * 订单完成时间
     */
-    private Date finishTime;
+    private LocalDateTime finishTime;
    /**
     * 订单取消时间
     */
-    private Date cancelTime;
+    private LocalDateTime cancelTime;
    /**
     * 取消类型
     *
@@ -106,7 +106,7 @@ public class TradeOrderDO extends BaseDO {
    /**
     * 付款时间
     */
-    private Date payTime;
+    private LocalDateTime payTime;

    // ========== 价格 + 支付基本信息 ==========
    // 价格文档 - 淘宝：https://open.taobao.com/docV3.htm?docId=108471&docType=1
@@ -191,11 +191,11 @@ public class TradeOrderDO extends BaseDO {
    /**
     * 发货时间
     */
-    private Date deliveryTime;
+    private LocalDateTime deliveryTime;
    /**
     * 收货时间
     */
-    private Date receiveTime;
+    private LocalDateTime receiveTime;
    /**
     * 收件人名称
     */
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/refund/TradeRefundDO.java
@@ -12,7 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;

 /**
@@ -75,7 +75,7 @@ public class TradeRefundDO extends BaseDO {
    /**
     * 商家处理时间
     */
-    private Date handleTime; // handel_time
+    private LocalDateTime handleTime; // handel_time
    /**
     * 商家拒绝理由
     */
@@ -132,7 +132,7 @@ public class TradeRefundDO extends BaseDO {
    /**
     * 退货时间
     */
-    private Date returnDate; // ship_time
+    private LocalDateTime returnDate; // ship_time

    // ========== 收获相关 ==========

@@ -143,6 +143,6 @@ public class TradeRefundDO extends BaseDO {
    /**
     * 收货时间
     */
-    private Date receiveDate; // receive_time
+    private LocalDateTime receiveDate; // receive_time

 }