bug

jiangqs

2023-08-06 85bbd80dd1e1599d7fea677aad705bad4f8b042b

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -358,6 +358,9 @@
                member.setGender(Integer.valueOf(editValue));
                break;
            case 4:
                if(editValue.compareTo(DateUtils.getDate())>0){
                    throw new ServiceException(AppErrorConstant.BIRTHDAY_BEYOND);
                }
                member.setBirthday(editValue);
                break;
            case 5:
@@ -976,13 +979,14 @@
            String memberUserIds = mgtMemberRelDelDto.getMemberUserIds();
            String[] memberUserIdArr = memberUserIds.split(",");
            for (String str : memberUserIdArr) {
                Member member = this.getByUserId(Long.valueOf(str));
                member.setBindingFlag(0);
                member.setRelationShopId(null);
                member.setRelationShopName(null);
                member.setUpdateTime(new Date());
                member.setUpdateUserId(mgtMemberRelDelDto.getUserId());
                memberMapper.update(member,null);
                LambdaUpdateWrapper<Member> updateWrapper = Wrappers.lambdaUpdate();
                updateWrapper.eq(Member::getUserId, str)
                        .set(Member::getBindingFlag, 0)
                        .set(Member::getRelationShopId,null)
                        .set(Member::getRelationShopName,null)
                        .set(Member::getUpdateUserId,mgtMemberRelDelDto.getUserId())
                        .set(Member::getUpdateTime,new Date());
                this.update(updateWrapper);
            }
        }
    }
@@ -1020,6 +1024,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();
@@ -1486,6 +1491,7 @@
     */
    @Override
    public void changeMemberTotal(MemberTotalChangeDto memberTotalChangeDto) {
        log.info("会员统计变动---"+memberTotalChangeDto.toString());
        Member member = this.getByUserId(memberTotalChangeDto.getUserId());
        MemberTotal memberTotal = memberTotalService.getById(member.getMemberId());
        //积分变动
@@ -1496,6 +1502,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);
            }
        }
        //消费变动
@@ -1515,8 +1532,9 @@
            if (memberTotalChangeDto.getTypeService() == 2) {
                memberTotal.setUseableServiceCount(memberTotal.getUseableServiceCount() - memberTotalChangeDto.getServiceCount());
                memberTotal.setUsedServiceCount(memberTotal.getUsedServiceCount() + memberTotalChangeDto.getServiceCount());
                memberTotal.setLastServiceTime(new Date());
            } else {
                memberTotal.setUseableIntegral(memberTotal.getUseableIntegral() + memberTotalChangeDto.getServiceCount());
                memberTotal.setUseableServiceCount(memberTotal.getUseableServiceCount() + memberTotalChangeDto.getServiceCount());
                memberTotal.setTotalServiceCount(memberTotal.getTotalServiceCount() + memberTotalChangeDto.getServiceCount());
            }
        }
@@ -1841,6 +1859,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();