Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmQrcodeListQDTO.java

@@ -48,6 +48,8 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
      */
     private Long hmGroupId;
 
+    private Integer pageNo;
+
     private List<String> storeId;
 
     public Long getHmId() {
@@ -153,5 +155,13 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
     public void setStoreId(List<String> storeId) {
         this.storeId = storeId;
     }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
 }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java

@@ -13,7 +13,6 @@ import com.gic.haoban.manage.api.constants.StatisticsApolloKeyConstant;
 import com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
 import com.gic.haoban.manage.api.dto.hm.WxUserAddLogDTO;
-import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO;
 import com.gic.haoban.manage.api.dto.statistics.StatisticsDTO;
@@ -25,6 +24,7 @@ import com.gic.haoban.manage.web.dto.HmOverviewDTO;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.hm.HmQrcodeUpdateQO;
 import com.gic.haoban.manage.web.qo.hm.data.HmDetailClerkListQO;
+import com.gic.haoban.manage.web.qo.hm.data.HmQrcodeListQO;
 import com.gic.haoban.manage.web.qo.hm.data.HmTrendQO;
 import com.gic.haoban.manage.web.vo.hm.HmDetailClerkListVO;
 import com.gic.haoban.manage.web.vo.hm.HmTrendVO;
@@ -93,21 +93,22 @@ public class HmQrcodeController {
 
     /**
      * 列表
-     * @param hmQrcodeListQDTO
+     * @param hmQrcodeListQO
      * @return
      */
     @RequestMapping(value = "list", method = RequestMethod.POST)
-    public RestResponse<StatisticsDTO> list(@RequestBody HmQrcodeListQDTO hmQrcodeListQDTO) {
+    public RestResponse<StatisticsDTO> list(@RequestBody HmQrcodeListQO hmQrcodeListQO) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        hmQrcodeListQDTO.setEnterpriseId(loginUser.getEnterpriseId());
+        hmQrcodeListQO.getInFields().setEnterpriseId(loginUser.getEnterpriseId());
+        hmQrcodeListQO.setPageNo(hmQrcodeListQO.getPageNo());
         List<String> storeList =  staffApiService.getHaoBanStoreIdsRolesByClerkId(loginUser.getClerkId(), loginUser.getWxEnterpriseId());
         if (CollectionUtils.isEmpty(storeList)) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_100007.getCode()),HaoBanErrCode.ERR_100007.getMsg());
         }
         if (!storeList.contains("-1")) {
-            hmQrcodeListQDTO.setStoreId(storeList);
+            hmQrcodeListQO.getInFields().setStoreId(storeList);
         }
-        StatisticsDTO statisticsDTO = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_list, hmQrcodeListQDTO);
+        StatisticsDTO statisticsDTO = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_list, hmQrcodeListQO);
         return RestResponse.successResult(statisticsDTO);
     }
 
