dd

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/vo/ShopOrderDetailVo.java

@@ -311,7 +311,7 @@ public class ShopOrderDetailVo extends BaseVo {
     private TransactionStatus transactionStatus;
 
     @ApiModelProperty("订单状态导出用")
-    @Excel(name = "订单状态", orderNum = "11", replace = {"待支付_0","待发货_10","待收货_20","交易完成_20","订单已取消_100"} ,width = 15D, needMerge = true)
+    @Excel(name = "订单状态", orderNum = "11", replace = {"待支付_0","待发货_10","待收货_20","交易完成_30","订单已取消_100"} ,width = 15D, needMerge = true)
     private Integer transactionStatusValue;
     /**
      * paymentStatus
@@ -364,14 +364,14 @@ public class ShopOrderDetailVo extends BaseVo {
     @ApiModelProperty("维权方式(0未维权,5退款,10退货退款)")
     private RightsMethod rightsMethod;
 
-    @Excel(name = "支付状态", orderNum = "12", replace = {"未维权_0", "退款_5","退货退款_10"},width = 15D, needMerge = true)
+    @Excel(name = "维权方式", orderNum = "12", replace = {"未维权_0", "退款_5","退货退款_10"},width = 15D, needMerge = true)
     @ApiModelProperty("维权方式导出用")
     private Integer rightsMethodValue;
 
     /**
      * 维权数量
      */
-    @Excel(name = "支付状态", orderNum = "13",width = 15D, needMerge = true)
+    @Excel(name = "维权数量", orderNum = "13",width = 15D, needMerge = true)
     @ExcelProperty(value = "维权数量")
     @ApiModelProperty("维权数量")
     private Integer rightsNum;

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/vo/ShopOrderVo.java

@@ -167,7 +167,7 @@ public class ShopOrderVo extends BaseVo {
     private TransactionStatus transactionStatus;
 
     @ApiModelProperty("订单状态导出用")
-    @Excel(name = "订单状态", orderNum = "8", replace = {"待支付_0","待发货_10","待收货_20","交易完成_20","订单已取消_100"} ,width = 15D, needMerge = true)
+    @Excel(name = "订单状态", orderNum = "8", replace = {"待支付_0","待发货_10","待收货_20","交易完成_30","订单已取消_100"} ,width = 15D, needMerge = true)
     private Integer transactionStatusValue;
 
     /**
@@ -241,7 +241,7 @@ public class ShopOrderVo extends BaseVo {
     private CommentStatus commentStatus;
 
     @ApiModelProperty("评价状态导出用")
-    @Excel(name = "支付状态", orderNum = "13", replace = {"用户未评_0", "部分已评_1","全部已评_2"},width = 15D, needMerge = true)
+    @Excel(name = "评价状态", orderNum = "13", replace = {"用户未评_0", "部分已评_1","全部已评_2"},width = 15D, needMerge = true)
     private Integer commentStatusValue;
 
     /**
@@ -252,7 +252,7 @@ public class ShopOrderVo extends BaseVo {
     @ApiModelProperty("维权方式(0未维权,5退款,10退货退款)")
     private RightsMethod rightsMethod;
 
-    @Excel(name = "支付状态", orderNum = "14", replace = {"未维权_0", "退款_5","退货退款_10"},width = 15D, needMerge = true)
+    @Excel(name = "维权方式", orderNum = "14", replace = {"未维权_0", "退款_5","退货退款_10"},width = 15D, needMerge = true)
     @ApiModelProperty("维权方式导出用")
     private Integer rightsMethodValue;
 
@@ -412,7 +412,7 @@ public class ShopOrderVo extends BaseVo {
     /**
      * 订单下单时间
      */
-    @Excel(name = "下单时间", orderNum = "29",databaseFormat = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
+    @Excel(name = "下单时间", orderNum = "29",format = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
     @ExcelProperty(value = "订单下单时间")
     @ApiModelProperty("订单下单时间")
     private Date orderTime;
@@ -420,7 +420,7 @@ public class ShopOrderVo extends BaseVo {
     /**
      * 订单支付时间
      */
-    @Excel(name = "支付时间", orderNum = "30",databaseFormat = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
+    @Excel(name = "支付时间", orderNum = "30",format = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
     @ExcelProperty(value = "订单支付时间")
     @ApiModelProperty("订单支付时间")
     private Date paymentTime;
@@ -428,7 +428,7 @@ public class ShopOrderVo extends BaseVo {
     /**
      * 包裹最后发货时间
      */
-    @Excel(name = "发货时间", orderNum = "31",databaseFormat = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
+    @Excel(name = "发货时间", orderNum = "31",format = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
     @ExcelProperty(value = "包裹最后发货时间")
     @ApiModelProperty("包裹最后发货时间")
     private Date shippingTime;
@@ -436,7 +436,7 @@ public class ShopOrderVo extends BaseVo {
     /**
      * 包裹最后收货时间
      */
-    @Excel(name = "收货时间", orderNum = "32",databaseFormat = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
+    @Excel(name = "收货时间", orderNum = "32",format = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
     @ExcelProperty(value = "包裹最后收货时间")
     @ApiModelProperty("包裹最后收货时间")
     private Date actualReceivingTime;
@@ -452,7 +452,7 @@ public class ShopOrderVo extends BaseVo {
     /**
      * 完成时间
      */
-    @Excel(name = "收货时间", orderNum = "33",databaseFormat = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
+    @Excel(name = "收货时间", orderNum = "33",format = "yyyy-MM-dd HH:mm:ss", width = 15D, needMerge = true)
     @ExcelProperty(value = "完成时间")
     @ApiModelProperty("完成时间")
     private Date completionTime;
@@ -604,7 +604,7 @@ public class ShopOrderVo extends BaseVo {
         return orderDetails;
     }
 
-    @ExcelEntity(id="orderAddress")
+    @ExcelEntity(id="orderAddress",name = "收货地址")
     @ApiModelProperty("订单地址")
     private ShopOrderAddressVo orderAddress;
 
@@ -627,7 +627,7 @@ public class ShopOrderVo extends BaseVo {
         return orderAddress;
     }
 
-    @ExcelEntity(id="orderSelfPickup")
+    @ExcelEntity(id="orderSelfPickup",name = "自提信息")
     @ApiModelProperty("订单自提信息")
     private ShopOrderAddressSelfPickupVo orderSelfPickup;
 
@@ -699,5 +699,6 @@ public class ShopOrderVo extends BaseVo {
         this.rightsMethodValue = this.rightsMethod.getCode();
         this.rightsStatusValue = this.rightsStatus.getCode();
         this.sellerMarkValue = this.sellerMark.getCode();
+        this.paymentMethodValue = this.paymentMethod.getCode();
     }
 }

ruoyi-shop/src/main/resources/mapper/order/ShopOrderMapper.xml

@@ -180,8 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         od.create_time as od_create_time,
         od.update_time as od_update_time,
         od.`end` as od_end,
-        od.freight_template_id as od_freight_template_id,
-        od.activity_id as od_activity_id
+        od.freight_template_id as od_freight_template_id
     </sql>
     <sql id="shopOrderAddressColumn">
         oa.order_address_id as oa_order_address_id,