门店导出修改

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

@@ -6,6 +6,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.download.constants.QrcodeTypeEnum;
 import com.gic.download.qo.QrcodeContent;
 import com.gic.download.utils.*;
 import com.gic.download.utils.log.LogUtils;
@@ -328,7 +329,7 @@ public class StoreController extends DownloadUtils {
     public RestResponse storeQrcodeDownload(@RequestBody QrcodeQO qrcodeQO){
         int total = qrcodeQO.getContent().size();
         if(qrcodeQO.getIsAll() == 1){
-            StoreSearchDTO storeSearchDTO = EntityUtil.changeEntityByJSON(StoreSearchDTO.class, qrcodeQO);
+            StoreSearchDTO storeSearchDTO = qrcodeQO.getStoreSearchDTO();
             storeSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
             ServiceResponse<Long> serviceResponse = this.storeApiService.queryStoreCountFromES(storeSearchDTO);
             total = serviceResponse.getResult().intValue();
@@ -340,7 +341,7 @@ public class StoreController extends DownloadUtils {
             @Override
             public List<QrcodeContent> getContent(int pageNum, int pageSize){
                 if(qrcodeQO.getIsAll() == 1){
-                    StoreSearchDTO storeSearchDTO = EntityUtil.changeEntityByJSON(StoreSearchDTO.class, qrcodeQO);
+                    StoreSearchDTO storeSearchDTO = qrcodeQO.getStoreSearchDTO();
                     storeSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
                     ServiceResponse<Page<StoreDTO>> response = storeApiService.listStore(storeSearchDTO, pageNum, pageNum);
                     if(response.isSuccess() && response.getResult() != null){
@@ -361,7 +362,7 @@ public class StoreController extends DownloadUtils {
                 }
                 return null;
             }
-        }.takeQrcode(EntityUtil.changeEntityByJSON(com.gic.download.qo.QrcodeQO.class, qrcodeQO), total,
+        }.takeQrcode(EntityUtil.changeEntityByJSON(com.gic.download.qo.QrcodeQO.class, qrcodeQO), total, QrcodeTypeEnum.STORE.getType(),
                 downloadReportApiService, weixinBaseFunService, weixinWxaFunService, qrCodeApiService);
         return RestResponse.success();
     }

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

@@ -7,7 +7,7 @@ import java.util.List;
 import com.gic.store.dto.StoreSearchDTO;
 import org.apache.commons.lang.StringUtils;
 
-public class QrcodeQO extends StoreSearchDTO implements Serializable {
+public class QrcodeQO implements Serializable {
     private Integer h5 = 0;
     private String appletIds;
     private String fwhIds;
@@ -19,6 +19,7 @@ public class QrcodeQO extends StoreSearchDTO implements Serializable {
     private String callBackService;
     private String callBackMethod;
     private String fileName;
+    private StoreSearchDTO storeSearchDTO;
 
     public Integer getH5() {
         return h5;
@@ -109,4 +110,12 @@ public class QrcodeQO extends StoreSearchDTO implements Serializable {
     public void setIsAll(Integer isAll) {
         this.isAll = isAll;
     }
+
+    public StoreSearchDTO getStoreSearchDTO() {
+        return storeSearchDTO;
+    }
+
+    public void setStoreSearchDTO(StoreSearchDTO storeSearchDTO) {
+        this.storeSearchDTO = storeSearchDTO;
+    }
 }