基础配置

jiangqs

2023-06-06 0f9d03ee930d1c2dc62b34dd2c3522cda91f93cf

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

@@ -1,13 +1,10 @@
package com.ruoyi.member.service.impl.member;
import com.google.common.collect.Lists;
import java.util.Date;

import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +21,6 @@
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.mapper.member.MemberMapper;
import com.ruoyi.member.service.member.*;
import com.ruoyi.member.util.CodeFactoryUtil;
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.poji.config.Activeness;
@@ -45,14 +41,13 @@
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.models.auth.In;
import lombok.extern.log4j.Log4j2;
import com.ruoyi.common.core.utils.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import com.ruoyi.common.security.utils.CodeFactoryUtil;

import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -242,7 +237,7 @@
            member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
            member.setMemberId(memberId);
            member.setBindingFlag(0);
            member.setCreateTime(DateUtils.getNowDate());
            member.setCreateTime(new Date());
            member.setMobile(mobile);
            initMemberTotal(memberId);
        }else{
@@ -324,7 +319,7 @@
        switch (editType){
            case 1:
                member.setNickName(editValue);
                member.setUpdateTime(DateUtils.getNowDate());
                member.setUpdateTime(new Date());
                member.setUpdateUserId(appEditUserDto.getUserId());
                this.saveOrUpdate(member);
                break;
@@ -332,13 +327,13 @@
                break;
            case 3:
                member.setGender(Integer.valueOf(editValue));
                member.setUpdateTime(DateUtils.getNowDate());
                member.setUpdateTime(new Date());
                member.setUpdateUserId(appEditUserDto.getUserId());
                this.saveOrUpdate(member);
                break;
            case 4:
                member.setBirthday(editValue);
                member.setUpdateTime(DateUtils.getNowDate());
                member.setUpdateTime(new Date());
                member.setUpdateUserId(appEditUserDto.getUserId());
                this.saveOrUpdate(member);
                break;
@@ -520,7 +515,7 @@
            member.setBindingFlag(1);
            member.setRelationShopId(merMemberAddDto.getShopId());
            member.setCustomerSource("商户添加");
            member.setCreateTime(DateUtils.getNowDate());
            member.setCreateTime(new Date());
            log.info("member-----------------"+member.toString());
            this.saveOrUpdate(member);
            initMemberTotal(memberId);
@@ -551,7 +546,7 @@
        member.setLevel(merMemberEditDto.getLevel());
        member.setBirthday(merMemberEditDto.getBirthday());
        member.setUpdateUserId(merMemberEditDto.getUserId());
        member.setUpdateTime(DateUtils.getNowDate());
        member.setUpdateTime(new Date());
        log.info("member-----------------"+member.toString());
        this.saveOrUpdate(member);
        SysUser sysUser = new SysUser();
@@ -614,7 +609,7 @@
        member.setDelFlag(0);
        member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
        member.setBindingFlag(0);
        member.setCreateTime(DateUtils.getNowDate());
        member.setCreateTime(new Date());
        member.setCustomerSource("商户订单添加");
        this.saveOrUpdate(member);
        initMemberTotal(member.getMemberId());
@@ -666,7 +661,7 @@
    @Override
    public List<MgtMemberPageVo> pageMgtMember(Page page,MgtMemberPageDto merMemberPageDto){
        List<Activeness> activenessList = remoteConfigService.listActiveness().getData();
        Date nowDay = DateUtils.getNowDate();
        Date nowDay = new Date();
        //处理活跃度筛选
        activenessList.stream()
                .filter(activeness -> activeness.getActivenessId().equals(merMemberPageDto.getActivenessId()))
@@ -685,8 +680,8 @@
                MgtActivenessJudgeVo mgtActivenessJudgeVo;
                for(Activeness activeness : activenessList){
                    mgtActivenessJudgeVo = new MgtActivenessJudgeVo();
                    mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(DateUtils.getNowDate(),activeness.getEndDay()));
                    mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(DateUtils.getNowDate(),activeness.getStartDay()-1));
                    mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(new Date(),activeness.getEndDay()));
                    mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(new Date(),activeness.getStartDay()-1));
                    mgtActivenessJudgeVo.setActivenessName(activeness.getActivenessName());
                }
                //活跃度赋值
@@ -722,7 +717,7 @@
        member.setRelationShopId(shop.getShopId());
        member.setRelationShopName(shop.getShopName());
        member.setBindingFlag(1);
        member.setUpdateTime(DateUtils.getNowDate());
        member.setUpdateTime(new Date());
        member.setUpdateUserId(mgtMemberRelEditDto.getUserId());
        this.saveOrUpdate(member);
    }
@@ -736,7 +731,7 @@
    public void deleteMemberRelationShop(MgtMemberRelDelDto mgtMemberRelDelDto){
        Member member = this.getById(mgtMemberRelDelDto.getMemberUserId());
        member.setBindingFlag(0);
        member.setUpdateTime(DateUtils.getNowDate());
        member.setUpdateTime(new Date());
        member.setUpdateUserId(mgtMemberRelDelDto.getUserId());
        this.saveOrUpdate(member);
    }
@@ -801,7 +796,7 @@
            integralRecord.setChangeIntegral( 0-integer);
        }
        integralRecord.setSurpIntegral(useableIntegral);
        integralRecord.setCreateTime(DateUtils.getNowDate());
        integralRecord.setCreateTime(new Date());
        integralRecord.setOrderId(memberIntegralChangeDto.getOrderId());
        integralRecord.setOrderNo(memberIntegralChangeDto.getOrderNo());
        switch (recordType){