Merge remote-tracking branch 'origin/developerC' into developerC

src/main/java/com/caimei365/commodity/mapper/SearchMapper.java

@@ -100,16 +100,6 @@ public interface SearchMapper {
      */
     List<Integer> findProductInvalidIds();
 
-    /**
-     * 根据商品ID获取星范ID
-     */
-    Integer findMallIdByProductId(Integer productId);
-
-    /**
-     * 根据商品IDs获取星范IDs
-     */
-    List<Integer> findMallInvalidIdsByProductIds(@Param("invalidIds") List<Integer> invalidIds);
-
     /**
      * 获取所有失效供应商数量
      */

src/main/java/com/caimei365/commodity/mapper/SecondHandMapper.java

@@ -97,4 +97,6 @@ public interface SecondHandMapper {
     Integer findSecondShop(String cardNumber);
 
     void insertShop(ShopVo shopVo);
+
+    void insertProductValidFlag(Integer productId, Integer validFlag);
 }

src/main/java/com/caimei365/commodity/service/impl/SearchIndexServiceImpl.java

@@ -419,12 +419,7 @@ public class SearchIndexServiceImpl implements SearchIndexService {
      */
     @Override
     public ResponseJson<Integer> deleteProductIndexById(Integer productId) {
-        // 根据商品ID获取星范ID
-        Integer mallId = searchMapper.findMallIdByProductId(productId);
         try {
-            if (null != mallId) {
-                deleteDocByTypeId("m_id", mallId, "search_product_mall");
-            }
             deleteDocByTypeId("p_id", productId, "search_product");
             // 删除主文档记录
             Integer mainId = searchQueryService.getIdByDocId("product", productId);

src/main/java/com/caimei365/commodity/service/impl/SecondHandServiceImpl.java

@@ -50,6 +50,7 @@ public class SecondHandServiceImpl implements SecondHandService {
     private String profile;
     @Resource
     private ShopMapper shopMapper;
+
     /**
      * 二手商品列表
      *
@@ -89,7 +90,7 @@ public class SecondHandServiceImpl implements SecondHandService {
                 }
                 // 优化地址信息
                 String provinceCityDistrict = second.getProvinceCityDistrict();
-                if(StringUtils.isNotBlank(provinceCityDistrict)){
+                if (StringUtils.isNotBlank(provinceCityDistrict)) {
                     provinceCityDistrict = provinceCityDistrict.replace("/", "").replace("市辖区", "");
                 }
                 second.setProvinceCityDistrict(provinceCityDistrict);
@@ -410,15 +411,15 @@ public class SecondHandServiceImpl implements SecondHandService {
             if (secondDto.getBanOfDeposit() != null) {
                 shopVo.setBanOfDeposit(secondDto.getBanOfDeposit());
             }
-            if (secondDto.getAccountName() != null){
+            if (secondDto.getAccountName() != null) {
                 shopVo.setAccountName(secondDto.getAccountName());
             }
 
-            if (secondDto.getAccountType()!= null) {
+            if (secondDto.getAccountType() != null) {
                 shopVo.setAccountType(secondDto.getAccountType());
             }
             secondHandMapper.insertShop(shopVo);
-            shopId=shopVo.getShopId();
+            shopId = shopVo.getShopId();
         }
         // 设置日期时间格式
         Date date = new Date();
@@ -461,6 +462,7 @@ public class SecondHandServiceImpl implements SecondHandService {
         product.setAnnounType(secondDto.getAnnounType());
         /* 保存商品表 */
         secondHandMapper.insertProduct(product);
+        secondHandMapper.insertProductValidFlag(product.getProductId(), product.getValidFlag());
         /*保存sku数据*/
         Sku sku = new Sku();
         sku.setPrice(secondDto.getPrice());
@@ -541,7 +543,7 @@ public class SecondHandServiceImpl implements SecondHandService {
         /* 保存商品二手附加详细信息 */
         secondHandMapper.saveSencondHandProduct(secondPo);
         //保存商品包含文件
-        if(!"".equals(secondDto.getFileType()) || secondDto.getFileType()!=null) {
+        if (!"".equals(secondDto.getFileType()) || secondDto.getFileType() != null) {
             String fileTypes = secondDto.getFileType();
             if (fileTypes.contains(",")) {
                 String[] split = fileTypes.split(",");

src/main/java/com/caimei365/commodity/service/impl/ShopServiceImpl.java

@@ -129,7 +129,7 @@ public class ShopServiceImpl implements ShopService {
                     organizeNames.add("【采美】平台");
                 }
                 if (product.getGroundMall().contains("4")) {
-                    organizeNames.add( "【丽格集采联盟】平台");
+                    organizeNames.add("【丽格集采联盟】平台");
                 }
                 product.setOrganizeNames(organizeNames);
                 organizeNames.clear();
@@ -279,7 +279,7 @@ public class ShopServiceImpl implements ShopService {
         product.setPriceFlag(priceFlag);
         product.setCommodityDetailsFlag(commodityDetailsFlag);
         // 上架商城
-        String groundMall = productDto.getGroundMall().replaceAll(",","##");
+        String groundMall = productDto.getGroundMall().replaceAll(",", "##");
         product.setGroundMall(groundMall);
         //设置主图
         for (Map<String, String> map : imageList) {
@@ -302,12 +302,12 @@ public class ShopServiceImpl implements ShopService {
             log.info("---------------------------------->" + product);
             shopMapper.insertProduct(product);
             // 采美商城商品状态
-            shopMapper.insertVaildFlag(0,product.getProductId(), product.getValidFlag());
+            shopMapper.insertVaildFlag(0, product.getProductId(), product.getValidFlag());
             //插入sku
             addSkus(skus, product.getProductId());
             if (null != mallSkus && mallSkus.size() > 0) {
                 // 外部商城商品状态
-                shopMapper.insertVaildFlag(4,product.getProductId(), product.getValidFlag());
+                shopMapper.insertVaildFlag(4, product.getProductId(), product.getValidFlag());
                 // 外部商城sku
                 saveMallSku(mallSkus, product.getProductId());
             }
@@ -321,12 +321,12 @@ public class ShopServiceImpl implements ShopService {
             log.info("---------------------------------->" + product);
             shopMapper.updateProduct(product);
             // 采美商城商品状态
-            shopMapper.updateVaildFlag(0,product.getProductId(),product.getValidFlag());
+            shopMapper.updateVaildFlag(0, product.getProductId(), product.getValidFlag());
             //修改sku
             updateSkus(skus, product.getProductId());
             if (null != mallSkus && mallSkus.size() > 0) {
                 // 外部商城商品状态
-                shopMapper.updateVaildFlag(4,product.getProductId(),product.getValidFlag());
+                shopMapper.updateVaildFlag(4, product.getProductId(), product.getValidFlag());
                 // 外部商城sku
                 saveMallSku(mallSkus, product.getProductId());
             }
@@ -412,6 +412,7 @@ public class ShopServiceImpl implements ShopService {
 
     /**
      * 外部商城sku信息保存
+     *
      * @param skus
      * @param productId
      */
@@ -455,7 +456,7 @@ public class ShopServiceImpl implements ShopService {
             product.setMallSkus(organizeSkus);
         }
         // 上架平台
-        product.setGroundMall(product.getGroundMall().replaceAll("##",","));
+        product.setGroundMall(product.getGroundMall().replaceAll("##", ","));
         if (StringUtils.isNotBlank(product.getTags())) {
             String[] tags = product.getTags().split(",");
             product.setTagsList(tags);
@@ -624,7 +625,7 @@ public class ShopServiceImpl implements ShopService {
     /**
      * 供应商-批量下架商品
      *
-     * @param productIds 商品id集合,以','隔开
+     * @param productIds     商品id集合,以','隔开
      * @param groundMallType 上架平台类型
      */
     @Override
@@ -676,7 +677,7 @@ public class ShopServiceImpl implements ShopService {
                     return ResponseJson.error("此商品是正在进行的" + message + "促销活动的赠品，活动期间不能下架，如需强行下架，请联系客服：0755-22907771");
                 }
                 product.setValidFlag(3);
-                shopMapper.updateProductValidFlag(product.getProductId(), product.getValidFlag(),groundMallType);
+                shopMapper.updateProductValidFlag(product.getProductId(), product.getValidFlag(), groundMallType);
             }
         }
         return ResponseJson.success();

src/main/resources/mapper/SearchMapper.xml

@@ -49,20 +49,23 @@
     </select>
     <select id="findProductCount" resultType="java.lang.Integer">
         select count(*)
-        from product
+        from product p
+        left join cm_organize_product_info copi on p.productID = copi.productId
         where validFlag in (2, 3, 9)
           and productCategory = 1
     </select>
     <select id="findProductInvalidCount" resultType="java.lang.Integer">
         select count(*)
-        from product
-        where validFlag not in (2, 3, 9)
+        from product p
+        left join cm_organize_product_info copi on p.productID = copi.productId
+        where validFlag in (2, 3, 9)
            or productCategory != 1
     </select>
     <select id="findProductInvalidIds" resultType="java.lang.Integer">
-        select productID
-        from product
-        where validFlag not in (2, 3, 9)
+        select p.productID
+        from product p
+        left join cm_organize_product_info copi on p.productID = copi.productId
+        where validFlag in (2, 3, 9)
            or productCategory != 1
     </select>
     <select id="searchProductList" resultType="com.caimei365.commodity.model.search.ProductDO">
@@ -74,20 +77,6 @@
         where copi.validFlag in (2,3,9) and productCategory = 1
         order by productID desc
     </select>
-    <select id="findMallIdByProductId" resultType="java.lang.Integer">
-        select id
-        from cm_mall_organize_products
-        where productID = #{productId}
-        limit 1
-    </select>
-    <select id="findMallInvalidIdsByProductIds" resultType="java.lang.Integer">
-        select id
-        from cm_mall_organize_products
-        where productID IN
-        <foreach collection="invalidIds" open="(" separator="," close=")" item="productId">
-            #{productId}
-        </foreach>
-    </select>
 
     <!-- 供应商 -->
     <sql id="Search_Supplier_List">

src/main/resources/mapper/SecondHandMapper.xml

@@ -32,12 +32,12 @@
     <insert id="insertProduct" keyColumn="productID" keyProperty="productId"
             parameterType="com.caimei365.commodity.model.po.ProductPo" useGeneratedKeys="true">
         insert into product (brandId, name, aliasName, mainImage, productCategory, preferredFlag, shopId,
-                             sellNumber, hasSkuFlag, validFlag, sortIndex, featuredFlag, byFlag,
+                             sellNumber, hasSkuFlag, sortIndex, featuredFlag, byFlag,
                              step, actFlag, actStatus, freePostFlag, productType, machineType, includedTax,
                              recommendType, invoiceType,
                              visibility, addTime, updateTime, onlineTime, downlineTime, announType)
         values (#{brandId}, #{name}, #{aliasName}, #{mainImage}, #{productCategory},
-                #{preferredFlag}, #{shopId}, #{sellNumber}, #{hasSkuFlag}, #{validFlag},
+                #{preferredFlag}, #{shopId}, #{sellNumber}, #{hasSkuFlag},
                 #{sortIndex}, #{featuredFlag}, #{byFlag}, #{step}, #{actFlag}, #{actStatus},
                 #{freePostFlag}, #{productType}, #{machineType}, #{includedTax}, #{recommendType}, #{invoiceType},
                 #{visibility}, #{addTime}, #{updateTime}, #{onlineTime}, #{offlineTime}, #{announType})
@@ -54,6 +54,10 @@
         values (#{name}, #{linkMan}, #{contractMobile}, #{cardNumber}, #{accountType}, #{banOfDeposit}, #{accountName},
                 now(), 90, 0)
     </insert>
+    <insert id="insertProductValidFlag">
+        insert into cm_organize_product_info(organizeId, productId, validFlag)
+        values (0, #{productId}, #{validFlag})
+    </insert>
     <update id="updateSecondHandViews">
         UPDATE cm_second_hand_detail
         SET viewingNum = #{viewingNum}