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

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

+package com.gic.haoban.manage.api.dto.hm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 多人活码(TabHaobanHmClerkRelation)实体类
+ *
+ * @author mozhu
+ * @since 2022-07-04 15:42:20
+ */
+public class HmClerkRelationDTO implements Serializable {
+    private static final long serialVersionUID = 277698847715591316L;
+    
+    private Long relationId;
+    
+    private Long hmId;
+    
+    private String wxUserId;
+    
+    private String wxEnterpriseId;
+    
+    private String enterpriseId;
+    
+    private String storeId;
+    
+    private String storeName;
+    
+    private String storeCode;
+    
+    private String clerkId;
+    
+    private String clerkName;
+    
+    private String clerkCode;
+    /**
+     * 1正常 0删除
+     */
+    private Integer status;
+    
+    private Date createTime;
+    
+    private Date updateTime;
+    /**
+     * 是否上限1是0否
+     */
+    private Integer overFlag;
+
+
+    public Long getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Long relationId) {
+        this.relationId = relationId;
+    }
+
+    public Long getHmId() {
+        return hmId;
+    }
+
+    public void setHmId(Long hmId) {
+        this.hmId = hmId;
+    }
+
+    public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId;
+    }
+
+    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 getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getOverFlag() {
+        return overFlag;
+    }
+
+    public void setOverFlag(Integer overFlag) {
+        this.overFlag = overFlag;
+    }
+
+}
+

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java

 package com.gic.haoban.manage.api.service;
 
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.api.dto.*;
 
