售后添加商户ID以及店铺ID

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/aftersale/vo/AfterSaleBaseVO.java

@@ -116,6 +116,11 @@ public class AfterSaleBaseVO {
     @Schema(description = "收货备注", example = "不喜欢")
     private String receiveReason;
 
-    @Schema(description = "店铺id", example = "20588")
+    @Schema(description = "店铺id", example = "17019")
     private Long shopId;
+
+    @Schema(description = "商户id", example = "27067")
+    private Long merchantId;
+
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/aftersale/vo/AfterSaleDetailRespVO.java

@@ -48,7 +48,10 @@ public class AfterSaleDetailRespVO extends AfterSaleBaseVO {
         private List<ProductPropertyValueDetailRespVO> properties;
 
     }
-
-    @Schema(description = "店铺id", example = "20588")
+    @Schema(description = "店铺id", example = "17019")
     private Long shopId;
+
+    @Schema(description = "商户id", example = "27067")
+    private Long merchantId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/aftersale/vo/AfterSalePageReqVO.java

@@ -46,6 +46,9 @@ public class AfterSalePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "店铺id", example = "20588")
+    @Schema(description = "店铺id", example = "17019")
     private Long shopId;
+
+    @Schema(description = "商户id", example = "27067")
+    private Long merchantId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/aftersale/vo/AppAfterSaleCreateReqVO.java

@@ -37,4 +37,6 @@ public class AppAfterSaleCreateReqVO {
     @Schema(description = "补充凭证图片", example = "https://www.zhongxing.cn/1.png, https://www.zhongxing.cn/2.png")
     private List<String> applyPicUrls;
 
+
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/aftersale/AfterSaleDO.java

@@ -200,6 +200,13 @@ public class AfterSaleDO extends BaseDO {
 
 
 
+    /**
+     * 店铺id
+     */
     private Long shopId;
+    /**
+     * 商户id
+     */
+    private Long merchantId;
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -109,6 +109,9 @@ public class AfterSaleServiceImpl implements AfterSaleService {
 
         // 第二步，存储售后订单
         AfterSaleDO afterSale = createAfterSale(createReqVO, tradeOrderItem);
+
+        // todo 向售后订单中添加商户id以及店铺ID
+
         return afterSale.getId();
     }