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/ClerkApiService.java

@@ -108,4 +108,18 @@ public interface ClerkApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>

     
*/
     ServiceResponse<String> importClerkForOperation(ProcessBatchClerkDTO clerkInfo);
+
+    /**
+     * @Title: addClerkToOtherStore
+     * @Description: 将同样导购的信息添加到另一个门店下
+     *  入参 storeId clerkId enterpriseId  判断该导购是否与该门店存在关联，
+     *  如果存在返回 门店下 同导购code 的 clerkId ,如果不存在，新建导购，返回新建的导购i
+     * @author zhiwj
+     * @param clerkId
+     * @param storeId
+     * @param enterpriseId
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Integer> addClerkToOtherStore(Integer clerkId, Integer storeId, Integer enterpriseId);
 }

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

@@ -418,6 +418,34 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         return ServiceResponse.success(id.toString());
     }
 
+    @Override
+    public ServiceResponse<Integer> addClerkToOtherStore(Integer clerkId, Integer storeId, Integer enterpriseId) {
+        logger.info("clerkId:{}, storeId:{}, enterpriseId:{}", clerkId, storeId, enterpriseId);
+        TabClerk clerk = this.clerkService.getById(clerkId);
+        if (clerk == null) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), "导购不存在");
+        }
+        StoreDTO store = this.storeApiService.getStoreById(enterpriseId, storeId).getResult();
+        if (store == null) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), "门店不存在");
+        }
+        if (clerk.getStoreInfoId().equals(store.getStoreInfoId())) {
+            logger.info("导购[clerkId:{}]已存在门店[storeId:{}, storeInfoId:{}]下", clerkId, store.getStoreId(), store.getStoreInfoId());
+            return EnterpriseServiceResponse.success(clerkId);
+        }
+        ClerkDTO clerkDTO = EntityUtil.changeEntityByJSON(ClerkDTO.class, clerk);
+        clerkDTO.setClerkId(null);
+        clerkDTO.setStoreInfoId(store.getStoreInfoId());
+        ServiceResponse<Integer> clerkResp = this.saveOrUpdate(clerkDTO);
+        if (clerkResp.isSuccess()) {
+            logger.info("导购[clerkId:{}]不存在门店[storeId:{}, storeInfoId:{}]下, 新增clerkId：{}", clerkId, store.getStoreId(), store.getStoreInfoId(), clerkResp.getResult());
+            return EnterpriseServiceResponse.success(clerkResp.getResult());
+        } else {
+            logger.info("保存导购失败：{}", clerkResp.getMessage());
+            return EnterpriseServiceResponse.failure(clerkResp.getCode(), clerkResp.getMessage());
+        }
+    }
+
     private static ServiceResponse<String> responseErrorElement(ImportClerkBatchResultEnum error) {
         logger.warn("批处理导购错误返回结果:{}", error.toString());
         return ServiceResponse.failure(error.getCode(), error.toString());

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

@@ -467,10 +467,9 @@ public class StoreApiServiceImpl implements StoreApiService {
         for (StoreDTO storeDTO : storeDTOList) {
             List<StorePhotoDTO> photoList = storeDTO.getPhotoList();
             List<String> list = Optional.ofNullable(photoList).orElse(Collections.emptyList()).stream().map(StorePhotoDTO::getImageUrl).collect(Collectors.toList());
-            // todo 给一个门店图片默认值测试
+            // 给一个门店图片默认值测试
             if (CollectionUtils.isNotEmpty(list)) {
-//                list = Arrays.asList("http://gicdev.demogic.com/gic-web/static/img/side-img.dc95242.png");
-                list = Arrays.asList("https://pic01-10001430.image.myqcloud.com/a5a82c47-5892-4c1c-afaf-0f8d4d41e032");
+                list = Arrays.asList(Constants.DEFAULT_PHOTO);
             }
             resultMap.put(storeDTO.getStoreId(), list);
         }
@@ -870,7 +869,7 @@ public class StoreApiServiceImpl implements StoreApiService {
                 logger.info("enterpriseId:{}, storeId:{} , 门店不存在", enterpriseId, storeId);
                 return ServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
             }
-            // todo 修改门店缓存时间
+            // 修改门店缓存时间
             RedisUtil.setCache(key, storeDTO, storeExpiredTime, TimeUnit.HOURS);
         }
         StorePhotoDTO storePhotoDTO = new StorePhotoDTO();

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

@@ -139,7 +139,6 @@ public class ClerkImportController {
                     }
 
                     if (clerkImportApiService.hasImportingClerk(enterpriseId).getResult()) {
-                        // TODO userId
                         // 开队列
                         String r = clerkImportApiService.importDataToClerk(enterpriseId, "123", uuId).getResult();
                         if (StringUtils.isNotBlank(r)) {

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

@@ -44,6 +44,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -313,7 +314,7 @@ public class StoreController extends DownloadUtils {
     }
 
     @RequestMapping("export-store-list")
-    public RestResponse exportStoreList(@RequestBody StoreExportQO storeExportQO){
+    public RestResponse exportStoreList(HttpServletRequest request, @RequestBody StoreExportQO storeExportQO){
         storeExportQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         ServiceResponse<Long> response = this.storeApiService.queryStoreCountFromES(storeExportQO);
         if(response.isSuccess() && response.getResult() > 0){
@@ -323,7 +324,7 @@ public class StoreController extends DownloadUtils {
             report.setDataContent("门店资料");
             report.setDataCount(total);
             report.setDataType(storeExportQO.getDataType());
-            report.setDataUrl((String) RequestContext.getContext().getRequest().getAttribute("moduleMenuUrl"));
+            report.setDataUrl(request.getHeader("Referer"));
             report.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
             report.setFileName("门店资料");
             Integer downloadReport = DataDownloadUtils.createDownloadReport(report);