From 2e9c442b4961dc30423e8b8fa1361c45e63ef620 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 16 八月 2023 19:52:00 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 82 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index e0fb774..71b248d 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -27,6 +27,7 @@
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.service.member.MemberTotalService;
import com.ruoyi.member.util.HttpUtils;
+import com.ruoyi.member.util.MsgUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.*;
@@ -390,8 +391,8 @@
for(Activeness activeness : activenessList){
if(activeness.getActivenessName().equals(merMemberPageDto.getMemberActiveness())){
Date nowDay = DateUtils.getNowDate();
- String actStartDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getEndDay()));
- String actEndDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getStartDay()));
+ String actStartDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getEndDay()));
+ String actEndDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getStartDay()));
merMemberPageDto.setActStartDate(actStartDate);
merMemberPageDto.setActEndDate(actEndDate);
break;
@@ -421,13 +422,15 @@
MgtActivenessJudgeVo mgtActivenessJudgeVo;
for (Activeness activeness : activenessList) {
mgtActivenessJudgeVo = new MgtActivenessJudgeVo();
- mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(new Date(), activeness.getEndDay()));
- mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(new Date(), activeness.getStartDay() - 1));
+ mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(new Date(), -activeness.getEndDay()));
+ mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(new Date(), -activeness.getStartDay()));
mgtActivenessJudgeVo.setActivenessName(activeness.getActivenessName());
+ mgtActivenessJudgeVoList.add(mgtActivenessJudgeVo);
}
//活跃度赋值
Date lastPayTime;
for (MerMemberPageVo mgtMemberPageVo : merMemberPageVoList) {
+ //实际是最后服务时间
lastPayTime = mgtMemberPageVo.getLastPayTime();
StringJoiner sj = new StringJoiner(",");
if (lastPayTime != null) {
@@ -473,7 +476,7 @@
MemberTotal memberTotal = memberTotalService.getById(member.getMemberId());
// 设置MerMemberInfoVo对象的属性值
merMemberInfoVo.setSurpNumber(memberTotal.getUseableServiceCount());
- merMemberInfoVo.setUserNumber(memberTotal.getUsedServiceCount());
+ merMemberInfoVo.setUserNumber(memberTotal.getTotalPayCount());
merMemberInfoVo.setPayMoney(memberTotal.getTotalPayMoney());
// 创建MerBaseDto对象
MerBaseDto merBaseDto = new MerBaseDto();
@@ -623,12 +626,13 @@
// Get the sysUser by mobile number
SysUser sysUser = sysUserService.getSysUserByMobile(phoneNumber).getData();
// If sysUser does not exist, create a new one
- if (sysUser == null) {
+ if (sysUser == null || !sysUser.getUserType().equals("03")) {
String memberId = IdUtils.simpleUUID();
sysUser = new SysUser();
sysUser.setUserName(memberId);
sysUser.setUserType("03");
sysUser.setNickName(merMemberAddDto.getRealName());
+ sysUser.setPhonenumber(merMemberAddDto.getPhonenumber());
sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
String password = "hongruitang";
sysUser.setPassword(SecurityUtils.encryptPassword(password));
@@ -645,6 +649,7 @@
member.setNickName(merMemberAddDto.getRealName());
member.setRealName(merMemberAddDto.getRealName());
member.setGender(merMemberAddDto.getGender());
+ member.setLevel(merMemberAddDto.getLevel());
member.setMobile(phoneNumber);
member.setReferrer(merMemberAddDto.getReferrer());
member.setBirthday(merMemberAddDto.getBirthday());
@@ -659,6 +664,12 @@
member.setRelationShopName(shop.getShopName());
member.setCustomerSource(merMemberAddDto.getCustomerSource());
member.setCreateTime(new Date());
+ //调理问题
+ List<String> memberNurse = merMemberAddDto.getMemberNurse();
+ if(memberNurse!=null&&!memberNurse.isEmpty()){
+ String memberNurseString = String.join(",", memberNurse);
+ member.setMemberNurse(memberNurseString);
+ }
// Save the member and initialize member total
this.saveOrUpdate(member);
initMemberTotal(memberId);
@@ -676,6 +687,8 @@
).collect(Collectors.toList());
memberArchiveService.saveBatch(memberArchiveList);
}
+ }else{
+ throw new ServiceException(AppErrorConstant.MOBILE_USER_DOUBLE);
}
return sysUser.getUserId();
}
@@ -885,8 +898,8 @@
.filter(activeness -> activeness.getActivenessId().equals(merMemberPageDto.getActivenessId()))
.findFirst()
.ifPresent(activeness -> {
- merMemberPageDto.setActStartDate(DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getEndDay())));
- merMemberPageDto.setActEndDate(DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getStartDay())));
+ merMemberPageDto.setActStartDate(DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getEndDay())));
+ merMemberPageDto.setActEndDate(DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getStartDay())));
});
}
//处理标签为正则表达
@@ -916,8 +929,8 @@
MgtActivenessJudgeVo mgtActivenessJudgeVo;
for (Activeness activeness : activenessList) {
mgtActivenessJudgeVo = new MgtActivenessJudgeVo();
- mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(new Date(), activeness.getEndDay()));
- mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(new Date(), activeness.getStartDay() - 1));
+ mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(new Date(), -activeness.getEndDay()));
+ mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(new Date(), -activeness.getStartDay()));
mgtActivenessJudgeVo.setActivenessName(activeness.getActivenessName());
}
//活跃度赋值
@@ -1024,6 +1037,7 @@
*/
@Override
public void memberIntegralChange(MemberIntegralChangeDto memberIntegralChangeDto) {
+ log.info("会员积分变动---"+memberIntegralChangeDto.toString());
MemberTotal memberTotal = memberTotalService.getById(memberIntegralChangeDto.getMemberId());
Integer recordType = memberIntegralChangeDto.getRecordType();
Integer changeType = memberIntegralChangeDto.getChangeType();
@@ -1277,8 +1291,8 @@
// 遍历不同活跃度列表，设置活跃度数组和对应的会员数数组
for (int i = 0; i < activenessList.size(); i++) {
activeness = activenessList.get(i);
- actStartDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getEndDay()));
- actEndDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getStartDay()));
+ actStartDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getEndDay()));
+ actEndDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getStartDay()));
count = memberMapper.getTotalMemberTotalActiveness(shopId, actStartDate, actEndDate);
MgtMapIntTotalVo = new MgtMapIntTotalVo();
MgtMapIntTotalVo.setMapKey(activeness.getActivenessName());
@@ -1390,8 +1404,8 @@
// 遍历不同活跃度列表，设置活跃度数组和对应的会员数数组
for (int i = 0; i < activenessList.size(); i++) {
activeness = activenessList.get(i);
- actStartDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getEndDay()));
- actEndDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getStartDay()));
+ actStartDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getEndDay()));
+ actEndDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getStartDay()));
count = memberMapper.getPlTotalMemberTotalActiveness(shopIdList, actStartDate, actEndDate);
if (StringUtils.isNotBlank(activeness.getActivenessName())) {
MgtMapIntTotalVo = new MgtMapIntTotalVo();
@@ -1490,6 +1504,7 @@
*/
@Override
public void changeMemberTotal(MemberTotalChangeDto memberTotalChangeDto) {
+ log.info("会员统计变动---"+memberTotalChangeDto.toString());
Member member = this.getByUserId(memberTotalChangeDto.getUserId());
MemberTotal memberTotal = memberTotalService.getById(member.getMemberId());
//积分变动
@@ -1500,6 +1515,17 @@
} else {
memberTotal.setUseableIntegral(memberTotal.getUseableIntegral() + memberTotalChangeDto.getChangeIntegral());
memberTotal.setTotalIntegral(memberTotal.getTotalIntegral() + memberTotalChangeDto.getChangeIntegral());
+ IntegralRecord integralRecord = new IntegralRecord();
+ integralRecord.setDelFlag(0);
+ integralRecord.setUserId(memberTotalChangeDto.getUserId());
+ integralRecord.setChangeType(5);
+ integralRecord.setCreateTime(new Date());
+ integralRecord.setChangeIntegral(memberTotalChangeDto.getChangeIntegral());
+ integralRecord.setSurpIntegral(memberTotal.getUseableIntegral()+memberTotalChangeDto.getChangeIntegral());
+ integralRecord.setChangeReason("订单【"+memberTotalChangeDto.getOrderNo()+"】获得积分");
+ integralRecord.setOrderId(memberTotalChangeDto.getOrderId());
+ integralRecord.setOrderNo(memberTotalChangeDto.getOrderNo());
+ integralRecordService.saveOrUpdate(integralRecord);
}
}
//消费变动
@@ -1519,6 +1545,7 @@
if (memberTotalChangeDto.getTypeService() == 2) {
memberTotal.setUseableServiceCount(memberTotal.getUseableServiceCount() - memberTotalChangeDto.getServiceCount());
memberTotal.setUsedServiceCount(memberTotal.getUsedServiceCount() + memberTotalChangeDto.getServiceCount());
+ memberTotal.setLastServiceTime(new Date());
} else {
memberTotal.setUseableServiceCount(memberTotal.getUseableServiceCount() + memberTotalChangeDto.getServiceCount());
memberTotal.setTotalServiceCount(memberTotal.getTotalServiceCount() + memberTotalChangeDto.getServiceCount());
@@ -1657,8 +1684,8 @@
// 遍历不同活跃度列表，设置活跃度数组和对应的会员数数组
for (int i = 0; i < activenessList.size(); i++) {
activeness = activenessList.get(i);
- actStartDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getEndDay()));
- actEndDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, activeness.getStartDay()));
+ actStartDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getEndDay()));
+ actEndDate = DateUtils.parseDateToStr("yyyy-MM-dd", DateUtils.addDays(nowDay, -activeness.getStartDay()));
merTotalDto.setStartDate(actStartDate);
merTotalDto.setEndDate(actEndDate);
count = memberMapper.getMerMemberTotalActiveness(merTotalDto);
@@ -1845,6 +1872,7 @@
*/
@Override
public Boolean changeIntegral(IntegralChangeDto integralChangeDto){
+ log.info("会员积分变动---"+integralChangeDto.toString());
Member member = this.getByUserId(integralChangeDto.getUserId());
Integer integralType = integralChangeDto.getIntegralType();
Integer changeIntegral = integralChangeDto.getChangeIntegral();
@@ -1965,4 +1993,26 @@
updateWrapper.set(Member::getRelationShopName,mgtMemberShopNameDto.getShopName());
this.update(updateWrapper);
}
+
+ /**
+ * @description 发送生日祝福
+ * @author jqs
+ * @date 2023/8/7 15:40
+ * @param
+ * @return void
+ */
+ @Override
+ public void sendBirthdayBless(){
+ List<String> mobileList = memberMapper.listTodayBirthday();
+ if(mobileList!=null&&!mobileList.isEmpty()){
+ log.info("生日祝福发送短信---"+mobileList.toString());
+ for(String mobile : mobileList){
+ try {
+ MsgUtils.sendMsg(mobile,null,null);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
}
--
Gitblit v1.7.1