Skip to content

H
haoban-manage3.0
Commit 48e28745 by 徐高华
Options

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

parents 2be89610 cbca0956
Showing with 336 additions and 139 deletions
haoban-manage3-api/pom.xml
......@@ -25,17 +25,13 @@
<!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name>
<!-- 这里使用 /content/repositories/snapshots/ -->
<url>http://182.254.134.223:8081/nexus/content/repositories/snapshots/</url>
<!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>-->
<url>http://10.0.0.29:8081/nexus/content/repositories/snapshots/</url>
</repository>
<snapshotRepository>
<!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name>
<!-- 这里使用 /content/repositories/snapshots/ -->
<url>http://182.254.134.223:8081/nexus/content/repositories/Snapshots-1/</url>
<!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>-->
<url>http://10.0.0.29:8081/nexus/content/repositories/Snapshots-1/</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmQrcodeQDTO.java
package com.gic.haoban.manage.api.dto.qdto.hm;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
......@@ -100,9 +102,13 @@ public class HmQrcodeQDTO implements Serializable {
* 调用类型来源 0：不记录，1：来源为后台操作 其他查看枚举 HbBindEnum
*/
private Integer invokingType = 0;
/**
* 多人活码新增员工
*/
private String addStaffName;
private WebLoginDTO webLoginDTO;
public Long getHmId() {
return hmId;
......@@ -375,5 +381,13 @@ public class HmQrcodeQDTO implements Serializable {
public void setAddStaffName(String addStaffName) {
this.addStaffName = addStaffName;
}
public WebLoginDTO getWebLoginDTO() {
return webLoginDTO;
}
public void setWebLoginDTO(WebLoginDTO webLoginDTO) {
this.webLoginDTO = webLoginDTO;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/WxUserAddLogQDTO.java
......@@ -17,6 +17,7 @@ public class WxUserAddLogQDTO implements Serializable{
private String wxUserId;
private String staffId;
private String staffName;
private String clerkId;
public String getWxEnterpriseId() {
return wxEnterpriseId;
......@@ -105,4 +106,12 @@ public class WxUserAddLogQDTO implements Serializable{
public void setStaffName(String staffName) {
this.staffName = staffName;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/TestApiService.java
......@@ -33,7 +33,7 @@ public interface TestApiService {
* @param methodName
* @param cron
*/
void quartzTaskConvert(String serviceName, String methodName, String cron, String params);
void quartzTaskConvert(String serviceName, String methodName, String cron, String params,String referId);
/**
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmQrcodeApiService.java
......@@ -3,6 +3,7 @@ package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
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.HmQrcodeStoreDTO;
......@@ -78,7 +79,7 @@ public interface HmQrcodeApiService {
* @author mozhu
* @date 2022-07-22 15:10:42
*/
ServiceResponse delById(Long hmId,Integer invokingType);
ServiceResponse delById(Long hmId, Integer invokingType, WebLoginDTO loginDTO);
/**
* 导购解绑作废
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java
......@@ -70,7 +70,7 @@ public class TestController extends WebBaseController {
if (null == quartzEnum) {
return resultResponse(HaoBanErrCode.ERR_0);
}
testApiService.quartzTaskConvert(quartzEnum.getServiceName(), quartzEnum.getMethod(), quartzEnum.getCron(), quartzEnum.getParams());
testApiService.quartzTaskConvert(quartzEnum.getServiceName(), quartzEnum.getMethod(), quartzEnum.getCron(), quartzEnum.getParams(), null);
return resultResponse(HaoBanErrCode.ERR_1);
}
......@@ -81,11 +81,11 @@ public class TestController extends WebBaseController {
*/
@RequestMapping("/create-quarter")
@ResponseBody
public HaobanResponse createQuarter(String serviceName, String methodName, String cron, String params) {
public HaobanResponse createQuarter(String serviceName, String methodName, String cron, String params, String referId) {
if (StringUtils.isAnyBlank(serviceName, methodName, cron)) {
return resultResponse(HaoBanErrCode.ERR_2);
}
testApiService.quartzTaskConvert(serviceName, methodName, cron, params);
testApiService.quartzTaskConvert(serviceName, methodName, cron, params, referId);
return resultResponse(HaoBanErrCode.ERR_1);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmClerkRelationMapper.java
......@@ -152,5 +152,36 @@ public interface TabHaobanHmClerkRelationMapper {
*/
List<TabHaobanHmClerkRelation> queryByHmIdNotInClerkIds(@Param("hmId") Long hmId,
@Param("clerkIds") List<String> clerkIds);
/**
* 更新导购名称
*
* @param clerkId 导购id
* @param clerkName 导购名称
* @param clerkCode 职员代码
* @return int
* @author mozhu
* @date 2022-07-28 13:50:30
*/
int updateClerkNameByClerkId(@Param("enterpriseId") String enterpriseId,
@Param("clerkId") String clerkId,
@Param("clerkName") String clerkName,
@Param("clerkCode") String clerkCode);
/**
* 更改门店名称
*
* @param storeId 门店id
* @param storeName 门店名称
* @param storeCode 门店code
* @return int
* @author mozhu
* @date 2022-07-28 13:52:35
*/
int updateStoreNameByStoreId(@Param("enterpriseId") String enterpriseId,
@Param("storeId") String storeId,
@Param("storeName") String storeName,
@Param("storeCode") String storeCode);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmQrcodeMapper.java
......@@ -146,8 +146,8 @@ public interface TabHaobanHmQrcodeMapper {
* @date 2022-07-07 17:26:34
*/
TabHaobanHmQrcode queryByClerkIdAndOverFlag(@Param("clerkId") String clerkId,
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("overFlag") Integer overFlag,
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("overFlag") Integer overFlag,
@Param("hmType") Integer hmType);
/**
......@@ -158,7 +158,7 @@ public interface TabHaobanHmQrcodeMapper {
* @author mozhu
* @date 2022-07-08 15:10:57
*/
List<TabHaobanHmQrcode> getHmStoreByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseId") String enterpriseId);
List<TabHaobanHmQrcode> getHmStoreByEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId);
/**
* 根据分组id获取活码数量
......@@ -169,7 +169,7 @@ public interface TabHaobanHmQrcodeMapper {
* @author mozhu
* @date 2022-07-12 17:39:12
*/
List<HmQrcodeGroupNumBO> getGroupIdNumByEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId,@Param("groupIds") List<Long> groupIds, @Param("hmIds") List<String> hmIds);
List<HmQrcodeGroupNumBO> getGroupIdNumByEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId, @Param("groupIds") List<Long> groupIds, @Param("hmIds") List<String> hmIds);
/**
* 获取总数
......@@ -183,41 +183,72 @@ public interface TabHaobanHmQrcodeMapper {
/**
* 批量修改 活码所属分组
*
* @param ids
* @param groupId
* @return
*/
int batchUpdateQrCodeGroup(@Param("ids") List<Long> ids, @Param("groupId") Long groupId);
/**
*
* @Title: getCanAddCount
* @Description: 获取能创建活码的导购列表
* @author xugh
* @param wxEnterpriseId
* @param enterprsieId
* @param storeIdList
* @return
* @throws
* @param wxEnterpriseId
* @param enterprsieId
* @param storeIdList
* @return
* @throws
* @Title: getCanAddCount
* @Description: 获取能创建活码的导购列表
* @author xugh
*/
int getCanAddCount(@Param("wxEnterpriseId")String wxEnterpriseId , @Param("enterpriseId")String enterpriseId , @Param("storeIdList")List<String> storeIdList) ;
List<HmQrcodeClerkBO> listCanAddClerk(@Param("wxEnterpriseId")String wxEnterpriseId , @Param("enterpriseId")String enterpriseId , @Param("storeIdList")List<String> storeIdList);
int getCanAddCount(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId, @Param("storeIdList") List<String> storeIdList);
List<String> getHmStoreForWxa(@Param("wxEnterpriseId")String wxEnterpriseId , @Param("enterpriseId") String enterpriseId);
List<HmQrcodeClerkBO> listCanAddClerk(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId, @Param("storeIdList") List<String> storeIdList);
List<String> getHmStoreForWxa(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId);
List<String> listHmIdForIndex(HmQrcodeListQDTO qdto);
/**
*
* @Title: listHasQrcodeClerk
* @Description: 返回已有单人活码的clerkId
* @author xugh
* @param enterpriseId
* @param clerkId
* @return
* @throws
*/
List<String> listHasQrcodeClerk(@Param("enterpriseId")String enterpriseId , @Param("clerkIdList")List<String> clerkIdList) ;
/**
* @param enterpriseId
* @param clerkId
* @return
* @throws
* @Title: listHasQrcodeClerk
* @Description: 返回已有单人活码的clerkId
* @author xugh
*/
List<String> listHasQrcodeClerk(@Param("enterpriseId") String enterpriseId, @Param("clerkIdList") List<String> clerkIdList);
/**
* 更新导购名称
*
* @param enterpriseId 企业标识
* @param clerkId 导购id
* @param clerkName 导购名称
* @param clerkCode 职员代码
* @return int
* @author mozhu
* @date 2022-07-28 14:03:48
*/
int updateClerkNameByClerkId(@Param("enterpriseId") String enterpriseId,
@Param("clerkId") String clerkId,
@Param("clerkName") String clerkName,
@Param("clerkCode") String clerkCode);
/**
* 更改门店名称
*
* @param enterpriseId 企业标识
* @param storeId 门店id
* @param storeName 门店名称
* @param storeCode 门店code
* @return int
* @author mozhu
* @date 2022-07-28 14:03:46
*/
int updateStoreNameByStoreId(@Param("enterpriseId") String enterpriseId,
@Param("storeId") String storeId,
@Param("storeName") String storeName,
@Param("storeCode") String storeCode);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmQrcodeService.java
......@@ -191,4 +191,29 @@ public interface HmQrcodeService {
List<String> listHmIdForIndex(HmQrcodeListQDTO qdto);
List<String> listHasQrcodeClerk(String enterpriseId, List<String> clerkIdList);
/**
* 更新导购名称
*
* @param clerkId 导购id
* @param clerkName 导购名称
* @param clerkCode 导购代码
* @return int
* @author mozhu
* @date 2022-07-28 13:53:51
*/
void updateClerkNameByClerkId(String enterpriseId, String clerkId,String clerkName,String clerkCode);
/**
* 更改门店名称
*
* @param storeId 存储id
* @param storeName 商店名字
* @param storeCode 存储代码
* @return int
* @author mozhu
* @date 2022-07-28 13:54:49
*/
void updateStoreNameByStoreId(String enterpriseId,String storeId,String storeName, String storeCode);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmQrcodeServiceImpl.java
......@@ -6,6 +6,7 @@ import com.gic.haoban.common.utils.PageUtil;
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.service.StaffApiService;
import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmClerkRelationMapper;
import com.gic.haoban.manage.service.dao.mapper.hm.TabHaobanHmQrcodeMapper;
import com.gic.haoban.manage.service.entity.hm.TabHaobanHmQrcode;
import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
......@@ -36,6 +37,8 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
private TabHaobanHmQrcodeMapper tabHaobanHmQrcodeMapper;
@Autowired
private StaffApiService staffApiService;
@Autowired
private TabHaobanHmClerkRelationMapper tabHaobanHmClerkRelationMapper;
@Override
public HmQrcodeBO queryById(Long hmId) {
......@@ -84,9 +87,9 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
}
@Override
public List<HmQrcodeBO> listByStoreId(String wxEnterpriseId, String storeId, Integer overFlag,Integer hmType) {
public List<HmQrcodeBO> listByStoreId(String wxEnterpriseId, String storeId, Integer overFlag, Integer hmType) {
return EntityUtil.changeEntityListNew(HmQrcodeBO.class,
tabHaobanHmQrcodeMapper.listByStoreId(wxEnterpriseId, storeId, overFlag,hmType));
tabHaobanHmQrcodeMapper.listByStoreId(wxEnterpriseId, storeId, overFlag, hmType));
}
@Override
......@@ -106,9 +109,9 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
}
@Override
public HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer overFlag,Integer hmType) {
public HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer overFlag, Integer hmType) {
return EntityUtil.changeEntity(HmQrcodeBO.class,
tabHaobanHmQrcodeMapper.queryByClerkIdAndOverFlag(clerkId, wxEnterpriseId, overFlag,hmType));
tabHaobanHmQrcodeMapper.queryByClerkIdAndOverFlag(clerkId, wxEnterpriseId, overFlag, hmType));
}
@Override
......@@ -117,9 +120,9 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
}
@Override
public List<HmQrcodeBO> getHmStoreByEnterpriseId(String wxEnterpriseId,String enterpriseId) {
public List<HmQrcodeBO> getHmStoreByEnterpriseId(String wxEnterpriseId, String enterpriseId) {
return EntityUtil.changeEntityListNew(HmQrcodeBO.class,
tabHaobanHmQrcodeMapper.getHmStoreByEnterpriseId(wxEnterpriseId ,enterpriseId));
tabHaobanHmQrcodeMapper.getHmStoreByEnterpriseId(wxEnterpriseId, enterpriseId));
}
@Override
......@@ -169,20 +172,31 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
authStoreIdList);
return list;
}
@Override
public List<String> getHmStoreForWxa(String wxEnterpriseId ,String enterpriseId) {
return tabHaobanHmQrcodeMapper.getHmStoreForWxa(wxEnterpriseId , enterpriseId) ;
public List<String> getHmStoreForWxa(String wxEnterpriseId, String enterpriseId) {
return tabHaobanHmQrcodeMapper.getHmStoreForWxa(wxEnterpriseId, enterpriseId);
}
@Override
public List<String> listHmIdForIndex(HmQrcodeListQDTO qdto) {
return tabHaobanHmQrcodeMapper.listHmIdForIndex(qdto) ;
return tabHaobanHmQrcodeMapper.listHmIdForIndex(qdto);
}
@Override
public List<String> listHasQrcodeClerk(String enterpriseId, List<String> clerkIdList) {
return this.tabHaobanHmQrcodeMapper.listHasQrcodeClerk(enterpriseId, clerkIdList);
}
@Override
public void updateClerkNameByClerkId(String enterpriseId,String clerkId, String clerkName, String clerkCode) {
tabHaobanHmQrcodeMapper.updateClerkNameByClerkId(enterpriseId,clerkId, clerkName, clerkCode);
tabHaobanHmClerkRelationMapper.updateClerkNameByClerkId(enterpriseId,clerkId, clerkName, clerkCode);
}
@Override
public void updateStoreNameByStoreId(String enterpriseId,String storeId, String storeName, String storeCode) {
tabHaobanHmQrcodeMapper.updateStoreNameByStoreId(enterpriseId,storeId, storeName, storeCode);
tabHaobanHmClerkRelationMapper.updateStoreNameByStoreId(enterpriseId,storeId, storeName, storeCode);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WxUserAddLogServiceImpl.java
package com.gic.haoban.manage.service.service.hm.impl;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.BasePageInfo;
......@@ -22,10 +10,12 @@ import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO;
import com.gic.haoban.manage.service.dao.mapper.hm.WxUserAddLogMapper;
import com.gic.haoban.manage.service.entity.hm.TabWxUserAddLog;
import com.gic.haoban.manage.service.pojo.bo.hm.HmClerkRelationBO;
import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
import com.gic.haoban.manage.service.pojo.bo.hm.WxUserAddLogBO;
import com.gic.haoban.manage.service.service.MemberQueryService;
import com.gic.haoban.manage.service.service.hm.HmClerkRelationService;
import com.gic.haoban.manage.service.service.hm.HmLinkService;
import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
......@@ -34,6 +24,13 @@ import com.gic.member.tag.api.dto.MemberTagDTO;
import com.gic.member.tag.api.dto.MemberTagItemDTO;
import com.gic.member.tag.api.service.MemberTagApiService;
import com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
@Service("wxUserAddLogService")
public class WxUserAddLogServiceImpl implements WxUserAddLogService {
......@@ -50,9 +47,12 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
private MemberQueryService memberQueryService;
@Autowired
private MemberTagApiService memberTagApiService;
@Autowired
private HmClerkRelationService hmClerkRelationService;
@Override
public void save(WxUserAddLogQDTO qdto) {
log.info("保存用户信息-add={}",JSON.toJSON(qdto));
log.info("保存用户信息-add={}", JSON.toJSON(qdto));
String externalUserid = qdto.getExternalUserid();
String wxUserId = qdto.getWxUserId();
TabWxUserAddLog entity = new TabWxUserAddLog();
......@@ -82,12 +82,26 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
entity.setAddChannel(2);
entity.setHmId(qdto.getHmId());
entity.setHmName(hm.getName());
entity.setClerkId(hm.getClerkId());
entity.setClerkCode(hm.getClerkCode());
entity.setClerkName(hm.getClerkName());
entity.setStoreId(hm.getStoreId());
entity.setStoreCode(hm.getStoreCode());
entity.setStoreName(hm.getStoreName());
Integer hmType = hm.getHmType();
if (hmType == 1) {
entity.setClerkId(hm.getClerkId());
entity.setClerkCode(hm.getClerkCode());
entity.setClerkName(hm.getClerkName());
entity.setStoreId(hm.getStoreId());
entity.setStoreCode(hm.getStoreCode());
entity.setStoreName(hm.getStoreName());
} else if (hmType == 2) {
HmClerkRelationBO hmClerkRelationBO = hmClerkRelationService.queryByHmIdAndClerkId(qdto.getHmId(), qdto.getClerkId());
if (hmClerkRelationBO != null) {
entity.setClerkId(hmClerkRelationBO.getClerkId());
entity.setClerkCode(hmClerkRelationBO.getClerkCode());
entity.setClerkName(hmClerkRelationBO.getClerkName());
entity.setStoreId(hmClerkRelationBO.getStoreId());
entity.setStoreCode(hmClerkRelationBO.getStoreCode());
entity.setStoreName(hmClerkRelationBO.getStoreName());
}
}
memberLabelId = hm.getMemberLabelId();
}
if (null != qdto.getLinkId()) {
......@@ -103,11 +117,11 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
entity.setMemberLabelId(memberLabelId);
MemberTagItemDTO dto = this.memberTagApiService.findMemberTagItem(memberLabelId);
if (null != dto) {
String tagId = dto.getTagId() ;
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId) ;
String tagId = dto.getTagId();
MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId);
entity.setMemberLabelName(tag.getTagName() + "-" + dto.getTagItemName());
}else {
log.info("会员标签查询null,memberLabelId={}",memberLabelId);
} else {
log.info("会员标签查询null,memberLabelId={}", memberLabelId);
}
}
if (null != qdto.getMemberId()) {
......@@ -116,13 +130,12 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
}
}
this.wxUserAddLogMapper.insert(entity);
}
@Override
public void updateMemberInfo(String wxEnterpriseId, String enterpriseId, String staffId, String externalUserid,
String memberId) {
log.info("保存用户信息-update={}",memberId);
String memberId) {
log.info("保存用户信息-update={}", memberId);
if (StringUtils.isNotBlank(memberId)) {
TabWxUserAddLog entity = new TabWxUserAddLog();
entity = this.addMemberInfo(enterpriseId, memberId, entity);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
......@@ -128,6 +128,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
wxUserAddLogQDTO.setExternalUserid(related.getExternalUserId());
wxUserAddLogQDTO.setWxUserId(related.getWxUserId());
wxUserAddLogQDTO.setStaffId(related.getStaffId());
wxUserAddLogQDTO.setClerkId(related.getClerkId());
wxUserAddLogService.save(wxUserAddLogQDTO);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/log/LogRecordAfterServiceImpl.java
......@@ -20,5 +20,7 @@ public class LogRecordAfterServiceImpl extends LogRecordAfterService {
gicLogRecordBean.setWxEnterpriseId(GicLogRecordEvaluationContext.getAttribute("wxEnterpriseId", String.class));
gicLogRecordBean.setUserId(GicLogRecordEvaluationContext.getAttribute("userId", String.class));
gicLogRecordBean.setUserName(GicLogRecordEvaluationContext.getAttribute("userName", String.class));
gicLogRecordBean.setPhoneNumber(GicLogRecordEvaluationContext.getAttribute("phoneNumber", String.class));
gicLogRecordBean.setYwName(GicLogRecordEvaluationContext.getAttribute("ywName", String.class));
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -456,6 +456,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
wxUserAddLogQDTO.setWxUserId(wxUserId);
wxUserAddLogQDTO.setStaffId(staffId);
wxUserAddLogQDTO.setStaffName(staffName);
wxUserAddLogQDTO.setClerkId(staffClerkRelationDTO.getClerkId());
wxUserAddLogService.save(wxUserAddLogQDTO);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
......@@ -485,6 +485,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
ClerkSyncQDTO clerkSyncQDTO = JSON.parseObject(param, ClerkSyncQDTO.class);
Integer type = clerkSyncQDTO.getType();
String clerkId = clerkSyncQDTO.getClerkId();
String enterpriseId = clerkSyncQDTO.getEnterpriseId();
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId,-1);
if (clerkDTO == null) {
logger.error("导购为空");
......@@ -519,8 +520,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
logger.error("任务重新分配问题发送消息队列出错",e);
}
}
hmQrcodeService.updateClerkNameByClerkId(enterpriseId,clerkId,clerkDTO.getClerkName(),clerkDTO.getClerkCode());
}
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/TestServiceImpl.java
......@@ -8,6 +8,7 @@ import com.gic.quartz.api.dto.QuartzTaskDTO;
import com.gic.quartz.api.service.QuartzService;
import com.gic.wechat.api.dto.qywx.UserDTO;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -20,7 +21,7 @@ import java.util.List;
*/
@Service
public class TestServiceImpl implements TestApiService {
private static final Logger logger= LoggerFactory.getLogger(TestServiceImpl.class);
private static final Logger logger = LoggerFactory.getLogger(TestServiceImpl.class);
@Autowired
private QywxUserApiService qywxUserApiService;
@Autowired
......@@ -30,45 +31,47 @@ public class TestServiceImpl implements TestApiService {
@Autowired
private QuartzService quartzService;
@Override
public String checkThread(String id, Long expireTime) {
logger.info("测试-start：{}",id);
if (expireTime!=null && expireTime>0) {
logger.info("延时：{}",expireTime);
logger.info("测试-start：{}", id);
if (expireTime != null && expireTime > 0) {
logger.info("延时：{}", expireTime);
try {
Thread.sleep(expireTime);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
logger.info("测试-end：{}",id);
logger.info("测试-end：{}", id);
return id;
}
@Override
public String listSelfQywxUser(String corpid,String secretVal, String dataId) {
@Override
public String listSelfQywxUser(String corpid, String secretVal, String dataId) {
long t = System.currentTimeMillis();
List<UserDTO> list = this.qywxUserApiService.listSelfDepartmentUser(corpid, secretVal, dataId, 0);
logger.info("耗时为===============>{}毫秒",(System.currentTimeMillis()-t));
logger.info("耗时为===============>{}毫秒", (System.currentTimeMillis() - t));
if (null != list) {
logger.info("微信获取部门成员数量为：{}",list.size());
}else {
logger.info("微信获取部门成员数量为：{}", list.size());
} else {
logger.info("微信获取部门成员数量异常");
}
return "";
}
@Override
public String listAllQywxUser(String corpid,String secretVal, String dataId) {
}
@Override
public String listAllQywxUser(String corpid, String secretVal, String dataId) {
long t = System.currentTimeMillis();
List<UserDTO> list = this.qywxUserApiService.listSelfDepartmentUser(corpid, secretVal, dataId, 1);
logger.info("耗时为===============>{}毫秒",(System.currentTimeMillis()-t));
logger.info("耗时为===============>{}毫秒", (System.currentTimeMillis() - t));
if (null != list) {
logger.info("微信获取部门成员数量为：{}",list.size());
}else {
logger.info("微信获取部门成员数量为：{}", list.size());
} else {
logger.info("微信获取部门成员数量异常");
}
return "";
}
}
/**
* 调度器DTO参数构造器
......@@ -80,9 +83,9 @@ public class TestServiceImpl implements TestApiService {
*/
@Override
public void quartzTaskConvert(String serviceName, String methodName, String cron, String param) {
public void quartzTaskConvert(String serviceName, String methodName, String cron, String param, String referId) {
QuartzTaskDTO taskDTO = new QuartzTaskDTO();
taskDTO.setReferId("-1");
taskDTO.setReferId(StringUtils.isBlank(referId) ? "-1" : referId);
taskDTO.setTaskService(serviceName);
taskDTO.setTaskMethod(methodName);
taskDTO.setTaskParam(param);
......@@ -103,7 +106,7 @@ public class TestServiceImpl implements TestApiService {
@Override
public ServiceResponse listAllQywxUser(String params) {
logger.info("JSONOnkec:"+params);
logger.info("JSONOnkec:" + params);
return ServiceResponse.success(params);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java
......@@ -12,6 +12,7 @@ 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.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
......@@ -156,7 +157,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
hmQrcodeQDTO.setWxConfigId(qywxExternalcontactResultDTO.getConfig_id());
//操作日志
addLog(hmQrcodeQDTO, wxEnterpriseId, hmId);
addLog(hmQrcodeQDTO);
int saveResult = hmQrcodeService.insert(hmQrcodeQDTO);
if (saveResult == 1) {
......@@ -167,14 +168,19 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
return ServiceResponse.success();
}
private void addLog(HmQrcodeQDTO hmQrcodeQDTO, String wxEnterpriseId, Long hmId) {
/**
* 新增操作日志
*
* @param hmQrcodeQDTO
*/
private void addLog(HmQrcodeQDTO hmQrcodeQDTO) {
Integer invokingType = hmQrcodeQDTO.getInvokingType();
if (invokingType == 0) {
GicLogRecordEvaluationContext.noWriteLog();
} else {
//操作日志
setLoggerContext(hmQrcodeQDTO.getEnterpriseId(), wxEnterpriseId, hmQrcodeQDTO.getCreatorId(), hmQrcodeQDTO.getCreatorName());
String logContent = "【" + hmId + "-" + hmQrcodeQDTO.getName() + "】";
setLoggerContext(hmQrcodeQDTO.getEnterpriseId(), hmQrcodeQDTO.getWxEnterpriseId(), hmQrcodeQDTO.getWebLoginDTO());
String logContent = "【" + hmQrcodeQDTO.getHmId() + "-" + hmQrcodeQDTO.getName() + "】";
if (StringUtils.isBlank(logContent)) {
GicLogRecordEvaluationContext.noWriteLog();
} else {
......@@ -223,7 +229,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
add(hmQrcodeQDTO);
}
setLoggerContext(enterpriseId, wxEnterpriseId, hmQrcodeQDTO.getCreatorId(), hmQrcodeQDTO.getCreatorName());
setLoggerContext(enterpriseId, wxEnterpriseId, hmQrcodeQDTO.getWebLoginDTO());
String logContent = "【" + "批量创建数量" + clerkIdList.size() + "】";
GicLogRecordEvaluationContext.putAttribute("logContent", logContent);
logger.info("批量新增活码日志：logText:{}", logContent);
......@@ -236,16 +242,24 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
*
* @param enterpriseId 企业标识
* @param wxEnterpriseId wx企业标识
* @param userId 用户id
* @param userName 用户名
* @param webLoginDTO 网络登录dto
* @author mozhu
* @date 2022-07-12 14:20:44
* @date 2022-07-28 15:34:50
*/
private void setLoggerContext(String enterpriseId, String wxEnterpriseId, String userId, String userName) {
private void setLoggerContext(String enterpriseId, String wxEnterpriseId, WebLoginDTO webLoginDTO) {
GicLogRecordEvaluationContext.putAttribute("enterpriseId", enterpriseId);
GicLogRecordEvaluationContext.putAttribute("wxEnterpriseId", wxEnterpriseId);
GicLogRecordEvaluationContext.putAttribute("userId", StringUtils.isNotBlank(userId) ? userId : "0");
GicLogRecordEvaluationContext.putAttribute("userName", StringUtils.isNotBlank(userName) ? userName : "系统");
if (webLoginDTO != null) {
GicLogRecordEvaluationContext.putAttribute("userId", webLoginDTO.getClerkId());
GicLogRecordEvaluationContext.putAttribute("userName", webLoginDTO.getClerkFullName());
GicLogRecordEvaluationContext.putAttribute("phoneNumber", webLoginDTO.getClerkPhone());
GicLogRecordEvaluationContext.putAttribute("ywName", webLoginDTO.getOperationUserName());
} else {
GicLogRecordEvaluationContext.putAttribute("userId", "-1");
GicLogRecordEvaluationContext.putAttribute("userName", "系统");
GicLogRecordEvaluationContext.putAttribute("phoneNumber", "--");
GicLogRecordEvaluationContext.putAttribute("ywName", "系统");
}
}
......@@ -292,7 +306,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_0.getCode()), qywxResponseDTO.getErrmsg());
}
setLoggerContext(hmQrcodeQDTO.getEnterpriseId(), wxEnterpriseId, hmQrcodeQDTO.getModifierId(), hmQrcodeQDTO.getModifierName());
setLoggerContext(hmQrcodeQDTO.getEnterpriseId(), wxEnterpriseId, hmQrcodeQDTO.getWebLoginDTO());
//操作日志
updateSystemLog(hmQrcodeQDTO, hmId);
......@@ -449,7 +463,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
if (hmType == 2) {
//多人活码
insertHmClerkRelation(hmQrcodeQDTO,enterpriseId, wxEnterpriseId, hmId, clerkIdList, addFlag);
insertHmClerkRelation(hmQrcodeQDTO, enterpriseId, wxEnterpriseId, hmId, clerkIdList, addFlag);
} else if (hmType == 1) {
//单人活码
HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId);
......@@ -485,20 +499,21 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
/**
* 多人活码关联关系
*
* @param enterpriseId
* @param wxEnterpriseId
* @param hmId
* @param clerkIdList
* @param addFlag
*/
private void insertHmClerkRelation(HmQrcodeQDTO hmQrcodeQDTO,String enterpriseId,String wxEnterpriseId, Long hmId, List<String> clerkIdList, Boolean addFlag) {
private void insertHmClerkRelation(HmQrcodeQDTO hmQrcodeQDTO, String enterpriseId, String wxEnterpriseId, Long hmId, List<String> clerkIdList, Boolean addFlag) {
Date now = new Date();
if (!addFlag) {
//修改，删除其余无效导购
List<HmClerkRelationBO> hmClerkRelationBOS = hmClerkRelationService.queryByHmIdNotInClerkIds(hmId, clerkIdList);
if (CollectionUtils.isNotEmpty(hmClerkRelationBOS)) {
for (HmClerkRelationBO hmClerkRelationBO : hmClerkRelationBOS) {
hmClerkRelationService.updateStatusById(0,hmClerkRelationBO.getRelationId());
hmClerkRelationService.updateStatusById(0, hmClerkRelationBO.getRelationId());
}
}
}
......@@ -547,7 +562,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
hmClerkRelationQDTO.setAddNum(0);
hmClerkRelationService.insert(hmClerkRelationQDTO);
}
if (addStaffName != null && addStaffName.length() > 0){
if (addStaffName != null && addStaffName.length() > 0) {
hmQrcodeQDTO.setAddStaffName(addStaffName.toString());
}
......@@ -606,7 +621,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
afterFunc = LogRecordAfterServiceImpl.class)
@Override
@Transactional(rollbackFor = Exception.class)
public ServiceResponse delById(Long hmId, Integer invokingType) {
public ServiceResponse delById(Long hmId, Integer invokingType, WebLoginDTO loginDTO) {
HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryById(hmId);
if (hmQrcodeBO == null) {
return ServiceResponse.failure(Convert.toStr(HaoBanErrCodeCommon.ERR_8.getCode()), "活码不存在");
......@@ -623,13 +638,12 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
}
//操作日志
setLoggerContext(hmQrcodeBO.getEnterpriseId(), hmQrcodeBO.getWxEnterpriseId(), hmQrcodeBO.getModifierId(), hmQrcodeBO.getModifierName());
setLoggerContext(hmQrcodeBO.getEnterpriseId(), hmQrcodeBO.getWxEnterpriseId(), loginDTO);
String logContent = "【" + hmId + "-" + hmQrcodeBO.getName() + "】";
if (invokingType != 1) {
logContent = logContent + "——" + ChannelCodeEnum.getNameByCode(invokingType);
}
GicLogRecordEvaluationContext.putAttribute("logContent", logContent);
hmQrcodeService.deleteById(hmId);
return ServiceResponse.success();
}
......@@ -639,7 +653,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
// 单人活码 直接废弃，多人活码，更新
HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId);
if (hmQrcodeBO != null) {
delById(hmQrcodeBO.getHmId(), invokingType);
delById(hmQrcodeBO.getHmId(), invokingType, null);
}
// 多人活码逻辑
......@@ -661,7 +675,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
hmQrcodeQDTO.setClerkIdList(clerkIds);
update(hmQrcodeQDTO);
} else {
delById(hmId, invokingType);
delById(hmId, invokingType, null);
}
}
return ServiceResponse.success();
......@@ -671,7 +685,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
public int updateAddNumById(Long hmId, String clerkId) {
StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
if (staffClerkRelationDTO == null) {
logger.error("未绑定好办：{}",clerkId);
logger.error("未绑定好办：{}", clerkId);
return 0;
}
HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryById(hmId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/KafkaMessageServiceImpl.java
......@@ -20,6 +20,7 @@ import com.gic.haoban.manage.service.pojo.GroupSyncPojo;
import com.gic.haoban.manage.service.pojo.StoreSyncPojo;
import com.gic.haoban.manage.service.service.StaffClerkRelationService;
import com.gic.haoban.manage.service.service.StoreRangeService;
import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.slf4j.Logger;
......@@ -59,6 +60,8 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
@Autowired
private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
@Autowired
private HmQrcodeService hmQrcodeService;
@Override
public void onMessage(ConsumerRecord<String, GicRecord> record) {
......@@ -205,6 +208,7 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
&& (!syncPojo.getStoreName().equals(syncPojo.getOldStoreName()))) {
logger.info("门店名称变更:{}", JSONObject.toJSONString(syncPojo));
storeRangeService.updatwStoreName(syncPojo.getEnterpriseId(), syncPojo.getStoreId(), syncPojo.getStoreName());
hmQrcodeService.updateStoreNameByStoreId(syncPojo.getEnterpriseId(), syncPojo.getStoreId(), syncPojo.getStoreName(),syncPojo.getStoreCode());
}
//门店状态变更 包括删除
......
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmClerkRelationMapper.xml
......@@ -200,5 +200,21 @@
</foreach>
</select>
<update id="updateClerkNameByClerkId" parameterType="java.lang.String">
update tab_haoban_hm_clerk_relation
<set>
clerk_name = #{clerkName},clerk_code = #{clerkCode},update_time = now()
</set>
where clerk_id = #{clerkId} and enterprise_id = #{enterpriseId}
</update>
<update id="updateStoreNameByStoreId" parameterType="java.lang.String">
update tab_haoban_hm_clerk_relation
<set>
store_name = #{storeName},store_code = #{storeCode},update_time = now()
</set>
where store_id = #{storeId} and enterprise_id = #{enterpriseId}
</update>
</mapper>
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml
......@@ -461,7 +461,7 @@
and b.hm_id is null
</sql>
<select id="listHasQrcodeClerk" resultType="String">
<select id="listHasQrcodeClerk" resultType="java.lang.String">
select clerk_id from tab_haoban_hm_qrcode where enterprise_id=#{enterpriseId}
and clerk_id in
<foreach collection="clerkIdList" item="id" index="index" open="(" close=")" separator=",">
......@@ -469,6 +469,23 @@
</foreach>
and hm_type = 1 and status_flag in (1,3)
</select>
<update id="updateClerkNameByClerkId" parameterType="java.lang.String">
update tab_haoban_hm_qrcode
<set>
clerk_name = #{clerkName},clerk_code = #{clerkCode},update_time = now()
</set>
where clerk_id = #{clerkId} and enterprise_id = #{enterpriseId}
</update>
<update id="updateStoreNameByStoreId" parameterType="java.lang.String">
update tab_haoban_hm_qrcode
<set>
store_name = #{storeName},store_code = #{storeCode},update_time = now()
</set>
where store_id = #{storeId} and enterprise_id = #{enterpriseId}
</update>
</mapper>
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java
......@@ -28,6 +28,7 @@ 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.utils.statistics.DataStatisticsParamUtils;
import com.gic.haoban.manage.web.utils.statistics.DateUtils;
import com.gic.haoban.manage.web.vo.hm.HmDetailClerkListVO;
import com.gic.haoban.manage.web.vo.hm.HmTrendVO;
......@@ -83,6 +84,7 @@ public class HmQrcodeController {
hmQrcodeQDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
hmQrcodeQDTO.setEnterpriseId(loginUser.getEnterpriseId());
hmQrcodeQDTO.setInvokingType(1);
hmQrcodeQDTO.setWebLoginDTO(loginUser);
ServiceResponse serviceResponse = this.hmQrcodeApiService.add(hmQrcodeQDTO);
if (!"0000".equals(serviceResponse.getCode())) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_DEFINE.getCode()), serviceResponse.getMessage());
......@@ -99,6 +101,7 @@ public class HmQrcodeController {
hmQrcodeQDTO.setModifierName(loginUser.getClerkName());
hmQrcodeQDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
hmQrcodeQDTO.setEnterpriseId(loginUser.getEnterpriseId());
hmQrcodeQDTO.setWebLoginDTO(loginUser);
ServiceResponse serviceResponse = this.hmQrcodeApiService.addList(hmQrcodeQDTO);
if (!"0000".equals(serviceResponse.getCode())) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_DEFINE.getCode()), serviceResponse.getMessage());
......@@ -120,6 +123,7 @@ public class HmQrcodeController {
hmQrcodeQDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
hmQrcodeQDTO.setEnterpriseId(loginUser.getEnterpriseId());
hmQrcodeQDTO.setInvokingType(1);
hmQrcodeQDTO.setWebLoginDTO(loginUser);
ServiceResponse serviceResponse = this.hmQrcodeApiService.update(hmQrcodeQDTO);
if (!"0000".equals(serviceResponse.getCode())) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_DEFINE.getCode()), serviceResponse.getMessage());
......@@ -246,7 +250,7 @@ public class HmQrcodeController {
*/
@RequestMapping(value = "del", method = RequestMethod.DELETE)
public RestResponse del(Long hmId) {
ServiceResponse serviceResponse = this.hmQrcodeApiService.delById(hmId,1);
ServiceResponse serviceResponse = this.hmQrcodeApiService.delById(hmId,1,AuthWebRequestUtil.getLoginUser());
if (!"0000".equals(serviceResponse.getCode())) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_DEFINE.getCode()), serviceResponse.getMessage());
}
......@@ -290,6 +294,7 @@ public class HmQrcodeController {
trendMap.put((String) temp.get("bizDate"), temp.get("addNum"));
}
}
list.clear();
for (String date : dateList) {
Map vo = new HashMap();
vo.put("bizDate", date);
......@@ -356,7 +361,7 @@ public class HmQrcodeController {
} else if (hmType == 2) {
statisticsDTO = DataHttpUtil.post(StatisticsApolloKeyConstant.data_haoban_hm_many_detail, hmDetailClerkListQO);
}
return RestResponse.successResult(statisticsDTO);
return DataStatisticsParamUtils.responsePage(statisticsDTO);
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/utils/statistics/DataStatisticsParamUtils.java
......@@ -5,6 +5,7 @@ import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.manage.api.dto.statistics.StatisticsDTO;
import com.gic.haoban.manage.api.dto.statistics.StatisticsPage;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
......@@ -74,10 +75,13 @@ public class DataStatisticsParamUtils {
}
Page page = new Page();
page.setResult(statisticsDTO.getData());
page.setPageSize(statisticsDTO.getPage().getPageSize());
page.setCurrentPage(statisticsDTO.getPage().getCurrentPage());
page.setTotalPage(statisticsDTO.getPage().getTotalPage());
page.setTotalCount(statisticsDTO.getPage().getTotalCount());
StatisticsPage statisticsPage = statisticsDTO.getPage();
if (statisticsPage != null) {
page.setPageSize(statisticsPage.getPageSize());
page.setCurrentPage(statisticsPage.getCurrentPage());
page.setTotalPage(statisticsPage.getTotalPage());
page.setTotalCount(statisticsPage.getTotalCount());
}
return RestResponse.successResult(page);
}
......
pom.xml
......@@ -20,17 +20,13 @@
<!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name>
<!-- 这里使用 /content/repositories/snapshots/ -->
<url>http://182.254.134.223:8081/nexus/content/repositories/snapshots/</url>
<!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>-->
<url>http://10.0.0.29:8081/nexus/content/repositories/snapshots/</url>
</repository>
<snapshotRepository>
<!-- 和 Maven setting 保持一致 -->
<id>nexus-snapshots</id>
<name>nexus distribution snapshot repository</name>
<!-- 这里使用 /content/repositories/snapshots/ -->
<url>http://182.254.134.223:8081/nexus/content/repositories/Snapshots-1/</url>
<!--<url>http://stream.banli.mobi:8081/content/repositories/snapshots/</url>-->
<url>http://10.0.0.29:8081/nexus/content/repositories/Snapshots-1/</url>
</snapshotRepository>
</distributionManagement>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment