change: 添加shopId

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/vo/ProductCommentCreateReqVO.java

@@ -46,4 +46,6 @@ public class ProductCommentCreateReqVO {
     @Size(max = 9, message = "评论图片地址数组长度不能超过 9 张")
     private List<String> picUrls;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/vo/ProductCommentPageReqVO.java

@@ -44,4 +44,6 @@ public class ProductCommentPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/vo/ProductCommentRespVO.java

@@ -79,4 +79,6 @@ public class ProductCommentRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java

@@ -27,4 +27,8 @@ public class ProductPropertyPageReqVO extends PageParam {
     @Schema(description = "创建时间")
     private LocalDateTime[] createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
+
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java

@@ -21,4 +21,7 @@ public class ProductPropertyRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/property/ProductPropertySaveReqVO.java

@@ -19,4 +19,7 @@ public class ProductPropertySaveReqVO {
     @Schema(description = "备注", example = "颜色")
     private String remark;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java

@@ -21,4 +21,6 @@ public class ProductPropertyValuePageReqVO extends PageParam {
     @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java

@@ -28,4 +28,6 @@ public class ProductPropertyValueRespVO {
     @Schema(description = "创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/property/vo/value/ProductPropertyValueSaveReqVO.java

@@ -24,4 +24,6 @@ public class ProductPropertyValueSaveReqVO {
     @Schema(description = "备注", example = "颜色")
     private String remark;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuRespVO.java

@@ -55,5 +55,7 @@ public class ProductSkuRespVO {
     private String mark;
 
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java

@@ -80,4 +80,6 @@ public class ProductSkuSaveReqVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java

@@ -69,4 +69,6 @@ public class ProductSpuPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String mark;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuRespVO.java

@@ -129,4 +129,6 @@ public class ProductSpuRespVO {
     @Schema(description = "商品类别", example = "1")
     private Integer spuType;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java

@@ -99,4 +99,6 @@ public class ProductSpuSaveReqVO {
     @Schema(description = "商品类别", example = "1")
     private Integer spuType;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java

@@ -38,4 +38,6 @@ public class ProductSpuSimpleRespVO {
     @Schema(description = "商品浏览量", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
     private Integer browseCount;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/comment/ProductCommentDO.java

@@ -156,4 +156,7 @@ public class ProductCommentDO extends BaseDO {
      */
     private LocalDateTime replyTime;
 
+
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/property/ProductPropertyDO.java

@@ -48,4 +48,6 @@ public class ProductPropertyDO extends BaseDO {
      */
     private String remark;
 
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/property/ProductPropertyValueDO.java

@@ -52,4 +52,6 @@ public class ProductPropertyValueDO extends BaseDO {
      */
     private String remark;
 
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/sku/ProductSkuDO.java

@@ -104,6 +104,7 @@ public class ProductSkuDO extends BaseDO {
     private String mark;
 
 
+    private Long shopId;
     /**
      * 商品属性
      */

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/spu/ProductSpuDO.java

@@ -178,4 +178,7 @@ public class ProductSpuDO extends BaseDO {
     private Integer spuType;
 
 
+    private Long shopId;
+
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/comment/ProductCommentMapper.java

@@ -17,6 +17,7 @@ public interface ProductCommentMapper extends BaseMapperX<ProductCommentDO> {
                 .likeIfPresent(ProductCommentDO::getUserNickname, reqVO.getUserNickname())
                 .eqIfPresent(ProductCommentDO::getOrderId, reqVO.getOrderId())
                 .eqIfPresent(ProductCommentDO::getSpuId, reqVO.getSpuId())
+                .eqIfPresent(ProductCommentDO::getShopId, reqVO.getShopId())
                 .eqIfPresent(ProductCommentDO::getScores, reqVO.getScores())
                 .eqIfPresent(ProductCommentDO::getReplyStatus, reqVO.getReplyStatus())
                 .betweenIfPresent(ProductCommentDO::getCreateTime, reqVO.getCreateTime())

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/property/ProductPropertyMapper.java

@@ -13,6 +13,7 @@ public interface ProductPropertyMapper extends BaseMapperX<ProductPropertyDO> {
     default PageResult<ProductPropertyDO> selectPage(ProductPropertyPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductPropertyDO>()
                 .likeIfPresent(ProductPropertyDO::getName, reqVO.getName())
+                .eqIfPresent(ProductPropertyDO::getShopId, reqVO.getShopId())
                 .betweenIfPresent(ProductPropertyDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ProductPropertyDO::getId));
     }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/property/ProductPropertyValueMapper.java

@@ -32,6 +32,7 @@ public interface ProductPropertyValueMapper extends BaseMapperX<ProductPropertyV
     default PageResult<ProductPropertyValueDO> selectPage(ProductPropertyValuePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductPropertyValueDO>()
                 .eqIfPresent(ProductPropertyValueDO::getPropertyId, reqVO.getPropertyId())
+                .eqIfPresent(ProductPropertyValueDO::getShopId, reqVO.getShopId())
                 .likeIfPresent(ProductPropertyValueDO::getName, reqVO.getName())
                 .orderByDesc(ProductPropertyValueDO::getId));
     }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/spu/ProductSpuMapper.java

@@ -28,6 +28,7 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
         Integer tabType = reqVO.getTabType();
         LambdaQueryWrapperX<ProductSpuDO> queryWrapper = new LambdaQueryWrapperX<ProductSpuDO>()
                 .likeIfPresent(ProductSpuDO::getName, reqVO.getName())
+                .eqIfPresent(ProductSpuDO::getShopId,reqVO.getShopId())
                 .eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId())
                 .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(ProductSpuDO::getSort);

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

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

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

@@ -49,4 +49,6 @@ public class AfterSaleDetailRespVO extends AfterSaleBaseVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

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

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/express/DeliveryExpressBaseVO.java

@@ -31,4 +31,7 @@ public class DeliveryExpressBaseVO {
     @NotNull(message = "状态不能为空")
     private Integer status;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/express/DeliveryExpressExportReqVO.java

@@ -24,5 +24,6 @@ public class DeliveryExpressExportReqVO {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/express/DeliveryExpressPageReqVO.java

@@ -27,5 +27,6 @@ public class DeliveryExpressPageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplatePageReqVO.java

@@ -26,5 +26,6 @@ public class DeliveryExpressTemplatePageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreBaseVO.java

@@ -64,5 +64,6 @@ public class DeliveryPickUpStoreBaseVO {
     @NotNull(message = "门店状态不能为空")
     @InEnum(CommonStatusEnum.class)
     private Integer status;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStorePageReqVO.java

@@ -36,5 +36,6 @@ public class DeliveryPickUpStorePageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
-
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

@@ -148,4 +148,6 @@ public class TradeOrderBaseVO {
     @Schema(description = "推广人编号", example = "1")
     private Long brokerageUserId;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

@@ -64,4 +64,6 @@ public class TradeOrderItemBaseVO {
     @Schema(description = "售后状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer afterSaleStatus;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

@@ -32,4 +32,6 @@ public class TradeOrderPageItemRespVO extends TradeOrderBaseVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

@@ -61,4 +61,6 @@ public class TradeOrderPageReqVO extends PageParam {
     @InEnum(value = TerminalEnum.class, message = "订单来源 {value}")
     private Integer terminal;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

@@ -144,4 +144,6 @@ public class AppTradeOrderDetailRespVO {
      */
     private List<AppTradeOrderItemRespVO> items;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

@@ -50,4 +50,6 @@ public class AppTradeOrderPageItemRespVO {
      */
     private List<AppTradeOrderItemRespVO> items;
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

@@ -102,4 +102,6 @@ public class AppTradeOrderSettlementReqVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

@@ -122,4 +122,6 @@ public class AppTradeOrderSettlementRespVO {
 
     }
 
+    @Schema(description = "店铺id", example = "20588")
+    private Long shopId;
 }

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

@@ -198,4 +198,8 @@ public class AfterSaleDO extends BaseDO {
      */
     private String receiveReason;
 
+
+
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/delivery/DeliveryExpressTemplateDO.java

@@ -40,4 +40,7 @@ public class DeliveryExpressTemplateDO extends BaseDO {
      */
     private Integer sort;
 
+
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/delivery/DeliveryPickUpStoreDO.java

@@ -81,4 +81,5 @@ public class DeliveryPickUpStoreDO extends BaseDO {
      */
     private Integer status;
 
+    private Long shopId;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -330,4 +330,7 @@ public class TradeOrderDO extends BaseDO {
      */
     private Long combinationRecordId;
 
+
+    private Long shopId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/aftersale/AfterSaleMapper.java

@@ -19,6 +19,7 @@ public interface AfterSaleMapper extends BaseMapperX<AfterSaleDO> {
                 .likeIfPresent(AfterSaleDO::getNo, reqVO.getNo())
                 .eqIfPresent(AfterSaleDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(AfterSaleDO::getType, reqVO.getType())
+                .eqIfPresent(AfterSaleDO::getShopId,reqVO.getShopId())
                 .eqIfPresent(AfterSaleDO::getWay, reqVO.getWay())
                 .likeIfPresent(AfterSaleDO::getOrderNo, reqVO.getOrderNo())
                 .likeIfPresent(AfterSaleDO::getSpuName, reqVO.getSpuName())

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/delivery/DeliveryExpressTemplateMapper.java

@@ -15,12 +15,13 @@ public interface DeliveryExpressTemplateMapper extends BaseMapperX<DeliveryExpre
         return selectPage(reqVO, new LambdaQueryWrapperX<DeliveryExpressTemplateDO>()
                 .likeIfPresent(DeliveryExpressTemplateDO::getName, reqVO.getName())
                 .eqIfPresent(DeliveryExpressTemplateDO::getChargeMode, reqVO.getChargeMode())
+                .eqIfPresent(DeliveryExpressTemplateDO::getShopId, reqVO.getShopId())
                 .betweenIfPresent(DeliveryExpressTemplateDO::getCreateTime, reqVO.getCreateTime())
                 .orderByAsc(DeliveryExpressTemplateDO::getSort));
     }
 
     default DeliveryExpressTemplateDO selectByName(String name) {
-        return selectOne(DeliveryExpressTemplateDO::getName,name);
+        return selectOne(DeliveryExpressTemplateDO::getName, name);
     }
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/delivery/DeliveryPickUpStoreMapper.java

@@ -18,6 +18,7 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX<DeliveryPickUpSto
                 .eqIfPresent(DeliveryPickUpStoreDO::getPhone, reqVO.getPhone())
                 .eqIfPresent(DeliveryPickUpStoreDO::getAreaId, reqVO.getAreaId())
                 .eqIfPresent(DeliveryPickUpStoreDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(DeliveryPickUpStoreDO::getShopId, reqVO.getShopId())
                 .betweenIfPresent(DeliveryPickUpStoreDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(DeliveryPickUpStoreDO::getId));
     }