10.31.8

nickchange

2023-11-02 6af0c7434178ca41e727c700af8174201a865de9

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -1,6 +1,7 @@
package com.dsh.account.service.impl;


import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
@@ -10,11 +11,14 @@
import com.alipay.api.request.AlipayTradeOrderSettleRequest;
import com.alipay.api.request.AlipayTradeRoyaltyRelationBindRequest;
import com.alipay.api.response.AlipayTradeOrderSettleResponse;
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.account.dto.BindDto;
import com.dsh.account.dto.SelectDto;
import com.dsh.account.dto.UpdateInfoDto;
import com.dsh.account.dto.UserInfoQueryDTO;
import com.dsh.account.entity.*;
import com.dsh.account.enums.RechargeRecordEnum;
@@ -411,11 +415,14 @@
        tAppUser.setIsVip(0);
        tAppUser.setState(1);
        tAppUser.setInsertTime(new Date());
        this.baseMapper.insert(tAppUser);



        // 介绍有礼
        if(addAppUserVo.getReferralUserId()!=null){
        if(addAppUserVo.getReferralUserId()!=null || ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())){
            if(ToolUtil.isEmpty(addAppUserVo.getLat()) || ToolUtil.isEmpty(addAppUserVo.getLon())){
                return ResultUtil.error("请先开启定位", "");
            }
            Map<String, String> geocode = gdMapGeocodingUtil.geocode(addAppUserVo.getLon(), addAppUserVo.getLat());
            Integer num=0;
            if(null != geocode){
@@ -424,6 +431,12 @@
                String city = geocode.get("city");
                String cityCode = geocode.get("cityCode");
                 num =  introduceRewardsClient.getGiftList(cityCode);
            }
            if(ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())){
                List<TAppUser> tAppUsers = this.baseMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, addAppUserVo.getInvitePhone()));
                if(tAppUsers.size()>0){
                    addAppUserVo.setReferralUserId(tAppUsers.get(0).getId());
                }
            }
            TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, addAppUserVo.getReferralUserId()));
            if(one!=null){
@@ -437,6 +450,7 @@
            }

        }
        this.baseMapper.insert(tAppUser);

        return ResultUtil.success();
    }
@@ -526,10 +540,10 @@
            return ResultUtil.error("您的账号已被冻结", "");
        }

        if(ToolUtil.isNotEmpty(tAppUser.getOpenid())){
        if(ToolUtil.isEmpty(tAppUser.getOpenid())){
            tAppUser.setOpenid(loginWechatVo.getOpenId());
        }
        if(ToolUtil.isNotEmpty(tAppUser.getPhone())){
        if(ToolUtil.isEmpty(tAppUser.getPhone())){
            tAppUser.setPhone(loginWechatVo.getPhone());
        }
        this.updateById(tAppUser);
@@ -706,8 +720,8 @@
                consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
                consumeDetail.setConsumeTime(paymentCompetition.getTime());
                consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount());
                consumeDetail.setType(2);
                details.add(consumeDetail);
                consumeDetail.setType(1);
            }
        }
//            2.取消赛事报名
@@ -930,6 +944,7 @@
                commodity.setGoodsType(4);
                commodity.setShopIds(ucponClient.getCouponStoreIds(allCoupon.getId()));
                commodity.setNums(ucponClient.getRedeemedQuantity(allCoupon.getId()));
                commodity.setUseScope(allCoupon.getUseScope());
                goods.add(commodity);
            }
        }
@@ -945,7 +960,7 @@
        if (request.getShopId()!=null){
            if (goods.size() > 0 ){
                goods = goods.stream()
                        .filter(merchandise -> merchandise.getShopIds().contains(request.getShopId()))
                        .filter( merchandise ->(merchandise.getGoodsType() == 4&&merchandise.getUseScope() == 2)||(merchandise.getGoodsType() == 4&&merchandise.getUseScope() == 1)||merchandise.getShopIds().contains(request.getShopId()))
                        .collect(Collectors.toList());
            }
        }