@@ -52,6 +53,8 @@ public interface WxEnterpriseApiService {
      * @return
      */
     WxEnterpriseDTO getEnterpriseBycorpId(String corpId);
+    
+    ServiceResponse<Boolean> isStopHaoban(String corpId);
 
     /**
      * 更新企业

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmQrcodeApiService.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.service.hm;
 
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.PageResult2;
+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.HmQrcodeListDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeStoreDTO;
@@ -122,5 +123,13 @@ public interface HmQrcodeApiService {
      */
     List<HmQrcodeStoreDTO> getHmStoreByEnterpriseId(String enterpriseId);
 
-
+    /**
+     * 根据导购信息获取hmid
+     *
+     * @param hmId hm id
+     * @return {@link List }<{@link HmClerkRelationDTO }>
+     * @author mozhu
+     * @date 2022-07-13 17:09:56
+     */
+    List<HmClerkRelationDTO> getHmClerkByHmId(Long hmId);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseRelatedMapper.java

@@ -20,6 +20,8 @@ public interface WxEnterpriseRelatedMapper {
 
     List<TabHaobanWxEnterpriseRelated> listByWxenterpriseId(String wxEnterpriseId);
     
+    List<TabHaobanWxEnterpriseRelated> listByWxEnterpriseIdAndNoStatus(String wxEnterpriseId) ;
+    
     List<TabHaobanWxEnterpriseRelated> listByWxenterpriseIdList(@Param("wxEnterpriseIdList") List<String> wxEnterpriseIdList);
 
     List<TabHaobanWxEnterpriseRelated> listByEnterpriseId(String enterpriseId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmClerkRelationMapper.java

@@ -109,7 +109,18 @@ public interface TabHaobanHmClerkRelationMapper {
      * @author mozhu
      * @date 2022-07-08 14:56:59
      */
-    List<String> getClerkIdByHmId(@Param("hmId") Long hmId);
+    List<String> getNumByHmId(@Param("hmId") Long hmId);
+
+
+    /**
+     * 根据导购信息获取hmid
+     *
+     * @param hmId hm id
+     * @return {@link List }<{@link TabHaobanHmClerkRelation }>
+     * @author mozhu
+     * @date 2022-07-13 17:04:38
+     */
+    List<TabHaobanHmClerkRelation> getHmClerkByHmId(@Param("hmId") Long hmId);
 
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WxEnterpriseService.java

@@ -33,7 +33,6 @@ public interface WxEnterpriseService {
 
 	int unbind(String wxEnterpriseId);
 
-	@Deprecated
 	TabHaobanWxEnterprise getEnterpriseBycorpIdNoStatus(String corpid);
 
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmClerkRelationService.java

@@ -110,4 +110,15 @@ public interface HmClerkRelationService {
      * @date 2022-07-08 14:59:26
      */
     List<String> getClerkIdByHmId(Long hmId);
+
+
+    /**
+     * 获取导购
+     * @param hmId hm id
+     * @return {@link List }<{@link HmClerkRelationBO }>
+     * @author mozhu
+     * @date 2022-07-13 17:06:22
+     */
+    List<HmClerkRelationBO> getHmClerkByHmId(Long hmId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmClerkRelationServiceImpl.java

@@ -76,6 +76,12 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
 
     @Override
     public List<String> getClerkIdByHmId(Long hmId) {
-        return tabHaobanHmClerkRelationMapper.getClerkIdByHmId(hmId);
+        return tabHaobanHmClerkRelationMapper.getNumByHmId(hmId);
     }
+
+    @Override
+    public List<HmClerkRelationBO> getHmClerkByHmId(Long hmId) {
+        return EntityUtil.changeEntityListByJSON(HmClerkRelationBO.class,tabHaobanHmClerkRelationMapper.getHmClerkByHmId(hmId));
+    }
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java

@@ -10,6 +10,7 @@ import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+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.HmQrcodeListDTO;
 import com.gic.haoban.manage.api.dto.hm.HmQrcodeStoreDTO;
@@ -564,4 +565,9 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         RedisUtil.setCache(key, hmQrcodeStoreDTOS, 10L, TimeUnit.MINUTES);
         return hmQrcodeStoreDTOS;
     }
+
+    @Override
+    public List<HmClerkRelationDTO> getHmClerkByHmId(Long hmId) {
+        return EntityUtil.changeEntityListNew(HmClerkRelationDTO.class,hmClerkRelationService.getHmClerkByHmId(hmId));
+    }
 }

haoban-manage3-service/src/main/resources/mapper/WxEnterpriseRelatedMapper.xml

@@ -178,6 +178,13 @@
         where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
         and status_flag = 1
     </select>
+    
+     <select id="listByWxEnterpriseIdAndNoStatus" resultMap="BaseResultMap"  parameterType="java.lang.String">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_wx_enterprise_related
+        where wx_enterprise_id = #{wxEnterpriseId}
+    </select>
 
     <select id="listByWxenterpriseIdList" resultMap="BaseResultMap">
         select

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmClerkRelationMapper.xml

@@ -163,11 +163,18 @@
     </select>
 
 
-    <select id="getClerkIdByHmId" resultType="string">
+    <select id="getNumByHmId" resultType="string">
         select clerk_id
         from tab_haoban_hm_clerk_relation
         where hm_id = #{hmId}
     </select>
 
+
+    <select id="getHmClerkByHmId" resultMap="TabHaobanHmClerkRelationMap">
+        select <include refid="Base_Column_List"></include>
+        from tab_haoban_hm_clerk_relation
+        where hm_id = #{hmId} and status = 1
+    </select>
+
 </mapper>
 

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

 package com.gic.haoban.manage.web.controller.hm;
 
-
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 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.HmQrcodeListDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
@@ -18,6 +19,10 @@ import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.api.util.DataHttpUtil;
 import com.gic.haoban.manage.web.dto.HmOverviewDTO;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.qo.hm.data.HmDetailClerkListQO;
+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;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -85,7 +90,7 @@ public class HmQrcodeController {
      * @return
      */
     @RequestMapping(value = "list", method = RequestMethod.POST)
-    public RestResponse<Page<HmQrcodeListDTO>> update(@RequestBody HmQrcodeListQDTO hmQrcodeListQDTO) {
+    public RestResponse<Page<HmQrcodeListDTO>> list(@RequestBody HmQrcodeListQDTO hmQrcodeListQDTO) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         List<String> storeList =  staffApiService.getHaoBanStoreIdsRolesByClerkId(loginUser.getClerkId(), loginUser.getWxEnterpriseId());
         if (CollectionUtils.isEmpty(storeList)) {
@@ -121,26 +126,80 @@ public class HmQrcodeController {
 
     /**
      * 数据统计
-     * @param hmId
-     * @param type
+     * @param hmTrendQO
      * @return
      */
-    @RequestMapping(value = "detail-data-statistics", method = RequestMethod.DELETE)
-    public RestResponse detailDataStatistics(Long hmId,Integer type) {
+    @RequestMapping(value = "detail-data-statistics", method = RequestMethod.POST)
+    public RestResponse detailDataStatistics(@RequestBody HmTrendQO hmTrendQO) {
+        Integer type = hmTrendQO.getType();
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        Map<String,Object> map = new HashMap<>();
-        map.put("hmId",hmId);
-        map.put("enterpriseId",loginUser.getEnterpriseId());
-        StatisticsDTO statisticsDTO = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_overview, map);
+        hmTrendQO.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);
+        List<Map> list = new ArrayList<>();
         if (type == 1) {
             //天
-
+            StatisticsDTO dto = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_trend_d, hmTrendQO);
+            list= JSON.parseArray(JSON.toJSONString(dto.getData()), Map.class);
         } else if (type == 2) {
             //月
+            StatisticsDTO dto = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_trend_m, hmTrendQO);
+            list= JSON.parseArray(JSON.toJSONString(dto.getData()), Map.class);
+        }
+        hmTrendVO.setDateList(list);
+        return RestResponse.successResult(hmTrendVO);
+    }
 
+    /**
+     * 使用成员
+     * @return
+     */
+    @RequestMapping(value = "detail-clerk-list", method = RequestMethod.GET)
+    public RestResponse detailClerkList(Long hmId) {
+        HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.queryById(hmId);
+        if (hmQrcodeDTO == null) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_8.getCode()),HaoBanErrCode.ERR_8.getMsg());
         }
-        return RestResponse.successResult();
+        Integer hmType = hmQrcodeDTO.getHmType();
+        List<HmDetailClerkListVO> list = new ArrayList<>();
+        if (hmType == 1) {
+            HmDetailClerkListVO hmDetailClerkListVO = EntityUtil.changeEntityNew(HmDetailClerkListVO.class,hmQrcodeDTO);
+            list.add(hmDetailClerkListVO);
+        } else if (hmType == 2) {
+            List<HmClerkRelationDTO> hmClerkByHmId = hmQrcodeApiService.getHmClerkByHmId(hmId);
+            list = EntityUtil.changeEntityListNew(HmDetailClerkListVO.class, hmClerkByHmId);
+        }
+        return RestResponse.successResult(list);
+    }
+
+
+
+    /**
+     * 查看明细列表
+     * @param hmDetailClerkListQO
+     * @return
+     */
+    @RequestMapping(value = "detail-clerk-list-page", method = RequestMethod.POST)
+    public RestResponse detailClerkListPage(@RequestBody HmDetailClerkListQO hmDetailClerkListQO) {
+        hmDetailClerkListQO.setEnterpriseId(AuthWebRequestUtil.getLoginUser().getEnterpriseId());
+        hmDetailClerkListQO.setPageNo(hmDetailClerkListQO.getPageNum());
+
+        Long hmId = hmDetailClerkListQO.getHmId();
+        HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.queryById(hmId);
+        if (hmQrcodeDTO == null) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_8.getCode()),HaoBanErrCode.ERR_8.getMsg());
+        }
+        Integer hmType = hmQrcodeDTO.getHmType();
+        StatisticsDTO statisticsDTO = null;
+        if (hmType == 1) {
+            statisticsDTO = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_single_detail, hmDetailClerkListQO);
+        } else if (hmType == 2) {
+            statisticsDTO = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_many_detail, hmDetailClerkListQO);
+        }
+        return RestResponse.successResult(statisticsDTO);
     }
