联调

ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java

@@ -254,6 +254,9 @@ public class StoreOrderInfoVO {
     @ApiModelProperty(value = "下单用户手机号")
     private String orderUserPhoneNumber;
 
+    @ApiModelProperty(value = "付款时间")
+    private Date payTime;
+
 
     @ApiModel
     @Data
@@ -434,6 +437,15 @@ public class StoreOrderInfoVO {
         @ApiModelProperty(value = "退货原商品数量")
         private Integer originGoodsQuantity;
 
+        @ApiModelProperty(value = "档口ID")
+        private Long storeId;
+
+        @ApiModelProperty(value = "档口名称")
+        private String storeName;
+
+        @ApiModelProperty(value = "档口地址")
+        private String storeAddress;
+
     }
 
     @ApiModel

ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderQueryVO.java

@@ -34,6 +34,11 @@ public class StoreOrderQueryVO extends BasePageVO {
      */
     @ApiModelProperty(value = "订单号（模糊）")
     private String orderNo;
+    /**
+     * 订单类型[1:销售订单 2:退货订单]
+     */
+    @ApiModelProperty(value = "订单类型[1:销售订单 2:退货订单]")
+    private Integer orderType;
     /**
      * 订单状态（1开头为销售订单状态，2开头为退货订单状态）[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成]
      */

xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java

@@ -32,4 +32,10 @@ public class StoreOrderDetailInfoDTO extends StoreOrderDetailDTO {
     private Integer originOrderDetailStatus;
 
     private Integer originGoodsQuantity;
+
+    private Long storeId;
+
+    private String storeName;
+
+    private String storeAddress;
 }

xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderInfoDTO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,6 +39,7 @@ public class StoreOrderInfoDTO extends StoreOrderDTO {
 
     private String orderUserPhoneNumber;
 
+    private Date payTime;
 
     private List<StoreOrderDetailInfoDTO> orderDetails;
 

xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java

@@ -27,6 +27,10 @@ public class StoreOrderQueryDTO extends BasePageDTO {
      * 订单号（模糊）
      */
     private String orderNo;
+    /**
+     * 订单类型[1:销售订单 2:退货订单]
+     */
+    private Integer orderType;
     /**
      * 订单状态（1开头为销售订单状态，2开头为退货订单状态）[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成]
      */

xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java

@@ -421,6 +421,18 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
                         (o, n) -> n));
         for (StoreOrderDetailInfoDTO detailInfo : detailInfos) {
             detailInfo.setFirstMainPicUrl(mainPicMap.get(detailInfo.getStoreProdId()));
+            //档口信息
+            if (store != null) {
+                detailInfo.setStoreId(store.getId());
+                detailInfo.setStoreName(store.getStoreName());
+                detailInfo.setStoreAddress(store.getStoreAddress());
+            }
+        }
+        //付款记录
+        StoreOrderOperationRecordDTO payRecord = operationRecordService.getOneRecord(storeOrderId,
+                EOrderTargetTypeAction.ORDER, EOrderAction.SHIP);
+        if (payRecord != null) {
+            orderInfo.setPayTime(payRecord.getOperationTime());
         }
         //下单用户信息
         SysUser orderUser = sysUserMapper.selectUserById(orderInfo.getOrderUserId());

xkt/src/main/resources/mapper/StoreOrderMapper.xml

@@ -24,6 +24,9 @@
             <if test="orderNo != null and orderNo !=''">
                 AND so.order_no LIKE CONCAT('%', #{orderNo}, '%')
             </if>
+            <if test="orderType != null">
+                AND so.order_type = #{orderType}
+            </if>
             <if test="orderStatus != null">
                 AND so.order_status = #{orderStatus}
             </if>