diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java index 4cc9109d..a2b6220d 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java @@ -42,7 +42,6 @@ import java.util.stream.Collectors; public class BmsChannelPointController { private BmsChannelPointService bmsChannelPointService; - private BmsChannelService bmsChannelService; private BmsRegionService bmsRegionService; private BmsRegion2Service bmsRegion2Service; private TbsActivityChannelPointService activityChannelPointService; diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java index 90d4164c..4ecd3968 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java @@ -77,5 +77,8 @@ public class BmsChannel implements Serializable { @TableField(fill = FieldFill.UPDATE) private String updateBy; + /** 可投放费用标识 */ + private Integer costFlag; + } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java index 420dde33..3e9e494b 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java @@ -113,6 +113,9 @@ public class BmsChannelPoint implements Serializable { @JsonProperty private String delFlag; + /** 可投放费用标识 */ + private Integer costFlag; + /** 创建人 */ @TableField(fill = FieldFill.INSERT) private String createBy; diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index 3192872e..5cb6d2a2 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -143,6 +143,9 @@ public class BmsSupplier implements Serializable { @NotNull(message = "初始化欠费(历史记录)不能为空") private BigDecimal initHisAmount; + /** 可投放费用标识 */ + private Integer costFlag; + /** 当前用户ID */ @TableField(exist = false) private String currUserId; diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java index fb94959e..54483d26 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java @@ -65,4 +65,7 @@ public class BmsChannelPointBo { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 可投放费用标识 */ + private Integer costFlag; + } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java index ab898786..135317ae 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java @@ -48,4 +48,6 @@ public class BmsSupplierBo { /** 其它负责人 */ private String[] otherMgrIds; + /** 可投放费用标识 */ + private Integer costFlag; } diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java index f962fa28..67f1e739 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java @@ -91,6 +91,7 @@ public class GoodsCategoryController { GoodsCategoryTreeVo treeNode = CopierUtil.copy(cate,new GoodsCategoryTreeVo()); treeNode.setId(cate.getId()+""); treeNode.setParentId(cate.getParentId().toString()); + treeNode.setCostFlag(cate.getCostFlag()); treeNode.setSort(0); treeNode.setEnable(cate.getEnable()+""); if(loadSpuData && cate.getLevel().equals(3)){ @@ -103,6 +104,7 @@ public class GoodsCategoryController { spuNode.setEnable("1"); spuNode.setCode(goodsSpu.getSpuCode()); spuNode.setName(goodsSpu.getName()); + spuNode.setCostFlag(goodsSpu.getCostFlag()); treeNode.addChildren(spuNode); } } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java index e94d42cc..eb5f29e2 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java @@ -92,6 +92,9 @@ public class GoodsCategory implements Serializable { @TableField(fill = FieldFill.UPDATE) private String updateBy; + /** 可投放费用标识 */ + private Integer costFlag; + @TableField(exist = false) private Object parentInfo; diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java index 63aa4e6f..96367a91 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java @@ -115,6 +115,9 @@ public class GoodsSku implements Serializable { @TableField(fill = FieldFill.UPDATE) private String updateBy; + /** 可投放费用标识 */ + private Integer costFlag; + @TableField(exist = false) private List selectSkuIds; diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java index 6d5dcab4..c3e11cae 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java @@ -100,6 +100,9 @@ public class GoodsSpu implements Serializable { @JsonProperty private String delFlag; + /** 可投放费用标识 */ + private Integer costFlag; + /** 一级类目:品牌名称 */ @TableField(exist = false) private String cateFirstLabel; diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java index 9cc1f3fc..08c68216 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java @@ -49,4 +49,7 @@ public class GoodsCategoryTreeVo extends TreeNode { /** 等级 */ private Integer level; + /** 可投放费用标识 */ + private Integer costFlag; + } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java index 80a75748..093b5ce3 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java @@ -69,5 +69,8 @@ public class GoodsSkuBo implements Serializable { /** 规格值Ids(更新操作可为空) */ private List specValueIds; + /** 可投放费用标识 */ + private Integer costFlag; + } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java index f574e582..71a3a0cd 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java @@ -60,4 +60,7 @@ public class GoodsSpuBo { /** 产品口味(非sku规格值) */ private String tasteValue; + /** 可投放费用标识 */ + private Integer costFlag; + } diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml index 4e254213..d2734c52 100644 --- a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml @@ -86,6 +86,7 @@ and `bms_channel_point`.`del_flag` = #{query.delFlag} and `bms_channel_point`.`create_by` = #{query.createBy} and `bms_channel_point`.`update_by` = #{query.updateBy} + and `bms_channel_point`.`cost_flag` = #{query.costFlag}