Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/service/DictApiService.java

@@ -17,5 +17,5 @@ public interface DictApiService {
      * @return com.gic.store.entity.TabGicDict
      * @throws
      */
-    ServiceResponse<GicDictDTO> getDictByCode(String dictType, String dictValue);
+    ServiceResponse<GicDictDTO> getDictByCode(String dictType, String dictCode);
 }

gic-store-service/src/main/java/com/gic/store/dao/mapper/DictMapper.java

@@ -52,5 +52,5 @@ public interface DictMapper {
      */
     int updateByPrimaryKey(TabGicDict record);
 
-    TabGicDict getDictByCode(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
+    TabGicDict getDictByCode(@Param("dictType") String dictType, @Param("dictCode") String dictCode);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/impl/DictServiceImpl.java

@@ -19,7 +19,7 @@ public class DictServiceImpl implements DictService {
 
 
     @Override
-    public TabGicDict getDictByCode(String dictType, String dictValue) {
-        return dictMapper.getDictByCode(dictType, dictValue);
+    public TabGicDict getDictByCode(String dictType, String dictCode) {
+        return dictMapper.getDictByCode(dictType, dictCode);
     }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/DictApiServiceImpl.java

@@ -22,8 +22,8 @@ public class DictApiServiceImpl implements DictApiService {
     private DictService dictService;
 
     @Override
-    public ServiceResponse<GicDictDTO> getDictByCode(String dictType, String dictValue) {
-        TabGicDict dict = dictService.getDictByCode(dictType, dictValue);
+    public ServiceResponse<GicDictDTO> getDictByCode(String dictType, String dictCode) {
+        TabGicDict dict = dictService.getDictByCode(dictType, dictCode);
         GicDictDTO gicDictDTO = EntityUtil.changeEntityByJSON(GicDictDTO.class, dict);
         return EnterpriseServiceResponse.success(gicDictDTO);
     }

gic-store-service/src/main/resources/mapper/DictMapper.xml

@@ -130,6 +130,6 @@
     <include refid="Base_Column_List" />
     from tab_gic_dict
     where
-    dict_type = #{dictType} and dict_value = #{dictValue}
+    dict_type = #{dictType} and dict_code = #{dictCode}
   </select>
 </mapper>
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java

@@ -138,12 +138,18 @@ public class ClerkImportController {
                         } catch (Exception e) {
                             logger.warn(e);
                         }
-                        if (logCount > 3) {
+                        if (logCount <= 3) {
                             sb.append(bean.getStoreName()).append(",");
                         }
                         logCount++;
                     }
 
+                    if (sb.length() > 0 && logCount > 0) {
+                        sb.deleteCharAt(sb.length() - 1);
+                        sb.append("等").append(logCount).append("名导购");
+                    }
+                    LogUtils.createLog("批量导入", sb.toString());
+
                     if (clerkImportApiService.hasImportingClerk(enterpriseId).getResult()) {
                         // 开队列
                         String r = clerkImportApiService.importDataToClerk(enterpriseId, "123", uuId).getResult();
@@ -151,11 +157,6 @@ public class ClerkImportController {
                             logger.warn("队列错误, {}", r);
                             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "网络错误");
                         }
-                        if (sb.length() > 0 && logCount > 0) {
-                            sb.deleteCharAt(sb.length() - 1);
-                            sb.append("等").append(logCount).append("名导购");
-                        }
-                        LogUtils.createLog("批量导入", sb.toString());
                     } else {
                         Page page = clerkImportApiService.listClerkTmp(enterpriseId, false, pageQO.getCurrentPage(), pageQO.getPageSize()).getResult();
                         Map<Object, Object> result = new HashMap<>(8);

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -34,6 +34,7 @@ import com.gic.store.web.vo.StoreListSourceVO;
 import com.gic.store.web.vo.StoreOverflowVO;
 import com.gic.wechat.business.api.service.fwh.WeixinBaseFunService;
 import com.gic.wechat.business.api.service.wxa.WeixinWxaFunService;
+import com.google.common.base.Joiner;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -302,15 +303,20 @@ public class StoreController extends DownloadUtils {
         }
         ServiceResponse response = this.storeApiService.bulkUpdateStore(storeIds, value, enterpriseId, type, UserDetailUtils.getUserDetail().getUserId(), UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         if (response.isSuccess()) {
+            String[] storeArr = storeIds.split(",");
             StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
-            List<StoreDTO> storeList = this.storeApiService.listStore(storeSearchDTO, 1, 3).getResult().getResult();
-            if (CollectionUtils.isNotEmpty(storeList)) {
-                String storeName = storeList.stream().map(StoreDTO::getStoreName).reduce((x, y) -> x + "," + y).get();
-                String[] storeArr = storeIds.split(",");
-                if (storeArr.length > 3) {
-                    storeName += "等" + storeArr.length + "家门店";
+            storeSearchDTO.setEnterpriseId(enterpriseId);
+            storeSearchDTO.setStoreIds(Joiner.on(" ").join(storeArr));
+            Page<StoreDTO> page = this.storeApiService.listStore(storeSearchDTO, 1, 3).getResult();
+            if (page != null && CollectionUtils.isNotEmpty(page.getResult())) {
+                List<StoreDTO> storeList = page.getResult();
+                if (CollectionUtils.isNotEmpty(storeList)) {
+                    String storeName = storeList.stream().map(StoreDTO::getStoreName).reduce((x, y) -> x + "," + y).get();
+                    if (storeArr.length > 3) {
+                        storeName += "等" + storeArr.length + "家门店";
+                    }
+                    LogUtils.createLog(type == 1 ? "修改启用状态" : "批量编辑", storeName);
                 }
-                LogUtils.createLog(type == 1 ? "修改启用状态" : "批量编辑", storeName);
             }
             return RestResponse.success();
         }

gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java

@@ -162,12 +162,18 @@ public class StoreImportController {
                         } catch (Exception e) {
                             logger.warn(e);
                         }
-                        if (logCount > 3) {
+                        if (logCount <= 3) {
                             sb.append(bean.getStoreName()).append(",");
                         }
                         logCount++;
                     }
 
+                    if (sb.length() > 0 && logCount > 0) {
+                        sb.deleteCharAt(sb.length() - 1);
+                        sb.append("等").append(logCount).append("家门店");
+                    }
+                    LogUtils.createLog("批量导入", sb.toString());
+
                     if (storeImportApiService.hasImportingStore(enterpriseId).getResult()) {
                         // userId
                         Integer userId = UserDetailUtils.getUserDetail().getUserInfo().getUserId();
@@ -177,11 +183,6 @@ public class StoreImportController {
                             logger.warn("队列错误, {}", r);
                             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "网络错误");
                         }
-                        if (sb.length() > 0 && logCount > 0) {
-                            sb.deleteCharAt(sb.length() - 1);
-                            sb.append("等").append(logCount).append("家门店");
-                        }
-                        LogUtils.createLog("批量导入", sb.toString());
                     } else {
                         Page page = storeImportApiService.listStoreTmp(enterpriseId, false, pageQO.getCurrentPage(), pageQO.getPageSize()).getResult();
                         Map<Object, Object> result = new HashMap<>(8);