From 95f70c5d2c8bb96c7e6f4b11c15d953e7db930bb Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Thu, 20 Jul 2023 11:43:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81belong?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/modules/bms/controller/BmsRegionController.java | 2 +- .../com/qs/serve/modules/goods/entity/GoodsCategory.java | 2 ++ .../java/com/qs/serve/modules/goods/entity/GoodsSku.java | 2 ++ .../java/com/qs/serve/modules/goods/entity/GoodsSpu.java | 2 ++ .../com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java | 2 ++ .../com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java | 1 + .../resources/mapper/bir/BirActivityCenterGoodsMapper.xml | 2 +- src/main/resources/mapper/goods/GoodsSkuMapper.xml | 7 ++++++- src/main/resources/mapper/goods/GoodsSpuMapper.xml | 7 +++++-- 9 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index 59d44995..c2ae8b49 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -383,7 +383,7 @@ public class BmsRegionController { return R.error("预算含当前成本中心，删除失败"); } //删除商品限制 - bmsRuleRegionService.removeByRegionId(id); +// bmsRuleRegionService.removeByRegionId(id); boolean result = bmsRegionService.removeById(id); //清空临时表 hisUserSupplierService.cleanTable(); 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 b17339f8..324bac2c 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 @@ -59,6 +59,8 @@ public class GoodsCategory implements Serializable { @Length(max = 255,message = "图片长度不能超过255字") private String picUrl; + private String belong; + /** 排序 */ private Integer sort; 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 6b3fbd1b..4c6f3d25 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 @@ -87,6 +87,8 @@ public class GoodsSku implements Serializable { /** 备注 */ private String remark; + private String belong; + /** 最后更新时间 */ @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; 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 5597077b..52a17fb9 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 @@ -105,6 +105,8 @@ public class GoodsSpu implements Serializable { /** 可投放费用标识 */ private Integer costFlag; + private String belong; + /** 一级类目：品牌名称 */ @TableField(exist = false) private String cateFirstLabel; 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 093b5ce3..c59c3632 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 @@ -72,5 +72,7 @@ public class GoodsSkuBo implements Serializable { /** 可投放费用标识 */ private Integer costFlag; + private String belong; + } 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 71a3a0cd..dc9d0b0d 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 @@ -63,4 +63,5 @@ public class GoodsSpuBo { /** 可投放费用标识 */ private Integer costFlag; + private String belong; } diff --git a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml index 408fb6cd..39c8ee57 100644 --- a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml +++ b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml @@ -107,7 +107,7 @@ and tbs_activity.del_flag = 0 and tbs_activity_center_goods.del_flag = 0 and tbs_cost_apply.del_flag = 0 - and tbs_cost_apply.charge_state !=0 + and tbs_cost_apply.charge_state in (2,3) and ( bir_activity_center_goods.activity_id is null or bir_activity_center_goods.activity_total_amount != tbs_activity.total_amount diff --git a/src/main/resources/mapper/goods/GoodsSkuMapper.xml b/src/main/resources/mapper/goods/GoodsSkuMapper.xml index 2f5c4ecd..c48c2cbd 100644 --- a/src/main/resources/mapper/goods/GoodsSkuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSkuMapper.xml @@ -29,6 +29,7 @@ + @@ -55,7 +56,9 @@ goods_sku.`del_flag`, goods_sku.`create_by`, goods_sku.`cost_flag`, - goods_sku.`update_by` + goods_sku.`update_by`, + goods_sku.`belong` + SELECT @@ -74,6 +76,7 @@ and `goods_spu`.`shelf` = #{query.shelf} and `goods_spu`.`sort` = #{query.sort} and `goods_spu`.`sale_num` = #{query.saleNum} + and `goods_spu`.`belong` = #{query.belong} and `goods_spu`.`taste_value` = #{query.tasteValue} and `goods_spu`.`create_time` = #{query.createTime} and `goods_spu`.`update_time` = #{query.updateTime}