+
+
 }
 

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

+package com.gic.haoban.manage.web.qo.hm.data;
+
+import com.gic.haoban.base.api.common.BasePageInfo;
+
+import java.io.Serializable;
+
+public class HmDetailClerkListQO extends BasePageInfo implements Serializable {
+    private static final long serialVersionUID = -5504797924745631906L;
+    private String enterpriseId;
+    private Long hmId;
+    private String startTime;
+    private String endTime;
+    private String storeSelect;
+    private String clerkSelect;
+    private String orderByField;
+    private Integer pageNo;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getHmId() {
+        return hmId;
+    }
+
+    public void setHmId(Long hmId) {
+        this.hmId = hmId;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    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 String getOrderByField() {
+        return orderByField;
+    }
+
+    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/HmTrendQO.java

+package com.gic.haoban.manage.web.qo.hm.data;
+
+import java.io.Serializable;
+
+public class HmTrendQO implements Serializable {
+    private static final long serialVersionUID = 5002448176485217071L;
+    private String enterpriseId;
+    private Long hmId;
+    private String startTime;
+    private String endTime;
+    private Integer type;
+
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getHmId() {
+        return hmId;
+    }
+
+    public void setHmId(Long hmId) {
+        this.hmId = hmId;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmDetailClerkListVO.java

+package com.gic.haoban.manage.web.vo.hm;
+
+import java.io.Serializable;
+
+public class HmDetailClerkListVO implements Serializable {
+    private static final long serialVersionUID = -9170662493253725658L;
+    private String enterpriseId;
+    private Long hmId;
+    private String clerkId;
+    private String clerkName;
+    private String clerkCode;
+    private String storeName;
+    private String storeCode;
+    private String staffName;
+    private String addNumT;
+    private String addNum;
+    private String overFlag;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getHmId() {
+        return hmId;
+    }
+
+    public void setHmId(Long hmId) {
+        this.hmId = hmId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getAddNumT() {
+        return addNumT;
+    }
+
+    public void setAddNumT(String addNumT) {
+        this.addNumT = addNumT;
+    }
+
+    public String getAddNum() {
+        return addNum;
+    }
+
+    public void setAddNum(String addNum) {
+        this.addNum = addNum;
+    }
+
+    public String getOverFlag() {
+        return overFlag;
+    }
+
+    public void setOverFlag(String overFlag) {
+        this.overFlag = overFlag;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmTrendVO.java

+package com.gic.haoban.manage.web.vo.hm;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+public class HmTrendVO implements Serializable {
+    private static final long serialVersionUID = 5002448176485217071L;
+    private String enterpriseId;
+    private Long hmId;
+    private Integer addNumT;
+    private Integer addNum;
+    private List<Map> dateList;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getHmId() {
+        return hmId;
+    }
+
+    public void setHmId(Long hmId) {
+        this.hmId = hmId;
+    }
+
+    public Integer getAddNumT() {
+        return addNumT;
+    }
+
+    public void setAddNumT(Integer addNumT) {
+        this.addNumT = addNumT;
+    }
+
+    public Integer getAddNum() {
+        return addNum;
+    }
+
+    public void setAddNum(Integer addNum) {
+        this.addNum = addNum;
+    }
+
+    public List<Map> getDateList() {
+        return dateList;
+    }
+
+    public void setDateList(List<Map> dateList) {
+        this.dateList = dateList;
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

 package com.gic.haoban.manage.web.controller;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -12,7 +32,11 @@ import com.gic.dict.api.service.ManagerDictService;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
-import com.gic.haoban.app.customer.dto.*;
+import com.gic.haoban.app.customer.dto.ChildDTO;
+import com.gic.haoban.app.customer.dto.CustomerDTO;
+import com.gic.haoban.app.customer.dto.FilterListDTO;
+import com.gic.haoban.app.customer.dto.MemberInfoListParamsDTO;
+import com.gic.haoban.app.customer.dto.StaffOpenRelatedDTO;
 import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.app.customer.service.api.service.StaffMemberRelationApiService;
 import com.gic.haoban.common.anno.HttpLimit;
@@ -21,9 +45,30 @@ import com.gic.haoban.common.utils.AuthRequestWellDoneUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.JwtUtil;
-import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO;
+import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
+import com.gic.haoban.manage.api.dto.ExternalUserDTO;
+import com.gic.haoban.manage.api.dto.MemberStoreDTO;
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+import com.gic.haoban.manage.api.dto.MiniprogramSettingDTO;
+import com.gic.haoban.manage.api.dto.SecretSettingDTO;
+import com.gic.haoban.manage.api.dto.StaffClerkInfoDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.dto.StaffPrivacyUseLogDTO;
+import com.gic.haoban.manage.api.dto.UserLoginLogDTO;
+import com.gic.haoban.manage.api.dto.WxApplicationDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseRelationDetailDTO;
+import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
+import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
+import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.api.service.WxApplicationApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.GetUserByMemberCodeQo;
@@ -38,21 +83,9 @@ import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import java.util.*;
-import java.util.stream.Collectors;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 
 @RestController
 public class WxEnterpriseInfoController extends WebBaseController {
@@ -117,6 +150,14 @@ public class WxEnterpriseInfoController extends WebBaseController {
         }
         String userId = user.getUserid();
         String corpId = user.getCorpid();
+        // 判断好办是否到期
+        ServiceResponse<Boolean> resp = this.wxEnterpriseApiService.isStopHaoban(corpId) ;
+        if(!resp.isSuccess()) {
+            HaobanResponse response = new HaobanResponse() ;
+            response.setErrorCode(-888);
+            response.setMessage(resp.getMessage());
+            return response ;
+        }
         WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
         StaffDTO loginStaff = null;
         if (enterprise != null) {