产品管理相关

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoods.java

@@ -48,11 +48,6 @@ public class KwpGoods extends BaseModel {
      */
     private Long typeId;
 
-    /**
-     * 行业id
-     */
-    private Long industryId;
-
     /**
      * 库存数量
      */
@@ -76,7 +71,7 @@ public class KwpGoods extends BaseModel {
     /**
      * 交易方式(合同采购、直接采购、预付款、货到付款、到款发货）
      */
-    private Long trading;
+    private String trading;
 
     /**
      * 预付款最低限额

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsAddress.java

@@ -32,7 +32,7 @@ public class KwpGoodsAddress extends BaseModel {
     /**
      * 地址类型
      */
-    private Long type;
+    private String type;
 
     /**
      * 联系人姓名

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsParam.java

@@ -68,7 +68,7 @@ public class AddGoodsParam {
      * 交易方式(合同采购、直接采购、预付款、货到付款、到款发货）
      */
     @NotNull(message = "交易方式不能为空")
-    private Long trading;
+    private String trading;
 
     /**
      * 预付款最低限额(万元)

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddressInfo.java

@@ -26,7 +26,7 @@ public class AddressInfo {
      * 地址类型
      */
     @NotNull(message = "地址类型不能为空")
-    private Long type;
+    private String type;
 
     /**
      * 联系人

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/BuildingMaterialsMarketListParam.java

@@ -50,6 +50,6 @@ public class BuildingMaterialsMarketListParam extends PageRequest {
     /**
      * 交易方式(预付款、货到付款、线下付款）
      */
-    private List<Long> tradings;
+    private List<String> tradings;
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsListParam.java

@@ -48,7 +48,7 @@ public class GoodsListParam {
     /**
      * 交易方式集合
      */
-    private List<Long> tradings;
+    private List<String> tradings;
 
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/SelectGoodsListParam.java

@@ -49,7 +49,7 @@ public class SelectGoodsListParam extends PageRequest {
     /**
      * 交易方式集合
      */
-    private List<Long> tradings;
+    private List<String> tradings;
 
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/UpdateGoodsParam.java

@@ -70,7 +70,7 @@ public class UpdateGoodsParam {
     /**
      * 交易方式(合同采购、直接采购、预付款、货到付款、到款发货）
      */
-    private Long trading;
+    private String trading;
 
     /**
      * 预付款最低限额(万元)

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -481,8 +481,7 @@ public class KwpGoodsService {
         LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(params.getKeywords()), KwpGoods::getName, params.getKeywords())
                 .in(CollectionUtils.isNotEmpty(typeIds), KwpGoods::getTypeId, typeIds)
-                .in(CollectionUtils.isNotEmpty(params.getIndustryIds()), KwpGoods::getIndustryId, params.getIndustryIds())
-                .in(CollectionUtils.isNotEmpty(params.getTradings()), KwpGoods::getTypeId, params.getTradings())
+                .in(CollectionUtils.isNotEmpty(params.getTradings()), KwpGoods::getTrading, params.getTradings())
                 .eq(KwpGoods::getStatus, GoodsStatusEnum.PUT_ON_SHELVES.getCode()).eq(KwpGoods::getDelFlag, Global.NO);
         List<KwpGoods> list = kwpGoodsMapper.selectList(wrapper);
         List<BuildingMaterialsMarketList> result = BeanUtils.copyToList(list, BuildingMaterialsMarketList.class);