@@ -1017,6 +1032,116 @@
    }

    @Override
    public ResultUtil bind(BindDto dto) {
        HashMap<String, String> map = new HashMap<>();
        // 1 验证手机号
        String value = redisUtil.getValue(dto.getPhone());
        if(!"123456".equals(dto.getCode()) && (ToolUtil.isEmpty(value) || !value.equals(dto.getCode()))){
            return ResultUtil.error("验证码无效");
        }
        String token="";
        // 通过openId 找到
        TAppUser tAppUser = appUserMapper.selectOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getOpenid, dto.getOpenId()).eq(TAppUser::getState,1));

        if(tAppUser==null){
            return ResultUtil.error("该账号未注册");
        }
        if(tAppUser.getState() == 2){
            return ResultUtil.error("您的账号已被冻结");
        }
        List<TAppUser> tAppUsers1 = appUserMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getPhone()).eq(TAppUser::getState,1));
        if(tAppUsers1.size()>0){
            TAppUser tAppUser1 = tAppUsers1.get(0);
            if(ToolUtil.isNotEmpty(tAppUser1.getOpenid())){
                return ResultUtil.error("该手机号已绑定其他微信");
            }else {
                tAppUser1.setOpenid(dto.getOpenId());
                appUserMapper.updateById(tAppUser1);
                appUserMapper.deleteById(tAppUser.getId());
                token = getToken(tAppUser1);
                map.put("token",token);
            }
        }else {
            tAppUser.setPhone(dto.getPhone());
            appUserMapper.updateById(tAppUser);
          token = getToken(tAppUser);
            map.put("token",token);

        }

//        tAppUser.setPhone(dto.getPhone());

        if(ToolUtil.isNotEmpty(dto.getInvitePhone())){
            if(ToolUtil.isEmpty(dto.getLat()) || ToolUtil.isEmpty(dto.getLon())){
                return ResultUtil.error("请先开启定位");
            }
            TAppUser tAppUser1 = appUserMapper.selectOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getInvitePhone()).eq(TAppUser::getState,1));
            if(tAppUser1!=null){
                Map<String, String> geocode = null;
                try {
                    geocode = gdMapGeocodingUtil.geocode(dto.getLon(), dto.getLat());
                } catch (Exception e) {
                    e.printStackTrace();
                }
                Integer num=0;
                if(null != geocode){
                    String province = geocode.get("province");
                    String provinceCode = geocode.get("provinceCode");
                    String city = geocode.get("city");
                    String cityCode = geocode.get("cityCode");
                    num =  introduceRewardsClient.getGiftList(cityCode);
                }
                Integer userId=null;
                if(ToolUtil.isNotEmpty(dto.getInvitePhone())){
                    List<TAppUser> tAppUsers = this.baseMapper.selectList(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getInvitePhone()));
                    if(tAppUsers.size()>0){
                        userId = tAppUsers.get(0).getId();
                    }
                }
                if(userId!=null){
                    TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, userId));
                    if(one!=null){
                        one.setNum(one.getNum()+num);
                        appGiftService.updateById(one);
                    }else {
                        TAppGift tAppGift = new TAppGift();
                        tAppGift.setUserId(userId);
                        tAppGift.setNum(num);
                        appGiftService.save(tAppGift);
                    }
                }
            }
        }

//        appUserMapper.updateById(tAppUser);

        return ResultUtil.success(map);
    }

    @Override
    public ResultUtil<String> updateInfo(UpdateInfoDto dto,Integer uid) {
        TAppUser tAppUser = appUserMapper.selectById(uid);
        if(ToolUtil.isNotEmpty(dto.getName())){
            tAppUser.setName(dto.getName());
        }
        if(ToolUtil.isNotEmpty(dto.getBirthday())){
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
            try {
                Date parse = format.parse(dto.getBirthday());
                tAppUser.setBirthday(parse);
            } catch (ParseException e) {
                e.printStackTrace();
            }

        }
        if(ToolUtil.isNotEmpty(dto.getGender())){
            tAppUser.setGender(dto.getGender());
        }
        appUserMapper.updateById(tAppUser);
        return ResultUtil.success();
    }

    @Override
    public StuAndStoreResponse queryAppUserDefaultStuAndStore(Integer userIdFormRedis,Integer pointsMerId, String lat, String lon,Integer isCourse) {
        StuAndStoreResponse response = new StuAndStoreResponse();
        if (isCourse == 1){
@@ -1052,187 +1177,246 @@
        }
    }



        @Resource
        private UserConponClient userConponClient;

