门店

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

@@ -23,7 +23,6 @@ import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.log.api.service.LogApiService;
 import com.gic.member.api.dto.BatchTaskOperaInfDTO;
-import com.gic.member.api.dto.StoreBatchUpdateDTO;
 import com.gic.member.api.service.BatchOperationApiService;
 import com.gic.member.api.service.StoreUpdateApiService;
 import com.gic.member.api.service.UserOwnerApiService;
@@ -313,12 +312,12 @@ public class StoreController extends DownloadUtils {
         ServiceResponse<Page<StoreDTO>> response = this.storeApiService.listStoreOverFlow(enterpriseId, page, search);
         if (response.isSuccess()) {
             page = response.getResult();
-            Page<StoreOverflowVO> page1 = new Page<>();
-            page1.setTotalCount(page.getTotalCount());
-            page1.setCurrentPage(page.getCurrentPage());
-            page1.setPageSize(page.getPageSize());
-            page1.setResult(EntityUtil.changeEntityListByJSON(StoreOverflowVO.class, page.getResult()));
-            return RestResponse.success(page1);
+            Page<StoreOverflowVO> pageTmp = new Page<>();
+            pageTmp.setTotalCount(page.getTotalCount());
+            pageTmp.setCurrentPage(page.getCurrentPage());
+            pageTmp.setPageSize(page.getPageSize());
+            pageTmp.setResult(EntityUtil.changeEntityListByJSON(StoreOverflowVO.class, page.getResult()));
+            return RestResponse.success(pageTmp);
         }
         return EnterpriseRestResponse.failure(response);
     }

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

@@ -84,12 +84,12 @@ public class StoreImportController {
 
         ServiceResponse<List<List<String>>> titleServiceResponse = storeImportApiService.listImportTitle(enterpriseId, Integer.parseInt(regionIdStr));
         // 测试数据
-        List<String> list3 = new ArrayList<>();
-        Collections.addAll(list3, "1", "杭州测试总店", "A001", "自营", "上线", "12345678912", "杭州门店", "品牌1", "浙江省", "杭州市", "西湖区", "华星时代广场", "经度", "纬度");
-        Collections.addAll(list, list3);
-        int size = list3.size();
+        List<String> listTmp = new ArrayList<>();
+        Collections.addAll(listTmp, "1", "杭州测试总店", "A001", "自营", "上线", "12345678912", "杭州门店", "品牌1", "浙江省", "杭州市", "西湖区", "华星时代广场", "经度", "纬度");
+        Collections.addAll(list, listTmp);
+        int size = listTmp.size();
         for (int i = 0; i < titleServiceResponse.getResult().get(0).size() - size; i++) {
-            list3.add(" ");
+            listTmp.add(" ");
         }
         Workbook workbook = ExcelUtils.getWorkbook("门店导入模板", titleServiceResponse.getResult().get(0), titleServiceResponse.getResult().get(1), list, regionIdStr);
 

gic-store-web/src/main/java/com/gic/store/web/qo/store/ClerkQrcodeQO.java

 package com.gic.store.web.qo.store;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.gic.store.dto.ClerkSearchDTO;
 import org.apache.commons.lang.StringUtils;
 
-import com.gic.store.dto.StoreSearchDTO;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -17,7 +16,8 @@ import com.gic.store.dto.StoreSearchDTO;
  * @date 2020-09-09 19:07
  */
 public class ClerkQrcodeQO implements Serializable {
-    private Integer h5 = 0;
+    @JsonProperty("h5")
+    private Integer html = 0;
     private String appletIds;
     private String fwhIds;
     private String scenesValueIds;
@@ -30,13 +30,13 @@ public class ClerkQrcodeQO implements Serializable {
     private String fileName;
     private ClerkSearchDTO clerkSearchDTO;
 
-    public Integer getH5() {
-        return h5;
+    public Integer getHtml() {
+        return html;
     }
 
-    public void setH5(Integer h5) {
-        if(h5 != null && StringUtils.isNotBlank(h5+"")){
-            this.h5 = h5;
+    public void setHtml(Integer html) {
+        if(html != null && StringUtils.isNotBlank(html +"")){
+            this.html = html;
         }
     }