Merge remote-tracking branch 'origin/master'

doum

4 小时以前 8fd09daba5c89106b4a9aacd8d5ef9354afc93be

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

@@ -321,11 +321,8 @@
            AccountResponse accountResponse = new AccountResponse();
            if(Objects.nonNull(member)){
                memberMapper.updateById(member);
                member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                        systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl());
                //创建token
//                JwtPayLoad payLoad = new JwtPayLoad(Constants.MEMBER_PREFIX+member.getId());
//                String token = JwtTokenUtil.generateToken(payLoad);
                member.setImgFullUrl(StringUtils.isNotBlank(member.getImgurl())?systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                        systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl():null);
                String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
                accountResponse.setToken(token);
                accountResponse.setOpenid(openId);
@@ -341,18 +338,8 @@
    }


//    @Override
//    public AccountResponse wxLoginTest( Integer memberId){
//        //创建token
////        JwtPayLoad payLoad = new JwtPayLoad(Constants.MEMBER_PREFIX+memberId);
////        String token = JwtTokenUtil.generateToken(payLoad);
//        String token = JwtTokenUtil.generateTokenForRedis(memberId, Constants.ZERO, JSONObject.toJSONString(null), redisTemplate);
//        AccountResponse accountResponse = new AccountResponse();
//        accountResponse.setToken(token);
//        return accountResponse;
//    }

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest){
        try {
            WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNumber(wxPhoneRequest.getCode());
@@ -375,23 +362,20 @@
                }
                member.setIntegral(BigDecimal.ZERO);
                member.setPhone(phone);
                member.setStatus(Constants.ZERO);
            }
            member.setOpenId(wxPhoneRequest.getOpenid());
            member.setEditDate(new Date());
            member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                    systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl());
            member.setImgFullUrl(StringUtils.isNotBlank(member.getImgurl())?systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                    systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl():null);
            if(Objects.isNull(member.getId())){
                memberMapper.insert(member);
                PlatformConfigDTO platformConfigDTO = systemDictDataService.getPlatformConfigDTO();
                this.createRegionReward(member,platformConfigDTO);
                //创建邀请记录
                this.createInviteRecord(member,platformConfigDTO);
//                member.setSharingCode(this.createShareCode(member.getId()));
                memberMapper.updateById(member);
            }else{
//                if(StringUtils.isBlank(member.getSharingCode())){
//                    member.setSharingCode(this.createShareCode(member.getId()));
//                }
                memberMapper.updateById(member);
            }
            if(Objects.nonNull(wxPhoneRequest.getShopId())){
@@ -438,6 +422,9 @@
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(regCouponRewardList)){
                List<MemberCoupon> memberCouponList = new ArrayList<>();
                for (JSONObject jsonObject:regCouponRewardList) {
                    if(!jsonObject.containsKey("couponId")||!jsonObject.containsKey("num")){
                        continue;
                    }
                    Integer couponId = jsonObject.getInteger("couponId");
                    Integer num = jsonObject.getInteger("num");
                    Coupon coupon =  couponMapper.selectById(couponId);
@@ -446,6 +433,10 @@
                    }
                    MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,member,new Date(),Constants.ZERO,null);
                    for (int i = 0; i < num; i++) {
                        //满减卷不会生成maxPrice 需要根据优惠券减少金额设置
                        if(Constants.equalsInteger(coupon.getCouponType(),Constants.ZERO)){
                            memberCoupon.setMaxPrice(coupon.getPrice());
                        }
                        memberCouponList.add(memberCoupon);
                    }
                }
@@ -485,6 +476,10 @@
            dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.INVITENEWUSER);
            dealIntegralRequest.setParam1(member.getNickname());
            integralService.dealIntegral(dealIntegralRequest,null);
            //添加消息记录



        }
    }