赵冬冬 пре 4 година
родитељ
комит
3a92f88df3

+ 10 - 2
forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UploadCompanyInfoAndProductController.java

@@ -46,6 +46,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/first")
@@ -474,6 +475,7 @@ public class UploadCompanyInfoAndProductController {
         return companyId;
     }
 
+
     @Autowired
     private ImportExcelEventListener importExcelEventListener;
 
@@ -557,11 +559,17 @@ public class UploadCompanyInfoAndProductController {
                 }
             }
         }
-        log.info("sssss");
+        log.info("开始插入商品数据");
         productExcelDao.saveData(listAll);
         log.info(JSONObject.toJSONString(listAll));
         log.info(JSONObject.toJSONString(listAll));
-
+        List<String> compNames = listAll.stream().map(PmsProductParam::getUmsCompanyInfo).distinct().collect(Collectors.toList());
+        //更新大小类
+        updateProductType(compNames);
+    }
+    //更新大小类
+    public void updateProductType(List<String> compName){
+        productExcelDao.updateProduct(compName);
     }
 
 

+ 2 - 0
forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/PmsProductExcelDao.java

@@ -18,4 +18,6 @@ public interface PmsProductExcelDao {
     Long checkOne(@Param("check")String check);
 
     List<SelectVo> plOfProSelect(@Param("compId")Long compId);
+
+    void updateProduct(List<String> list);
 }

+ 2 - 2
forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsCompanyInfoServiceImpl.java

@@ -165,8 +165,8 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
         UmsCompanyShop shop = new UmsCompanyShop();
 
         shop.setCompId(ums.getId());
-        shop.setCreateId(ums.getCreateId());
-        shop.setCreateTime(ums.getCreateTime());
+        shop.setCreateId((long) 1);
+        shop.setCreateTime(new Date());
         shop.setShopStatus(0);
         if (!StringUtils.isEmpty(ums.getTbUrl())){
             UmsCompanyShop tbShop = new UmsCompanyShop();

+ 17 - 1
forest-admin/admin-server/src/main/resources/dao/ProductExcelDao.xml

@@ -118,6 +118,7 @@
          </trim>
         </foreach>
     </insert>
+
     <select id="bigDataList" resultType="com.hwrj.cloud.admin.dto.param.BigDataListInfoVo">
         SELECT
         a.id,
@@ -172,7 +173,7 @@
             a.spec AS spec,
             a.quality_guarantee_period AS qualityGuaranteePeriod,
             d.origin_name AS placeOfProduction,
-            a.ums_company_info_id AS firmId,
+            a.comp_id AS firmId,
             c.comp_name AS umsCompanyInfo,
             a.description AS description,
             b.shop_type AS shopType,
@@ -233,4 +234,19 @@
             AND a.comp_id = #{compId}
         </if>
     </select>
+
+    <update id="updateProduct">
+        UPDATE pms_product a
+        LEFT JOIN pms_product_category b ON a.product_big_category_name = b.`name`
+        LEFT JOIN pms_product_category c ON a.product_category_name = c.`name`
+        SET a.product_big_category_id = b.id,
+         a.product_category_id = c.id
+        WHERE
+            b.parent_id = 0
+        AND c.parent_id != 0
+        AND a.comp_name in
+        <foreach collection="list" item="compName" open="(" separator="," close=")">
+            #{compName}
+        </foreach>
+    </update>
 </mapper>

+ 20 - 6
forest-admin/admin-server/src/main/resources/dao/UmsCompanyShopDao.xml

@@ -3,15 +3,29 @@
 <mapper namespace="com.hwrj.cloud.admin.dao.UmsCompanyShopDao">
 
     <insert id="addUmsCompanyShopList" parameterType="java.util.List">
-        insert into ums_company_shop (comp_id, shop_type, shop_url,
-        shop_address, shop_img, create_time,
-        create_id, update_time, shop_status
+        insert into ums_company_shop (
+        comp_id,
+        shop_type,
+        shop_url,
+        shop_address,
+        shop_img,
+        create_time,
+        create_id,
+        update_time,
+        shop_status
         )
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.compId,jdbcType=INTEGER}, #{item.shopType,jdbcType=VARCHAR}, #{item.shopUrl,jdbcType=VARCHAR},
-            #{item.shopAddress,jdbcType=VARCHAR}, #{item.shopImg,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
-            #{item.createId,jdbcType=INTEGER}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.shopStatus,jdbcType=INTEGER}
+            (
+            #{item.compId,jdbcType=INTEGER},
+            #{item.shopType,jdbcType=VARCHAR},
+            #{item.shopUrl,jdbcType=VARCHAR},
+            #{item.shopAddress,jdbcType=VARCHAR},
+            #{item.shopImg,jdbcType=VARCHAR},
+            #{item.createTime,jdbcType=TIMESTAMP},
+            #{item.createId,jdbcType=INTEGER},
+            #{item.updateTime,jdbcType=TIMESTAMP},
+            #{item.shopStatus,jdbcType=INTEGER}
             )
         </foreach>