From de1757498889b2948cbf4b559679ba6c6f82cc5c Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 23 Apr 2019 17:06:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AE=8C=E5=96=84=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCUserDataController.java | 22 +++++++++++++++++-- .../domain/dto/WxCUserBasicInfoDto.java | 12 ++++++++++ .../mapper/WxCUserBasicInfoMapper.java | 2 ++ .../service/WxCUserBasicInfoService.java | 2 ++ .../impl/WxCUserBasicInfoServiceImpl.java | 5 ++++- .../service/impl/WxFlowServiceImpl.java | 18 ++++++++++++--- .../mapper/WxCUserBasicInfoMapper.xml | 3 +++ 7 files changed, 58 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java index a929cc5a3..8548e85f4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java @@ -12,7 +12,10 @@ import java.util.Map; import com.iformall.annotation.SystemControllerLog; import com.iformall.domain.po.WxCouponOrder; +import com.iformall.mapper.WxCUserBasicInfoMapper; +import com.iformall.service.WxCUserBasicInfoService; import com.iformall.utils.DataUtil; +import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +47,8 @@ public class WxCUserDataController extends BaseController { private WxUserVisitService wxUserVisitService; @Autowired private WxCouponOrderService wxCouponOrderService; + @Autowired + private WxCUserBasicInfoService wxCUserBasicInfoService; @GetMapping("findUserCountData") @ApiOperation("查询用户数量接口") @@ -124,8 +129,21 @@ public class WxCUserDataController extends BaseController { weekVosCount += us.getCount(); } map.put("weekVosCount", weekVosCount); //周新增会员 - map.put("growCount", weekVosCount); //自然增长 - map.put("importCount", weekVosCount); //导入 + + //自然增长(一个月) + String startdate = DateUtils.getTimeBefore(30, new Date()); + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); + Date startDate = DateUtils.getDateFromString(startdate + " 00:00:00","yyyy-MM-dd HH:mm:ss").getTime(); + Date endDate = DateUtils.getDateFromString(systemTime + " 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); + dto.setStartTime(startDate); + dto.setEndTime(endDate); + map.put("growCount", wxCUserService.findCount(dto)); + //导入 + WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); + wxCUserBasicInfoDto.setTenantId(getTenantId()); + wxCUserBasicInfoDto.setStartTime(startDate); + wxCUserBasicInfoDto.setEndTime(endDate); + map.put("importCount", wxCUserBasicInfoService.findCountByFilter(wxCUserBasicInfoDto)); return new ResultData(map); } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index 668a21175..b482b691b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -64,9 +64,21 @@ public class WxCUserBasicInfoDto implements Serializable{ @Transient protected String sortColumns; + //1 查询导入的数据 + @Transient + protected Integer queryImport; + @Transient protected List filterList; + public Integer getQueryImport() { + return queryImport; + } + + public void setQueryImport(Integer queryImport) { + this.queryImport = queryImport; + } + public Long getId() { return id; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java index 0868b8778..071c084a2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java @@ -33,4 +33,6 @@ public interface WxCUserBasicInfoMapper extends CommonMapper findVoList(WxCUserBasicInfo wxCUserBasicInfo); Integer countVoList(WxCUserBasicInfo wxCUserBasicInfo); + + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index b07a2717f..5fc6c16d4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -129,4 +129,6 @@ public interface WxCUserBasicInfoService { * @param response */ void exportCarPayData(WxCarPayRecord record, HttpServletRequest request, HttpServletResponse response); + + long findCountByFilter(WxCUserBasicInfoDto dto); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index b6478ad78..96ca36620 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -829,5 +829,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { excelService.exportExcel(list,null,sheetName,WxCarPayRecord.class,sheetName+".xls",response); } - + @Override + public long findCountByFilter(WxCUserBasicInfoDto dto) { + return wxCUserBasicInfoMapper.findCount(dto); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 34d1dcbfd..5bb7076c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -397,12 +397,12 @@ public class WxFlowServiceImpl implements WxFlowService { // 给审批人发送代办通知短信 List mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); for (MallUserInfo mallUserInfo:mallUserInfoList) { - sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),starterInfo.getName(),businessId); + sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),starterInfo.getName(),businessId,flowType); } return new ResultData(); } - public void sendAssigneeMsgAndEmail(String tenantId,String phone,String email,String userName,Long businessId){ + public void sendAssigneeMsgAndEmail(String tenantId,String phone,String email,String userName,Long businessId,Integer flowType){ Map dynamicContentMap = new HashMap<>(); dynamicContentMap.put("userName",userName); dynamicContentMap.put("page", Constant.adminPage); @@ -476,6 +476,12 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); + if(1 == flowType.intValue() || 3 == flowType.intValue()){ + msgReplaceMap.put("bustype","合同"); + }else if(2 == flowType.intValue()){ + msgReplaceMap.put("bustype","账单"); + msgReplaceMap.put("contract", businessId.toString()); + } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } @@ -710,7 +716,7 @@ public class WxFlowServiceImpl implements WxFlowService { String assignee = ""; List mallUserInfoList = getUserByProcessInstanceId(processInstanceId); for (MallUserInfo mallUserInfo:mallUserInfoList) { - sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),userName,businessId); + sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),userName,businessId,flowType); } // 给发起人发送短信 @@ -889,6 +895,12 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMailMsgModel.MAIL_REJECT_NODIFY.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); + if(1 == flowType.intValue() || 3 == flowType.intValue()){ + msgReplaceMap.put("bustype","合同"); + }else if(2 == flowType.intValue()){ + msgReplaceMap.put("bustype","账单"); + msgReplaceMap.put("contract", businessId.toString()); + } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 2c12d5d04..df41d5433 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -367,6 +367,9 @@ and cu.phone in (${phones}) + + and create_date like '%00:00:00' + and cu.poins >= #{levelStartScore}