添加商品belong

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();

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;
 

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;

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;

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;
+
 }
 

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;
 }

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

src/main/resources/mapper/goods/GoodsSkuMapper.xml

@@ -29,6 +29,7 @@
         <result property="createBy"  column="create_by"/>
         <result property="updateBy"  column="update_by"/>
         <result property="costFlag"  column="cost_flag"/>
+        <result property="belong"  column="belong"/>
     </resultMap>
 
     <sql id="goodsSkuSql">
@@ -55,7 +56,9 @@
         goods_sku.`del_flag`,
         goods_sku.`create_by`,
         goods_sku.`cost_flag`,
-        goods_sku.`update_by`    </sql>
+        goods_sku.`update_by`,
+        goods_sku.`belong`
+    </sql>
 
     <select id="selectGoodsSkuList" parameterType="com.qs.serve.modules.goods.entity.GoodsSku" resultMap="goodsSkuMap">
         SELECT <include refid="goodsSkuSql"/> FROM `goods_sku` `goods_sku`
@@ -66,6 +69,7 @@
             <if test="query.salesPrice != null"> and `goods_sku`.`sales_price` = #{query.salesPrice}</if>
             <if test="query.marketPrice != null"> and `goods_sku`.`market_price` = #{query.marketPrice}</if>
             <if test="query.costPrice != null"> and `goods_sku`.`cost_price` = #{query.costPrice}</if>
+            <if test="query.belong != null"> and `goods_sku`.`belong` = #{query.belong}</if>
             <if test="query.specInfos != null and query.specInfos != ''"> and `goods_sku`.`spec_infos` = #{query.specInfos}</if>
             <if test="query.stock != null"> and `goods_sku`.`stock` = #{query.stock}</if>
             <if test="query.unitId != null"> and `goods_sku`.`unit_id` = #{query.unitId}</if>
@@ -109,6 +113,7 @@
             <if test="query.costPrice != null"> and `goods_sku`.`cost_price` = #{query.costPrice}</if>
             <if test="query.specInfos != null and query.specInfos != ''"> and `goods_sku`.`spec_infos` = #{query.specInfos}</if>
             <if test="query.stock != null"> and `goods_sku`.`stock` = #{query.stock}</if>
+            <if test="query.belong != null"> and `goods_sku`.`belong` = #{query.belong}</if>
             <if test="query.unitId != null"> and `goods_sku`.`unit_id` = #{query.unitId}</if>
             <if test="query.unitName != null and query.unitName != ''"> and `goods_sku`.`unit_name` = #{query.unitName}</if>
             <if test="query.weight != null"> and `goods_sku`.`weight` = #{query.weight}</if>

src/main/resources/mapper/goods/GoodsSpuMapper.xml

@@ -27,7 +27,7 @@
         <result property="cateFirstLabel"  column="cate_first_label"/>
         <result property="cateSecondLabel"  column="cate_second_label"/>
         <result property="cateThirdLabel"  column="cate_third_label"/>
-
+        <result property="belong"  column="belong"/>
     </resultMap>
 
     <sql id="goodsSpuSql">
@@ -50,7 +50,9 @@
         goods_spu.`update_by`,
         goods_spu.`tenant_id`,
         goods_spu.`cost_flag`,
-        goods_spu.`del_flag`    </sql>
+        goods_spu.`del_flag`,
+        goods_spu.`belong`
+    </sql>
 
     <select id="selectSpuList" parameterType="com.qs.serve.modules.goods.entity.GoodsSpu" resultMap="goodsSpuMap">
         SELECT
@@ -74,6 +76,7 @@
             <if test="query.shelf != null and query.shelf != ''"> and `goods_spu`.`shelf` = #{query.shelf}</if>
             <if test="query.sort != null"> and `goods_spu`.`sort` = #{query.sort}</if>
             <if test="query.saleNum != null"> and `goods_spu`.`sale_num` = #{query.saleNum}</if>
+            <if test="query.belong != null"> and `goods_spu`.`belong` = #{query.belong}</if>
             <if test="query.tasteValue != null and query.tasteValue != ''"> and `goods_spu`.`taste_value` = #{query.tasteValue}</if>
             <if test="query.createTime != null"> and `goods_spu`.`create_time` = #{query.createTime}</if>
             <if test="query.updateTime != null"> and `goods_spu`.`update_time` = #{query.updateTime}</if>