From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 21 八月 2023 19:03:55 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 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 fe983b2..e937607 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
@@ -425,10 +425,12 @@
                     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) {
@@ -474,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();
@@ -525,6 +527,7 @@
         member.setBindingFlag(appMemberBindingDto.getBindingFlag());
         member.setRelationShopId(appMemberBindingDto.getShopId());
         member.setRelationShopName(appMemberBindingDto.getShopName());
+        member.setBindingType(appMemberBindingDto.getBindingType());
         this.saveOrUpdate(member);
     }
 
@@ -624,12 +627,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));
@@ -646,6 +650,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());
@@ -655,11 +660,18 @@
             member.setMiniOpenid(null);
             member.setBindingFlag(1);
             member.setBindingTime(new Date());
+            member.setBindingType(6);
             // Get shop information and set it to the member
             Shop shop = remoteShopService.getShop(merMemberAddDto.getShopId()).getData();
             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);
@@ -677,6 +689,8 @@
                 ).collect(Collectors.toList());
                 memberArchiveService.saveBatch(memberArchiveList);
             }
+        }else{
+            throw new ServiceException(AppErrorConstant.MOBILE_USER_DOUBLE);
         }
         return sysUser.getUserId();
     }
@@ -959,6 +973,7 @@
                 member.setRelationShopId(shop.getShopId());
                 member.setRelationShopName(shop.getShopName());
                 member.setBindingFlag(1);
+                member.setBindingType(7);
                 member.setBindingTime(new Date());
                 member.setUpdateTime(new Date());
                 member.setUpdateUserId(mgtMemberRelEditDto.getUserId());
@@ -1624,7 +1639,7 @@
             menPercent = new BigDecimal("100.00");
             womenPercent = new BigDecimal("0.00");
         }else{
-            menPercent = manTotalBig.divide(personTotalBig,0,BigDecimal.ROUND_HALF_UP);
+            menPercent = manTotalBig.divide(personTotalBig,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
             womenPercent = bigTen.subtract(menPercent);
         }
         memberFixedTotalVo.setManPercent(menPercent);

--
Gitblit v1.7.1