@@ -140,9 +141,9 @@ public class HmQrcodeController {
      */
     @RequestMapping(value = "detail-data-statistics", method = RequestMethod.POST)
     public RestResponse detailDataStatistics(@RequestBody HmTrendQO hmTrendQO) {
-        Integer type = hmTrendQO.getType();
+        Integer type = hmTrendQO.getInFields().getType();
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        hmTrendQO.setEnterpriseId(loginUser.getEnterpriseId());
+        hmTrendQO.getInFields().setEnterpriseId(loginUser.getEnterpriseId());
         StatisticsDTO statisticsDTO = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_overview, hmTrendQO);
         HmOverviewDTO hmOverviewDTO = JSON.parseObject(JSON.toJSONString(statisticsDTO.getOne()),HmOverviewDTO.class);
         HmTrendVO hmTrendVO = EntityUtil.changeEntityNew(HmTrendVO.class,hmOverviewDTO);
@@ -191,10 +192,9 @@ public class HmQrcodeController {
      */
     @RequestMapping(value = "detail-clerk-list-page", method = RequestMethod.POST)
     public RestResponse detailClerkListPage(@RequestBody HmDetailClerkListQO hmDetailClerkListQO) {
-        hmDetailClerkListQO.setEnterpriseId(AuthWebRequestUtil.getLoginUser().getEnterpriseId());
+        hmDetailClerkListQO.getInFields().setEnterpriseId(AuthWebRequestUtil.getLoginUser().getEnterpriseId());
         hmDetailClerkListQO.setPageNo(hmDetailClerkListQO.getPageNum());
-
-        Long hmId = hmDetailClerkListQO.getHmId();
+        Long hmId = hmDetailClerkListQO.getInFields().getHmId();
         HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.queryById(hmId);
         if (hmQrcodeDTO == null) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_8.getCode()),HaoBanErrCode.ERR_8.getMsg());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmDetailClerkListQO.java

@@ -6,6 +6,26 @@ import java.io.Serializable;
 
 public class HmDetailClerkListQO extends BasePageInfo implements Serializable {
     private static final long serialVersionUID = -5504797924745631906L;
+    private InFields inFields;
+    private Integer pageNo;
+
+    public InFields getInFields() {
+        return inFields;
+    }
+
+    public void setInFields(InFields inFields) {
+        this.inFields = inFields;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public static class InFields {
         private String enterpriseId;
         private Long hmId;
         private String startTime;
@@ -13,7 +33,6 @@ public class HmDetailClerkListQO extends BasePageInfo implements Serializable {
         private String storeSelect;
         private String clerkSelect;
         private String orderByField;
-    private Integer pageNo;
 
         public String getEnterpriseId() {
             return enterpriseId;
@@ -70,12 +89,6 @@ public class HmDetailClerkListQO extends BasePageInfo implements Serializable {
         public void setOrderByField(String orderByField) {
             this.orderByField = orderByField;
         }
-
-    public Integer getPageNo() {
-        return pageNo;
     }
 
-    public void setPageNo(Integer pageNo) {
-        this.pageNo = pageNo;
-    }
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmQrcodeListQO.java

+package com.gic.haoban.manage.web.qo.hm.data;
+
+import com.gic.haoban.base.api.common.BasePageInfo;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 活码(TabHaobanHmQrcode)实体类
+ *
+ * @author mozhu
+ * @since 2022-07-04 15:42:20
+ */
+public class HmQrcodeListQO extends BasePageInfo implements Serializable {
+
+    private static final long serialVersionUID = 887910678030827375L;
+
+    private Integer pageNo;
+
+    private InFields inFields;
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public InFields getInFields() {
+        return inFields;
+    }
+
+    public void setInFields(InFields inFields) {
+        this.inFields = inFields;
+    }
+
+    public static class InFields {
+        private Long hmId;
+
+        /**
+         * 1单人 2多人
+         */
+        private Integer hmTypeInt;
+
+        private String wxEnterpriseId;
+
+        private String enterpriseId;
+
+        private String hmSelect;
+
+        private String storeSelect;
+
+        private String clerkSelect;
+
+        private Date startTime;
+
+        private Date endTime;
+        /**
+         * 0删除 1正常 2作废 3待生效
+         */
+        private Integer statusFlagInt;
+
+        private String orderByField;
+
+        /**
+         * 活码分组
+         */
+        private Long hmGroupId;
+
+        private List<String> storeId;
+
+        public Long getHmId() {
+            return hmId;
+        }
+
+        public void setHmId(Long hmId) {
+            this.hmId = hmId;
+        }
+
+        public Integer getHmTypeInt() {
+            return hmTypeInt;
+        }
+
+        public void setHmTypeInt(Integer hmTypeInt) {
+            this.hmTypeInt = hmTypeInt;
+        }
+
+        public String getWxEnterpriseId() {
+            return wxEnterpriseId;
+        }
+
+        public void setWxEnterpriseId(String wxEnterpriseId) {
+            this.wxEnterpriseId = wxEnterpriseId;
+        }
+
+        public String getEnterpriseId() {
+            return enterpriseId;
+        }
+
+        public void setEnterpriseId(String enterpriseId) {
+            this.enterpriseId = enterpriseId;
+        }
+
+        public String getHmSelect() {
+            return hmSelect;
+        }
+
+        public void setHmSelect(String hmSelect) {
+            this.hmSelect = hmSelect;
+        }
+
+        public String getStoreSelect() {
+            return storeSelect;
+        }
+
+        public void setStoreSelect(String storeSelect) {
+            this.storeSelect = storeSelect;
+        }
+
+        public String getClerkSelect() {
+            return clerkSelect;
+        }
+
+        public void setClerkSelect(String clerkSelect) {
+            this.clerkSelect = clerkSelect;
+        }
+
+        public Date getStartTime() {
+            return startTime;
+        }
+
+        public void setStartTime(Date startTime) {
+            this.startTime = startTime;
+        }
+
+        public Date getEndTime() {
+            return endTime;
+        }
+
+        public void setEndTime(Date endTime) {
+            this.endTime = endTime;
+        }
+
+        public Integer getStatusFlagInt() {
+            return statusFlagInt;
+        }
+
+        public void setStatusFlagInt(Integer statusFlagInt) {
+            this.statusFlagInt = statusFlagInt;
+        }
+
+        public String getOrderByField() {
+            return orderByField;
+        }
+
+        public void setOrderByField(String orderByField) {
+            this.orderByField = orderByField;
+        }
+
+        public Long getHmGroupId() {
+            return hmGroupId;
+        }
+
+        public void setHmGroupId(Long hmGroupId) {
+            this.hmGroupId = hmGroupId;
+        }
+
+        public List<String> getStoreId() {
+            return storeId;
+        }
+
+        public void setStoreId(List<String> storeId) {
+            this.storeId = storeId;
+        }
+    }
+}
+

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/data/HmTrendQO.java

@@ -4,13 +4,22 @@ import java.io.Serializable;
 
 public class HmTrendQO implements Serializable {
     private static final long serialVersionUID = 5002448176485217071L;
+    private InFields inFields;
+
+    public InFields getInFields() {
+        return inFields;
+    }
+
+    public void setInFields(InFields inFields) {
+        this.inFields = inFields;
+    }
+
+    public static class InFields {
         private String enterpriseId;
         private Long hmId;
         private String startTime;
         private String endTime;
         private Integer type;
-
-
         public String getEnterpriseId() {
             return enterpriseId;
         }
@@ -50,4 +59,6 @@ public class HmTrendQO implements Serializable {
         public void setType(Integer type) {
             this.type = type;
         }
+    }
+
 }