Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -21,38 +21,34 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
     /**
      * 1单人 2多人
      */
-    private Integer hmType;
+    private Integer hmTypeInt;
     
     private String wxEnterpriseId;
     
     private String enterpriseId;
     
-    private String keyword;
+    private String hmSelect;
 
-    private String storeSearch;
+    private String storeSelect;
 
-    private Date createTimeStart;
+    private String clerkSelect;
+
+    private Date startTime;
     
-    private Date createTimeEnd;
+    private Date endTime;
     /**
      * 0删除 1正常 2作废 3待生效
      */
-    private Integer statusFlag;
-    
-    private String storeId;
-    
-    private String clerkId;
-    
-    private String clerkName;
-    
-    private String clerkCode;
+    private Integer statusFlagInt;
+
+    private String orderByField;
 
     /**
      * 活码分组
      */
     private Long hmGroupId;
 
-    private List<String> storeIdList;
+    private List<String> storeId;
 
     public Long getHmId() {
         return hmId;
@@ -62,12 +58,12 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
         this.hmId = hmId;
     }
 
-    public Integer getHmType() {
-        return hmType;
+    public Integer getHmTypeInt() {
+        return hmTypeInt;
     }
 
-    public void setHmType(Integer hmType) {
-        this.hmType = hmType;
+    public void setHmTypeInt(Integer hmTypeInt) {
+        this.hmTypeInt = hmTypeInt;
     }
 
     public String getWxEnterpriseId() {
@@ -86,76 +82,60 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
         this.enterpriseId = enterpriseId;
     }
 
-    public String getKeyword() {
-        return keyword;
-    }
-
-    public void setKeyword(String keyword) {
-        this.keyword = keyword;
-    }
-
-    public Date getCreateTimeStart() {
-        return createTimeStart;
+    public String getHmSelect() {
+        return hmSelect;
     }
 
-    public void setCreateTimeStart(Date createTimeStart) {
-        this.createTimeStart = createTimeStart;
+    public void setHmSelect(String hmSelect) {
+        this.hmSelect = hmSelect;
     }
 
-    public Date getCreateTimeEnd() {
-        return createTimeEnd;
+    public String getStoreSelect() {
+        return storeSelect;
     }
 
-    public void setCreateTimeEnd(Date createTimeEnd) {
-        this.createTimeEnd = createTimeEnd;
+    public void setStoreSelect(String storeSelect) {
+        this.storeSelect = storeSelect;
     }
 
-    public Integer getStatusFlag() {
-        return statusFlag;
+    public String getClerkSelect() {
+        return clerkSelect;
     }
 
-    public void setStatusFlag(Integer statusFlag) {
-        this.statusFlag = statusFlag;
+    public void setClerkSelect(String clerkSelect) {
+        this.clerkSelect = clerkSelect;
     }
 
-    public String getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(String storeId) {
-        this.storeId = storeId;
+    public Date getStartTime() {
+        return startTime;
     }
 
-    public String getStoreSearch() {
-        return storeSearch;
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
     }
 
-    public void setStoreSearch(String storeSearch) {
-        this.storeSearch = storeSearch;
+    public Date getEndTime() {
+        return endTime;
     }
 
-    public String getClerkId() {
-        return clerkId;
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
     }
 
-    public void setClerkId(String clerkId) {
-        this.clerkId = clerkId;
+    public Integer getStatusFlagInt() {
+        return statusFlagInt;
     }
 
-    public String getClerkName() {
-        return clerkName;
+    public void setStatusFlagInt(Integer statusFlagInt) {
+        this.statusFlagInt = statusFlagInt;
     }
 
-    public void setClerkName(String clerkName) {
-        this.clerkName = clerkName;
+    public String getOrderByField() {
+        return orderByField;
     }
 
-    public String getClerkCode() {
-        return clerkCode;
-    }
-
-    public void setClerkCode(String clerkCode) {
-        this.clerkCode = clerkCode;
+    public void setOrderByField(String orderByField) {
+        this.orderByField = orderByField;
     }
 
     public Long getHmGroupId() {
@@ -166,12 +146,12 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
         this.hmGroupId = hmGroupId;
     }
 
-    public List<String> getStoreIdList() {
-        return storeIdList;
+    public List<String> getStoreId() {
+        return storeId;
     }
 
-    public void setStoreIdList(List<String> storeIdList) {
-        this.storeIdList = storeIdList;
+    public void setStoreId(List<String> storeId) {
+        this.storeId = storeId;
     }
 }
 

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

 package com.gic.haoban.manage.api.dto.qdto.hm;
 
+import com.gic.api.base.commons.BasePageInfo;
+
 import java.io.Serializable;
 import java.util.Date;
 
-public class WxUserAddLogSearchQDTO implements Serializable {
+public class WxUserAddLogSearchQDTO extends BasePageInfo implements Serializable {
 
     /**
     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)

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

 package com.gic.haoban.manage.api.service.hm;
 
-import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
-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;
-import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 
 import java.util.List;
@@ -39,16 +35,6 @@ public interface HmQrcodeApiService {
     int update(HmQrcodeQDTO hmQrcodeQDTO);
 
     /**
-     * 查询列表页面
-     *
-     * @param hmQrcodeListQDTO hm qrcode qdto列表
-     * @return {@link PageResult2 }<{@link HmQrcodeDTO }>
-     * @author mozhu
-     * @date 2022-07-05 10:59:01
-     */
-    Page<HmQrcodeListDTO> queryListByPage(HmQrcodeListQDTO hmQrcodeListQDTO);
-
-    /**
      * 查询详情
      *
      * @param hmId hb id

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

@@ -46,6 +46,10 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
     public int insert(HmQrcodeQDTO hmQrcodeQDTO) {
         hmQrcodeQDTO.setCreateTime(new Date());
         hmQrcodeQDTO.setUpdateTime(new Date());
+        hmQrcodeQDTO.setPassFlag(1);
+        hmQrcodeQDTO.setOverFlag(0);
+        hmQrcodeQDTO.setAddNum(0);
+        hmQrcodeQDTO.setStatusFlag(1);
         return this.tabHaobanHmQrcodeMapper.insert(EntityUtil.changeEntity(TabHaobanHmQrcode.class, hmQrcodeQDTO));
     }
 
@@ -116,6 +120,7 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
         return tabHaobanHmQrcodeMapper.getTotalByEnterpriseId(enterpriseId);
     }
 
+    @Override
     public int batchUpdateQrcodeGroup(List<Long> hmIds, Long groupId){
         return tabHaobanHmQrcodeMapper.batchUpdateQrCodeGroup(hmIds, groupId);
     }

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

 package com.gic.haoban.manage.service.service.out.impl.hm;
 
-import com.gic.api.base.commons.Page;
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
@@ -9,15 +9,12 @@ import com.gic.commons.util.UniqueIdUtils;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
-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;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmClerkRelationQDTO;
-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.enums.hm.HmWelcomeReferType;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
@@ -114,7 +111,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
         if (wxEnterpriseDTO == null) {
             logger.error("未查询到微信企业");
-            return 0;
+            return HaoBanErrCodeCommon.ERR_8.getCode();
         }
 
         hmQrcodeQDTO.setHmId(UniqueIdUtils.uniqueLong());
@@ -137,6 +134,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         qywxExternalcontactDTO.setState("HM" + hmId);
         List<String> userIds = staffClerkRelationService.listWxUserIdByClerkIds(clerkIdList, wxEnterpriseId);
         qywxExternalcontactDTO.setUser(userIds);
+        logger.info("新增活码参数：{}", JSON.toJSONString(qywxExternalcontactDTO));
         QywxExternalcontactResultDTO qywxExternalcontactResultDTO = qywxUserApiService.addContactWay(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), qywxExternalcontactDTO);
         if (qywxExternalcontactResultDTO != null && "0".equals(qywxExternalcontactResultDTO.getErrcode())) {
             hmQrcodeQDTO.setWxQrcode(qywxExternalcontactResultDTO.getQr_code());
@@ -357,6 +355,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
                 TabHaobanStaff tabHaobanStaff = staffService.selectById(staffClerkRelationDTO.getStaffId());
                 if (tabHaobanStaff != null) {
                     hmQrcodeQDTO.setStaffName(tabHaobanStaff.getStaffName());
+                    hmQrcodeQDTO.setWxUserId(tabHaobanStaff.getWxUserId());
                 }
             }
         }
@@ -404,11 +403,6 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         hmClerkRelationService.insertBatch(clerkRelationQDTOS);
     }
 
-    @Override
-    public Page<HmQrcodeListDTO> queryListByPage(HmQrcodeListQDTO hmQrcodeListQDTO) {
-        Page<HmQrcodeBO> hmQrcodeBOPage = hmQrcodeService.queryByPage(hmQrcodeListQDTO);
-        return PageUtil.changePageToCurrentPage(hmQrcodeBOPage,HmQrcodeListDTO.class);
-    }
 
     @Override
     public HmQrcodeDTO queryById(Long hmId) {

haoban-manage3-service/src/test/java/HmLinkTest.java

-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
-import com.gic.haoban.manage.api.enums.KeyDataEnum;
 import com.gic.haoban.manage.api.service.KeyDataApiService;
 import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
 import com.gic.haoban.manage.api.service.hm.HmLinkVisitLogApiService;
 import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
 import com.gic.haoban.manage.service.util.QwFriendLimitCountUtil;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = { "classpath:applicationContext-conf.xml" })
@@ -34,11 +32,7 @@ public class HmLinkTest {
     @Autowired
     private HmLinkStoreService hmLinkStoreService;
     
-    @Test
-    public void getLinkHmFromWxa(){
-        this.hmLinkApiService.getLinkHmFromWxa("ff8080815dacd3a2015dacd3ef5c0000", null, null, null, "417109414906961921", "ubkCBFK", null) ;
-    }
-    
+
     @Test
     public void saveLinkStore() {
         HmLinkStoreDTO dto = new HmLinkStoreDTO();

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

@@ -2,6 +2,7 @@ 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.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
@@ -11,12 +12,14 @@ 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.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;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
+import com.gic.haoban.manage.api.service.hm.WxUserAddLogApiService;
 import com.gic.haoban.manage.api.util.DataHttpUtil;
 import com.gic.haoban.manage.web.dto.HmOverviewDTO;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -49,6 +52,8 @@ public class HmQrcodeController {
     private HmQrcodeApiService hmQrcodeApiService;
     @Autowired
     private StaffApiService staffApiService;
+    @Autowired
+    private WxUserAddLogApiService wxUserAddLogApiService;
 
     /**
      * 新增
@@ -92,16 +97,18 @@ public class HmQrcodeController {
      * @return
      */
     @RequestMapping(value = "list", method = RequestMethod.POST)
-    public RestResponse<Page<HmQrcodeListDTO>> list(@RequestBody HmQrcodeListQDTO hmQrcodeListQDTO) {
+    public RestResponse<StatisticsDTO> list(@RequestBody HmQrcodeListQDTO hmQrcodeListQDTO) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        hmQrcodeListQDTO.setEnterpriseId(loginUser.getEnterpriseId());
         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.setStoreIdList(storeList);
+            hmQrcodeListQDTO.setStoreId(storeList);
         }
-        return RestResponse.successResult(this.hmQrcodeApiService.queryListByPage(hmQrcodeListQDTO));
+        StatisticsDTO statisticsDTO = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_list, hmQrcodeListQDTO);
+        return RestResponse.successResult(statisticsDTO);
     }
 
     /**
@@ -212,6 +219,18 @@ public class HmQrcodeController {
         return RestResponse.successResult(serviceResponse.getResult());
     }
 
-
+    /**
+     * 详情-查看记录
+     * @param qdto
+     * @return
+     */
+    @RequestMapping(path = "/wxUserAddLog/list")
+    public RestResponse<?> wxUserAddLogList(@RequestBody WxUserAddLogSearchQDTO qdto){
+        BasePageInfo pageInfo = new BasePageInfo();
+        pageInfo.setPageNum(qdto.getPageNum());
+        pageInfo.setPageSize(qdto.getPageSize());
+        ServiceResponse<Page<WxUserAddLogDTO>> page = wxUserAddLogApiService.page(qdto, pageInfo);
+        return RestResponse.successResult(page.getResult());
+    }
 }