fix

coolstore-partner-dao/src/main/java/com/cool/store/dao/PointDetailInfoDAO.java

@@ -1,6 +1,7 @@
 package com.cool.store.dao;
 
 import com.alibaba.excel.util.CollectionUtils;
+import com.aliyun.openservices.shade.com.google.common.collect.Lists;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.entity.PointDetailInfoDO;
 import com.cool.store.mapper.PointDetailInfoMapper;
@@ -63,6 +64,9 @@ public class PointDetailInfoDAO {
     }
 
     public List<PointDetailInfoDO> getByPointIdList(List<Long> pointIdList) {
+        if (CollectionUtils.isEmpty(pointIdList)){
+            return Lists.newArrayList();
+        }
         Example example = new Example(PointDetailInfoDO.class);
         example.createCriteria().andIn("pointId", pointIdList);
         return pointDetailInfoMapper.selectByExample(example);

coolstore-partner-dao/src/main/java/com/cool/store/dao/PointInfoDAO.java

@@ -163,7 +163,7 @@ public class PointInfoDAO {
      * @description:数据处理用 省市区详细地址面积
      */
     public Integer updateAddress(List<PointInfoDO> list){
-        if (Objects.isNull(list)){
+        if (CollectionUtils.isEmpty(list)){
             return CommonConstants.ZERO;
         }
         return pointInfoMapper.updateAddress(list);

coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

@@ -500,7 +500,7 @@
     </update>
     <update id="updateShopCity">
         <foreach collection="list" item="item" index="index" separator=";">
-            update xfsg_shop_info set province =#{item.province}, city = #{item.city}, district=#{item.district} where id = #{item.id}
+            update xfsg_shop_info set   shop_name = #{item.shopName}, province =#{item.province}, city = #{item.city}, district=#{item.district},  detail_address = #{item.detailAddress} where id = #{item.id}
         </foreach>
     </update>
 </mapper>

coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java

@@ -169,7 +169,7 @@ public class DataHandlerServerImpl implements DataHandlerServer {
             }
             Long shopId = shopInfoDO.getId();
             ShopStageInfoDO franchiseFeeStage = franchiseFeeStageMap.get(shopId);
-            if (Objects.isNull(franchiseFeeStage)) {
+            if (!franchiseFeeStage.getIsTerminated()) {
                 log.info("门店未完成加盟费阶段，门店编码：{}", dto.getShopCode());
                 ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO();
                 errorDTO.setShopCode(dto.getShopCode());
@@ -337,8 +337,6 @@ public class DataHandlerServerImpl implements DataHandlerServer {
         orderSysInfoDAO.batchInsertSpecific(addOrderSysInfoList);
         franchiseFeeDAO.updateBill(franchiseFeeByShopIds);
         buildInformationDAO.batchInsertSpecific(addBuildList);
-        //数据处理用平台账号 火马，云流水，新掌柜状态改为已完成
-        shopAccountDAO.updateStatusDataHandle(shopIds);
         //建店资料阶段处理
         shopStageInfoDAO.dataUpdateShopStageInfo(updateBuildStageList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156);
         if (CollectionUtils.isNotEmpty(updateBuildStageList)){
@@ -347,6 +345,8 @@ public class DataHandlerServerImpl implements DataHandlerServer {
             shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163);
             // 订货阶段 完成
             shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_173);
+            //数据处理用平台账号 火马，云流水，新掌柜状态改为已完成
+            shopAccountDAO.updateStatusDataHandle(updateStageShopIds);
         }
         //表中4月20号后的数据，数据录入系统，新店装修阶段状态不变更  其他时间的数据状态改为已完成 不包括装修验收
         shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_863);
@@ -355,7 +355,7 @@ public class DataHandlerServerImpl implements DataHandlerServer {
         //装修验收初始化
         shopStageInfoDAO.dataUpdateAcceptanceStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121);
         if (!errorList.isEmpty()) {
-            task.setStatus(ImportTaskStatusEnum.PART_ERROR.getCode());
+            task.setStatus(ImportTaskStatusEnum.ERROR.getCode());
             String url = null ;
             try {
                  url = easyExcelUtil.exportExcel(ImportOaOldShopDataErrorDTO.class, errorList, null,