Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 085325ec9d91bf422bd2e4ad311d7e4f5ef70cb3
+  newTag: b49c7ce0b60324d1d5a345e231054c2992490603

src/main/java/com/mmc/pms/dao/GoodsInfoDao.java

@@ -54,7 +54,7 @@ public interface GoodsInfoDao {
 
   void batchUpdateMallProductSku(List<Integer> delIds);
 
-  void batchUpdateMallProdSkuInfo(List<MallProdInfoDO> mallProdSkuInfoList);
+  void batchUpdateMallProdSkuInfo(List<MallProdInfoDO> list);
 
   List<MallIndustrySkuInfoDO> getMallIndustrySkuInfo(Integer id);
 
@@ -110,4 +110,6 @@ public interface GoodsInfoDao {
   List<SpecPriceVO> getPriceBySpecId(Integer productSpecId, Integer leaseTerm);
 
   int countGoodsInfoByCategoryId(Integer id);
+
+  void updateMallProdSkuInfo(MallProdInfoDO mallProdInfoDO);
 }

src/main/java/com/mmc/pms/model/qo/ServiceQO.java

@@ -45,6 +45,9 @@ public class ServiceQO implements Serializable {
   @ApiModelProperty(value = "省份编码", example = "440000")
   private Integer provinceId;
 
+  @ApiModelProperty(value = "展示状态")
+  private Integer displayState;
+
   @ApiModelProperty(value = "页码", required = true)
   @NotNull(
       message = "页码不能为空",

src/main/java/com/mmc/pms/service/Impl/GoodsInfoServiceImpl.java

@@ -424,7 +424,10 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
                   })
               .collect(Collectors.toList());
       // 1.3批量修改sku的信息
-      goodsInfoDao.batchUpdateMallProdSkuInfo(mallProdSkuInfoList);
+      for (MallProdInfoDO mallProdInfoDO : mallProdSkuInfoList) {
+        goodsInfoDao.updateMallProdSkuInfo(mallProdInfoDO);
+      }
+      //      goodsInfoDao.batchUpdateMallProdSkuInfo(mallProdSkuInfoList);
       // 1.4对新的sku进行操作
       List<GoodsProdSpecVO> list =
           specInfo.stream().filter(d -> d.getId() == null).collect(Collectors.toList());
@@ -508,7 +511,10 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
                   })
               .collect(Collectors.toList());
       // 批量修改sku的信息
-      goodsInfoDao.batchUpdateMallProdSkuInfo(zdySpecList);
+      for (MallProdInfoDO mallProdInfoDO : zdySpecList) {
+        goodsInfoDao.updateMallProdSkuInfo(mallProdInfoDO);
+      }
+      //      goodsInfoDao.batchUpdateMallProdSkuInfo(zdySpecList);
     }
     for (GoodsProdSpecVO goodsSpecVO : zdySpec) {
       // 【1】获取输入的自定义规格信息// id不为空则修改

src/main/resources/mapper/GoodsInfoDao.xml

@@ -103,7 +103,7 @@
         where goods_info_id = #{goodsId}
     </update>
     <update id="batchUpdateMallProductSku">
-        <foreach collection="list" item="d" separator=";">
+        <foreach collection="list" item="d" separator=";" index="index">
             update mall_prod_info
             set is_deleted = 1
             where id = #{d}
@@ -111,7 +111,7 @@
         </foreach>
     </update>
     <update id="batchUpdateMallProdSkuInfo">
-        <foreach collection="list" item="d" separator=";">
+        <foreach collection="list" item="d" separator=";" index="index">
             update mall_prod_info
             <set>
                 product_id = #{d.prodSkuId},
@@ -127,7 +127,7 @@
         </foreach>
     </update>
     <update id="batchUpdateMallProSpec">
-        <foreach collection="list" separator=";" item="d">
+        <foreach collection="list" separator=";" item="d" index="index">
             update mall_prod_info_spec
             set is_deleted = 1
             where mall_prod_info_id = #{d}
@@ -136,7 +136,7 @@
         </foreach>
     </update>
     <update id="batchUpdateMallProdSpec">
-        <foreach collection="list" item="d" separator=";">
+        <foreach collection="list" item="d" separator=";" index="index">
             update mall_prod_info_spec
             set is_deleted = 1
             where id = #{d}
@@ -161,6 +161,16 @@
             #{item}
         </foreach>
     </update>
+    <update id="updateMallProdSkuInfo">
+        update mall_prod_info
+        set product_id     = #{prodSkuId},
+            categories_id  = #{categoriesId},
+            prod_spec_name = #{prodSkuSpecName},
+            choose_type    = #{chooseType},
+            sku_unit_id    = #{skuUnitId},
+            is_must        = #{must}
+        where id = #{id}
+    </update>
     <delete id="deleteGoodsServiceByGoodsId">
         delete
         from goods_service

src/main/resources/mapper/work/BackstageTaskServiceDao.xml

@@ -64,7 +64,7 @@
         service_introduction, create_time, update_time, account_id
         from service
         <where>
-            is_deleted = 0 and display_state = 0
+            is_deleted = 0
             <if test="serviceName != null and serviceName != ''">
                 and service_name LIKE CONCAT('%',#{serviceName},'%')
             </if>
@@ -74,6 +74,9 @@
             <if test="industryId != null">
                 and industry_id = #{industryId}
             </if>
+            <if test="displayState != null">
+                and display_state = #{displayState}
+            </if>
         </where>
         order by create_time desc
         limit #{pageNo}, #{pageSize}
@@ -84,7 +87,7 @@
         select count(*)
         from service
         <where>
-            is_deleted = 0 and display_state = 0
+            is_deleted = 0
             <if test="serviceName != null and serviceName != ''">
                 and service_name LIKE CONCAT('%',#{serviceName},'%')
             </if>
@@ -94,6 +97,9 @@
             <if test="industryId != null">
                 and industry_id = #{industryId}
             </if>
+            <if test="displayState != null">
+                and display_state = #{displayState}
+            </if>
         </where>
     </select>