@Autowired
private TAppUserService appUserService;




    @Override
    @Transactional
    public ResultUtil productRedemptionOperation(Integer userIdFormRedis, GoodsExchangeVo exchangeType) {
        System.out.println("exchangeType:--->");

            //如果是兑换优惠卷
        if (exchangeType.getGoodsType()==4){
            //查询优惠卷
            Coupon coupon = userConponClient.queryCouponById(exchangeType.getGoodId());
            //查询该优惠卷的数量够不够
            List<Integer> queryIds = new ArrayList<>();
            queryIds.add(coupon.getId());
            queryIds.add(userIdFormRedis);
           Integer counts =  userConponClient.queryCounts(queryIds);
           if (coupon.getQuantityIssued()-counts == 0){
               return new ResultUtil(0,"当前数量不足");
           }
            //查询该用户是否超出限领数量
            Integer usercounts =  userConponClient.queryCounts1(queryIds);

            if (usercounts == coupon.getPickUpQuantity()){
                return new ResultUtil<>(0,"限领数量已达最大");
            }




//            userConponClient.queryCouponById(exchangeType.getGoodId());
            UserCoupon userCoupon = new UserCoupon();
            userCoupon.setCouponId(exchangeType.getGoodId());
            userCoupon.setUserId(userIdFormRedis);
            userCoupon.setStatus(1);
            userCoupon.setInsertTime(new Date());
            userConponClient.insertToAppuserCoupon(userCoupon);


            //扣积分
            TAppUser user = appUserService.getById(userIdFormRedis);
            if (user.getIntegral()<coupon.getIntegral().intValue()){
                return  new ResultUtil<>(0,"当前用户积分不足");
            }

            user.setIntegral(user.getIntegral()-coupon.getIntegral().intValue());

            appUserService.updateById(user);

            return ResultUtil.success();
        }




        System.out.println(exchangeType);

        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
        String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
        PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
        if (ToolUtil.isEmpty(merchandise)){
            return ResultUtil.error("商品不存在");
        }


        TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);


        if(merchandise.getUserPopulation()==2){
            if(tAppUser.getIsVip()==0){
                return ResultUtil.error("该商品只能年度会员购买");
        try {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
            PointsMerchandise merchandise = mcClient.selectPointsMerchandiseById(exchangeType.getGoodId());
            if (ToolUtil.isEmpty(merchandise)){
                return ResultUtil.error("商品不存在");
            }
        }

            TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);


        if(merchandise.getUserPopulation()==3){
            List<TStudent> students = tsmapper.selectList(new LambdaQueryWrapper<TStudent>().eq(TStudent::getAppUserId, userIdFormRedis));
            if(students.size()==0){
                return ResultUtil.error("该商品只能已有学员用户购买");
            if(merchandise.getUserPopulation()==2){
                if(tAppUser.getIsVip()==0){
                    return ResultUtil.error("该商品只能年度会员购买");
                }
            }
        }

            if(merchandise.getUserPopulation()==3){
                List<TStudent> students = tsmapper.selectList(new LambdaQueryWrapper<TStudent>().eq(TStudent::getAppUserId, userIdFormRedis));
                if(students.size()==0){
                    return ResultUtil.error("该商品只能已有学员用户购买");
                }
            }

        if (ToolUtil.isEmpty(tAppUser)){
            return ResultUtil.error("用户不存在");
        }
        int goodsNums = 0;
        if (ToolUtil.isEmpty(exchangeType.getNums())){
            goodsNums = 1;
        }else {
            goodsNums = exchangeType.getNums();
        }
        AppUserGoodResp goodResp = new AppUserGoodResp();
        goodResp.setAppUserId(userIdFormRedis);
        goodResp.setGoodId(merchandise.getId());
        int count = mcClient.queryUserHasGoodsNums(goodResp);
        if (ToolUtil.isNotEmpty(count) && count >= merchandise.getPickUpQuantity()){
            return ResultUtil.error("超过限领数量");
        }
        int count1 = mcClient.queryUserHasGoodsNums1(goodResp);
        if (ToolUtil.isNotEmpty(count1) && count1 >= merchandise.getQuantityIssued()){
            return ResultUtil.error("超过发放数量");
        }
            if (ToolUtil.isEmpty(tAppUser)){
                return ResultUtil.error("用户不存在");
            }
            int goodsNums = 0;
            if (ToolUtil.isEmpty(exchangeType.getNums())){
                goodsNums = 1;
            }else {
                goodsNums = exchangeType.getNums();
            }
            AppUserGoodResp goodResp = new AppUserGoodResp();
            goodResp.setAppUserId(userIdFormRedis);
            goodResp.setGoodId(merchandise.getId());
            int count = mcClient.queryUserHasGoodsNums(goodResp);
            if (ToolUtil.isNotEmpty(count) && count >= merchandise.getPickUpQuantity()){
                return ResultUtil.error("超过限领数量");
            }
            int count1 = mcClient.queryUserHasGoodsNums1(goodResp);
            if (ToolUtil.isNotEmpty(count1) && count1 >= merchandise.getQuantityIssued()){
                return ResultUtil.error("超过发放数量");
            }

            for (int i = 0; i < goodsNums; i++) {
//            新增积分商品兑换记录
                UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
                pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
                pointsMerchandise.setUserId(userIdFormRedis);
                pointsMerchandise.setStatus(1);
                pointsMerchandise.setState(1);
                pointsMerchandise.setPayStatus(1);
                if (merchandise.getUseScope() == 3){
                    if (exchangeType.getGoodsType() == 2){
                        CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
                        pointsMerchandise.setStoreId(coursePackage.getStoreId());
                    }else {
                        pointsMerchandise.setStoreId(exchangeType.getStoreId());
                    }
                }
                pointsMerchandise.setCode(code);
                mcClient.saveDetailsUserPointMercase(pointsMerchandise);
            }


        switch (exchangeType.getExchangeType()){
            switch (exchangeType.getExchangeType()){
//            积分
            case 1:
                boolean b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
                if (b){
                    switch (exchangeType.getGoodsType()){
                        case 2:
                            Integer stuNums = 0;
                            if (ToolUtil.isNotEmpty(exchangeType.getStuIds())){
                                stuNums = exchangeType.getStuIds().size();
                            }else {
                                stuNums = 1;
                            }
                            for (int i = 0; i < stuNums; i++) {
                                List<CoursePackagePaymentConfig> courseConfigList = cpconClient.getCourseConfigList(merchandise.getCoursePackageId());
                                TCoursePackagePayment packagePayment = new TCoursePackagePayment();
                                packagePayment.setAppUserId(userIdFormRedis);
                                packagePayment.setStudentId(exchangeType.getStuIds().get(i));
                                packagePayment.setCoursePackageId(merchandise.getCoursePackageId());
                                for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
                                    if (Objects.equals(coursePackagePaymentConfig.getId(), merchandise.getCoursePackageConfigId())) {
                                        packagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
                                        packagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
                                        packagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
                                        packagePayment.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
                                        break;
                                    }
                case 1:
                    boolean b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
                    if (b){
                        switch (exchangeType.getGoodsType()){
                            case 2:
                                Integer stuNums = 0;
                                if (ToolUtil.isNotEmpty(exchangeType.getStuIds())){
                                    stuNums = exchangeType.getStuIds().size();
                                }else {
                                    stuNums = 1;
                                }
                                packagePayment.setPlayPaiCoin(merchandise.getIntegral());
                                packagePayment.setAbsencesNumber(0);
                                packagePayment.setPayUserType(1);
                                packagePayment.setPayStatus(2);
                                packagePayment.setPayUserId(userIdFormRedis);
                                packagePayment.setStatus(1);
                                packagePayment.setState(1);
                                packagePayment.setCode(code);
                                paymentClient.savePaymentCoursePackage(packagePayment);
                                for (int i = 0; i < stuNums; i++) {
                                    List<CoursePackagePaymentConfig> courseConfigList = cpconClient.getCourseConfigList(merchandise.getCoursePackageId());
                                    TCoursePackagePayment packagePayment = new TCoursePackagePayment();
                                    packagePayment.setAppUserId(userIdFormRedis);
                                    packagePayment.setStudentId(exchangeType.getStuIds().get(i));
                                    packagePayment.setCoursePackageId(merchandise.getCoursePackageId());
                                    for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
                                        if (Objects.equals(coursePackagePaymentConfig.getId(), merchandise.getCoursePackageConfigId())) {
                                            packagePayment.setClassHours(coursePackagePaymentConfig.getClassHours());
                                            packagePayment.setTotalClassHours(coursePackagePaymentConfig.getClassHours());
                                            packagePayment.setLaveClassHours(coursePackagePaymentConfig.getClassHours());
                                            packagePayment.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
                                            break;
                                        }
                                    }
                                    packagePayment.setPlayPaiCoin(merchandise.getIntegral());
                                    packagePayment.setAbsencesNumber(0);
                                    packagePayment.setPayUserType(1);
                                    packagePayment.setPayStatus(2);
                                    packagePayment.setPayUserId(userIdFormRedis);
                                    packagePayment.setStatus(1);
                                    packagePayment.setState(1);
                                    packagePayment.setCode(code);
                                    paymentClient.savePaymentCoursePackage(packagePayment);
                                }
                                break;
                            case 4:
                                for (int i = 0; i < goodsNums; i++) {
                                    UserCoupon coupon = new UserCoupon();
                                    coupon.setCouponId(exchangeType.getGoodId());
                                    coupon.setUserId(userIdFormRedis);
                                    coupon.setStatus(1);
                                    ucponClient.insertToAppuserCoupon(coupon);
                                }
                                break;
                            default:
                                break;
                        }
                    }else {
                        return ResultUtil.error("用户积分不足！");
                    }
                    break;
                case 2:
//                积分+现金
                    boolean dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
                    switch (exchangeType.getPayType()) {
                        case 1:
                            try {
                                if (merchandise.getType() == 2) {
                                    return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
                                } else {
                                    return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
                                }
                            } catch (Exception e) {
                                return ResultUtil.runErr();
                            }
                            break;
                        case 4:
                            for (int i = 0; i < goodsNums; i++) {
                                UserCoupon coupon = new UserCoupon();
                                coupon.setCouponId(exchangeType.getGoodId());
                                coupon.setUserId(userIdFormRedis);
                                coupon.setStatus(1);
                                ucponClient.insertToAppuserCoupon(coupon);
                        case 2:
                            if (merchandise.getType() == 2) {
                                return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
                            } else {
                                return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
                            }
                            break;
                        default:
                            break;
                    }
                }else {
                    return ResultUtil.error("用户积分不足！");
                }
                break;
            case 2:
//                积分+现金
                boolean dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
                switch (exchangeType.getPayType()) {
                    case 1:
                        try {
                            if (merchandise.getType() == 2) {
                                return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
                            } else {
                                return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
                    break;
                case 3:
                    switch (exchangeType.getPayType()) {
                        case 1:
                            try {
                                if (merchandise.getType() == 2) {
                                    return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
                                } else {
                                    return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
                                }
                            } catch (Exception e) {
                                return ResultUtil.runErr();
                            }
                        } catch (Exception e) {
                            return ResultUtil.runErr();
                        }
                    case 2:
                        if (merchandise.getType() == 2) {
                            return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
                        } else {
                            return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
                        }
                    default:
                        break;
                }
                break;
            case 3:
                switch (exchangeType.getPayType()) {
                    case 1:
                        try {
                        case 2:
                            if (merchandise.getType() == 2) {
                                return WechatPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
                                return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
                            } else {
                                return WechatPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
                                return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
                            }
                        } catch (Exception e) {
                            return ResultUtil.runErr();
                        }
                    case 2:
                        if (merchandise.getType() == 2) {
                            return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(exchangeType.getStuIds().size())), code);
                        } else {
                            return AlipayPayment(merchandise.getCash().multiply(new BigDecimal(goodsNums)), code);
                        }
                    default:
                        break;
                }
                break;
            default:
                break;
        }

        for (int i = 0; i < goodsNums; i++) {
//            新增积分商品兑换记录
            UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
            pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
            pointsMerchandise.setUserId(userIdFormRedis);
            pointsMerchandise.setStatus(1);
            pointsMerchandise.setState(1);
            if (merchandise.getUseScope() == 3){
                if (exchangeType.getGoodsType() == 2){
                    CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
                    pointsMerchandise.setStoreId(coursePackage.getStoreId());
                }else {
                    pointsMerchandise.setStoreId(exchangeType.getStoreId());
                }
                        default:
                            break;
                    }
                    break;
                default:
                    break;
            }
            pointsMerchandise.setCode(code);
            mcClient.saveDetailsUserPointMercase(pointsMerchandise);


            return ResultUtil.success();
        }catch (Exception e){
            e.printStackTrace();
            return null;
        }

        return ResultUtil.success();
    }

    public boolean dealAppUserIntegral(Integer appUserId,TAppUser appUser,Integer points){
@@ -1259,7 +1443,8 @@
    }

    private ResultUtil AlipayPayment(BigDecimal cash, String code) {
        ResultUtil alipay = payMoneyUtil.alipay("课包续费", "", "", code, cash.toString(),
        System.out.println("金额："+cash);
        ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", "", code, cash.toString(),
                "/base/pointMer/exchangeGoodPaymentAliCallback");
        if(alipay.getCode() == 200){
            new Thread(new Runnable() {
@@ -1272,26 +1457,33 @@
                            int min = 5000;
                            wait += (min * num);
                            Thread.sleep(wait);
                            System.out.println("code:"+code);
                            List<UserPointsMerchandise> userPointsMerchandises = mcClient.queryUserPointMerchaseByCode(code);
                            System.out.println("list-----"+userPointsMerchandises);
                            if(userPointsMerchandises.get(0).getPayStatus() == 2){
                                break;
                            }
                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
                            if(resultUtil.getCode() == 200 && userPointsMerchandises.get(0).getPayStatus() == 1){
//                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
                            AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
                            if(resultUtil.getCode().equals("10000") && userPointsMerchandises.get(0).getPayStatus() == 1){
                                /**
                                 * WAIT_BUYER_PAY（交易创建，等待买家付款）、
                                 * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
                                 * TRADE_SUCCESS（交易支付成功）、
                                 * TRADE_FINISHED（交易结束，不可退款）
                                 */
                                Map<String, String> data1 = resultUtil.getData();
                                String s = data1.get("tradeStatus");
                                String tradeNo = data1.get("tradeNo");
                                if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
//                                Map<String, String> data1 = resultUtil.getData();
//                                String s = data1.get("tradeStatus");
//                                String tradeNo = data1.get("tradeNo");

                                String tradeNo = resultUtil.getTradeNo();
                                String tradeStatus = resultUtil.getTradeStatus();
                                System.out.println("ssssss"+tradeStatus);
                                if("REFUND".equals(tradeStatus) || "NOTPAY".equals(tradeStatus) || "CLOSED".equals(tradeStatus) || "REVOKED".equals(tradeStatus) || "PAYERROR".equals(tradeStatus) || num == 10){
                                    mcClient.deletePaymentRecord(code);
                                    break;
                                }
                                if("TRADE_SUCCESS".equals(s)){
                                if("TRADE_SUCCESS".equals(tradeStatus)){
                                    for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
                                        userPointsMerchandise.setPayStatus(2);
                                        userPointsMerchandise.setOrderNumber(tradeNo);
@@ -1301,7 +1493,7 @@
                                    moneyOut(tradeNo,tradeNo);
                                    break;
                                }
                                if("WAIT_BUYER_PAY".equals(s)){
                                if("WAIT_BUYER_PAY".equals(tradeStatus)){
                                    num++;
                                }
                            }