Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -55,6 +55,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.N;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -91,6 +92,8 @@
    private ShopMapper shopMapper;
    @Autowired
    private UserActionMapper userActionMapper;
    @Autowired
    private NoticeMapper noticeMapper;


    @Autowired
@@ -339,6 +342,17 @@


    @Override
    public AccountResponse wxLoginTest(Integer memberId){
        Member member = memberMapper.selectById(memberId);
        AccountResponse accountResponse = new AccountResponse();
        String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
        accountResponse.setToken(token);
        accountResponse.setMember(member);
        return accountResponse;
    }


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest){
        try {
@@ -360,7 +374,6 @@
                if(!this.checkIsCreateInvite(phone)){
                    member.setRecId(wxPhoneRequest.getRecId());
                }
                member.setIntegral(BigDecimal.ZERO);
                member.setPhone(phone);
                member.setStatus(Constants.ZERO);
            }
@@ -413,7 +426,7 @@
            dealIntegralRequest.setDealType(Constants.ZERO);
            dealIntegralRequest.setMemberId(member.getId());
            dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.REGISTER);
            integralService.dealIntegral(dealIntegralRequest,null);
            integralService.dealIntegral(dealIntegralRequest,member);
        }
        //开启注册送优惠券
        if(Constants.equalsInteger(platformConfigDTO.getRegCouponRewardStatus(),Constants.ZERO)){
@@ -439,6 +452,10 @@
                        }
                        memberCouponList.add(memberCoupon);
                    }
                    Notice notice = Notice.getNotice(Constants.NoticeType.COUPON,
                            member.getId(),null);
                    notice.setContent(notice.getContent().replace("{param}",Constants.getCouponInfo(memberCoupon,num)));
                    noticeMapper.insert(notice);
                }
                if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberCouponList)){
                    memberCouponJoinMapper.insert(memberCouponList);
@@ -475,10 +492,8 @@
            dealIntegralRequest.setMemberId(member.getRecId());
            dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.INVITENEWUSER);
            dealIntegralRequest.setParam1(member.getNickname());
            integralService.dealIntegral(dealIntegralRequest,null);
            integralService.dealIntegral(dealIntegralRequest,member);
            //添加消息记录



        }
    }