修改支付宝支付和bug修改

无关风月

2 天以前 df4733091b30b0434a04dacd0e844663114d4cfe

 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java

@@ -131,11 +131,6 @@
    private StudentHonorClient studentHonorClient;







    @Override
    public List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query) {
        return cpConfigMapper.listAll(query);
@@ -168,20 +163,20 @@
        String cityCode = studentQeryDto.getCityCode();
        //获取用户数据
        List<Integer> appUserIds = null;
        if(ToolUtil.isNotEmpty(cityCode)){
        if (ToolUtil.isNotEmpty(cityCode)) {
            List<AppUser> appUsers = appuClient.queryAppUserByCityCode(cityCode);
            if(appUsers.size() > 0){
            if (appUsers.size() > 0) {
                appUserIds = appUsers.stream().map(AppUser::getId).collect(Collectors.toList());
            }
        }
        QueryWrapper<CoursePackageStudent> status = new QueryWrapper<CoursePackageStudent>().eq("payStatus", 2).eq("status", 1);
        if(null != appUserIds){
        if (null != appUserIds) {
            status.in("appUserId", appUserIds);
        }
        List<Map<String, Object>> maps = this.baseMapper.getStudentTotal(appUserIds, studentQeryDto.getStart(), studentQeryDto.getEnd(),studentQeryDto.getCoursePackageIds());
        List<Map<String, Object>> maps = this.baseMapper.getStudentTotal(appUserIds, studentQeryDto.getStart(), studentQeryDto.getEnd(), studentQeryDto.getCoursePackageIds());
        List<Map<String, Object>> list = new ArrayList<>();
        for (Map<String, Object> objectMap : maps) {
            if(null == objectMap.get("studentId")){
            if (null == objectMap.get("studentId")) {
                continue;
            }
            Integer studentId = Integer.valueOf(objectMap.get("studentId").toString());
@@ -190,12 +185,12 @@
            Integer number = Integer.valueOf(objectMap.get("number").toString());
            Map<String, Object> map = new HashMap<>();
            Student student = studentClient.queryStudentById(studentId);
            if(null == student){
            if (null == student) {
                continue;
            }
            map.put("studentName", student.getName());
            AppUser appUser = appuClient.queryAppUser(appUserId);
            if(null == appUser){
            if (null == appUser) {
                continue;
            }
            map.put("province", appUser.getProvince());
@@ -210,7 +205,7 @@
                    .eq("coursePackageId", coursePackageId).eq("payStatus", 2).eq("state", 1)
                    .gt("cashPayment", 0).last(" and studentIds like '%" + studentId + "%' order by insertTime desc limit 0, 1"));
            Double cashPayment = 0D;
            if(null != coursePackageOrder && coursePackageOrder.getClassHours() > 0){
            if (null != coursePackageOrder && coursePackageOrder.getClassHours() > 0) {
                cashPayment = coursePackageOrder.getCashPayment().divide(new BigDecimal(coursePackageOrder.getClassHours()), new MathContext(2, RoundingMode.HALF_EVEN)).doubleValue();
            }
            map.put("cashPayment", cashPayment * number);
@@ -246,7 +241,7 @@
            for (CoursePackageOrder coursePackageOrder : list) {
                p = p.add(coursePackageOrder.getCashPayment());
            }
            if(list.size() > 0){
            if (list.size() > 0) {
                cashPayment = p.divide(new BigDecimal(list.size()), new MathContext(2, RoundingMode.HALF_EVEN)).doubleValue();
            }
            map.put("cashPayment", cashPayment * number);
@@ -532,14 +527,12 @@
    private ALiSendSms aLiSendSms;




    @Override
    public CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId, String lon, String lat) {
        AppUser appUser = appuClient.queryAppUser(appUserId);
        CourseDetailsResponse response = new CourseDetailsResponse();
        CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePayId);
        if (coursePackageOrder==null){
        if (coursePackageOrder == null) {
//             student = coursePackageStudentService.getById(coursePayId);
            CoursePackageOrderStudent student = coursePackageOrderStudentService.getById(coursePayId);

@@ -599,7 +592,7 @@
            response.setIntroduceDrawing(coursePackage.getIntroduceDrawing());

            Integer payType = coursePackageOrder.getPayType();
            if(null == payType){
            if (null == payType) {
                CoursePackagePaymentConfig config = coursePackagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId", coursePackage.getId()).orderByAsc("classHours")).get(0);
                if (ToolUtil.isNotEmpty(config.getCashPayment()) && config.getCashPayment() > 0 && ToolUtil.isNotEmpty(config.getPlayPaiCoin()) && config.getPlayPaiCoin() > 0) {
                    payType = 3;
@@ -640,7 +633,7 @@
                    response.setVipAmount(discountMember);
                    break;
                case 2:
                    if (playPaiCoin!=null) {
                    if (playPaiCoin != null) {
                        response.setWpGold(playPaiCoin);
                    }
                    break;
@@ -799,10 +792,10 @@

    @Override
    public ResultUtil ContinuationOrpaymentCourse(Integer userId, ClasspaymentRequest request) {
        System.err.println("请求参数"+request);
        System.err.println("请求参数" + request);
        AppUser appUser = appuClient.queryAppUser(userId);
        CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(request.getCoursePayId());
        System.err.println("上次支付记录"+coursePackageOrder);
        System.err.println("上次支付记录" + coursePackageOrder);
        String code = "";
        BigDecimal money = BigDecimal.valueOf(request.getCash());
        Integer wpGold = request.getPlayPaiCoin();
@@ -818,13 +811,13 @@
            CoursePackagePaymentConfig paymentConfig = cpConfigMapper.selectOne(new QueryWrapper<CoursePackagePaymentConfig>()
                    .eq("coursePackageId", request.getLessonId())
                    .eq("classHours", request.getCourseHoursNum()));
            System.err.println("价格配置"+paymentConfig);
            System.err.println("价格配置" + paymentConfig);
            TCoursePackageDiscount coursePackageDiscount = tcpdMapper.selectOne(new QueryWrapper<TCoursePackageDiscount>()
                    .eq("coursePackageId", request.getLessonId())
                    .eq("type", 2)
                    .eq("auditStatus", 1)
                    .eq("coursePackagePaymentConfigId", paymentConfig.getCoursePackageId()));
            System.err.println("折扣"+coursePackageDiscount);
            System.err.println("折扣" + coursePackageDiscount);
            if (ToolUtil.isNotEmpty(coursePackageDiscount)) {
                String content = coursePackageDiscount.getContent();
                JSONObject jsonObject = JSON.parseObject(content);
@@ -853,7 +846,7 @@
            newPayment.setPayType(request.getPayType());
            newPayment.setState(1);
            newPayment.setInsertTime(new Date());
            if (request.getCash()!=null && request.getCash()!=0){
            if (request.getCash() != null && request.getCash() != 0) {
                newPayment.setCashPayment(BigDecimal.valueOf(request.getCash()));
            }
            newPayment.setPlayPaiCoin(request.getPlayPaiCoin());
@@ -867,9 +860,9 @@
            case 1:
                if (request.getUseConpon() == 1) {
                    Integer coupon1 = client.queryUserCouponById(request.getConponId());
                    System.err.println("优惠券id"+coupon1);
                    System.err.println("优惠券id" + coupon1);
                    Coupon coupon = client.queryCouponById(coupon1);
                    System.err.println("优惠券信息"+coupon);
                    System.err.println("优惠券信息" + coupon);
//                    if (coupon.getType() == 1) {
//                        Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
//                        Double conditionalAmount = (Double) couponRules.get("conditionalAmount");
@@ -886,7 +879,7 @@
//                    }
                }
                try {
                    return WeChatPayment(code, money,request.getLessonId());
                    return WeChatPayment(code, money, request.getLessonId());
                } catch (Exception e) {
                    return ResultUtil.runErr();
                }
@@ -920,32 +913,33 @@
        return ResultUtil.success();
    }

    public ResultUtil WeChatPayment(String code, BigDecimal request,Integer coursePackageId) throws Exception {
        System.err.println("code-------------"+code);
        System.err.println("request---------------"+request);
        System.err.println("coursePackageId-------------"+coursePackageId);
    public ResultUtil WeChatPayment(String code, BigDecimal request, Integer coursePackageId) throws Exception {
        System.err.println("code-------------" + code);
        System.err.println("request---------------" + request);
        System.err.println("coursePackageId-------------" + coursePackageId);
        TCoursePackage byId = coursePackageService.getById(coursePackageId);
        System.err.println("课包"+coursePackageId);
        System.err.println("课包" + coursePackageId);
        Integer storeId = byId.getStoreId();
        Store store = storeClient.queryStoreById(storeId);
        System.err.println("门店查询"+store);
        if (store.getOperatorId()==null || store.getOperatorId()==0){
                    ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, request.toString(),
                "/base/coursePackage/wechatRegisteredCoursesCallback", "APP", "");
        System.err.println("门店查询" + store);
        if (store.getOperatorId() == null || store.getOperatorId() == 0) {
            ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, request.toString(),
                    "/base/coursePackage/wechatRegisteredCoursesCallback", "APP", "");
            return weixinpay;
        }else{
        } else {
            String s = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
            System.err.println("微信商户号"+s);
            if(!StringUtils.hasLength(s)){
            System.err.println("微信商户号" + s);
            if (!StringUtils.hasLength(s)) {
                return ResultUtil.error("运营商未配置微信商户号，获取支付失败!");
            }
            return payMoneyUtil.weixinpayV3(s,"课包续费",code,
                    "/base/coursePackage/wechatRegisteredCoursesCallback1",request.toString(),"");
            return payMoneyUtil.weixinpayV3(s, "课包续费", code,
                    "/base/coursePackage/wechatRegisteredCoursesCallback1", request.toString(), "");
        }
    }

    private String smid = "2088330203191220";//平台支付宝商户号

//    public static void main(String[] args) {
    //    public static void main(String[] args) {
//        BigDecimal bigDecimal = new BigDecimal("100");
//
//
@@ -968,88 +962,74 @@
        Integer coursePackageId = coursePackagePayment.getCoursePackageId();
        TCoursePackage byId = coursePackageService.getById(coursePackageId);
        Store store = storeClient.queryStoreById(byId.getStoreId());
        String smid1="";
        if (store.getOperatorId() == null ){
        String smid1 = "";
        if (store.getOperatorId() == null) {
            smid1 = smid;
        }else if (store.getOperatorId() == 0){
        } else if (store.getOperatorId() == 0) {
            smid1 = smid;
        }else{
        } else {
            smid1 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
        }
        if (!StringUtils.hasLength(smid1)){
        if (!StringUtils.hasLength(smid1)) {
            return ResultUtil.error("运营商未配置支付宝商户号，获取支付失败!");
        }
        ResultUtil alipay = payMoneyUtil.alipay(smid1,"课包购买", "课包购买", "", code, request.toString(),
        ResultUtil alipay = payMoneyUtil.alipay(smid1, "课包购买", "课包购买", "", code, request.toString(),
                "/base/coursePackage/alipayRegisteredCoursesCallback");
//        if (alipay.getCode() == 200) {
//            String finalCode = code;
//            new Thread(new Runnable() {
//                @Override
//                public void run() {
//                    try {
//                        Thread.sleep(1000);
//                        int num = 1;
//                        int wait = 0;
//                        while (num <= 10) {
//                            int min = 5000;
//                            wait += (min * num);
//                            Thread.sleep(wait);
//                            CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
//                                    .eq("code", finalCode).eq("state", 1));
//                            if (coursePackageOrder1.getPayStatus() == 2) {
//                                break;
//                            }
//                            AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(finalCode);
//                            if (null != alipayTradeQueryResponse) {
//                                /**
//                                 * WAIT_BUYER_PAY（交易创建，等待买家付款）、
//                                 * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
//                                 * TRADE_SUCCESS（交易支付成功）、
//                                 * TRADE_FINISHED（交易结束，不可退款）
//                                 */
//                                String s = alipayTradeQueryResponse.getTradeStatus();
//
//                                String tradeNo = alipayTradeQueryResponse.getTradeNo();
//                                if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
//                                    //有待支付的订单，这里不处理
////                                    coursePackageOrder1.setState(3);
////                                    coursePackageOrderService.updateById(coursePackageOrder1);
//                                    break;
//                                }
//                                if ("TRADE_SUCCESS".equals(s)) {
//                                    coursePackagePayment.setPayStatus(2);
//                                    coursePackagePayment.setOrderNumber(tradeNo);
//                                    baseMapper1.updateById(coursePackagePayment);
//                                        // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
//                                        Integer coursePackageId = coursePackagePayment.getCoursePackageId();
//                                        TCoursePackage byId = coursePackageService.getById(coursePackageId);
//                                        Store store = storeClient.queryStoreById(byId.getStoreId());
//                                        if (store.getOperatorId() == null ){
//                                            // 说明是平台的门店 无需冻结资金 不走分账
//                                            payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
//                                        }else if (store.getOperatorId() == 0){
//                                            // 说明是平台的门店
//                                            payMoneyUtil.confirm1(smid,code,tradeNo,request.toString());
//                                            // 发起分账
//                                            extracted(store, coursePackageOrder1, tradeNo);
//                                        }else{
//                                            payMoneyUtil.confirm(storeClient.getSMIDByOperatorId(store.getOperatorId()),code,tradeNo,request.toString());
//                                            // 发起分账
//                                            extracted(store, coursePackageOrder1, tradeNo);
//                                        }
//                                    break;
//                                }
//                                if ("WAIT_BUYER_PAY".equals(s)) {
//                                    num++;
//                                }
//                            }
//                        }
//                    } catch (Exception e) {
//                        e.printStackTrace();
//                    }
//                }
//            }).start();
//        }
        if (alipay.getCode() == 200) {
            String finalCode = code;
            String finalSmid = smid1;
            new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
                        Thread.sleep(1000);
                        int num = 1;
                        int wait = 0;
                        while (num <= 10) {
                            int min = 5000;
                            wait += (min * num);
                            Thread.sleep(wait);
                            CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
                                    .eq("code", finalCode).eq("state", 1));
                            if (coursePackageOrder1.getPayStatus() == 2) {
                                break;
                            }
                            AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(finalCode);
                            if (null != alipayTradeQueryResponse) {
                                /**
                                 * WAIT_BUYER_PAY（交易创建，等待买家付款）、
                                 * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
                                 * TRADE_SUCCESS（交易支付成功）、
                                 * TRADE_FINISHED（交易结束，不可退款）
                                 */
                                String s = alipayTradeQueryResponse.getTradeStatus();

                                String tradeNo = alipayTradeQueryResponse.getTradeNo();
                                if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
                                    //有待支付的订单，这里不处理
//                                    coursePackageOrder1.setState(3);
//                                    coursePackageOrderService.updateById(coursePackageOrder1);
                                    break;
                                }
                                if ("TRADE_SUCCESS".equals(s)) {
                                    coursePackagePayment.setPayStatus(2);
                                    coursePackagePayment.setOrderNumber(tradeNo);
                                    baseMapper1.updateById(coursePackagePayment);
                                    Thread.sleep(30000);
                                    payMoneyUtil.confirm(finalSmid, code, tradeNo, request.toString());
                                    break;
                                }
                                if ("WAIT_BUYER_PAY".equals(s)) {
                                    num++;
                                }
                            }
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
            }).start();
        }
        return alipay;
    }

@@ -1104,10 +1084,10 @@
        System.err.println("进入玩湃支付");
        CoursePackageOrder packagePayment = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
                .eq("code", code));
        System.err.println("支付"+packagePayment);
        System.err.println("用户信息"+appUser);
        System.err.println("code"+code);
        System.err.println("wpGold"+wpGold);
        System.err.println("支付" + packagePayment);
        System.err.println("用户信息" + appUser);
        System.err.println("code" + code);
        System.err.println("wpGold" + wpGold);
        if (appUser.getPlayPaiCoins() < wpGold) {
            return ResultUtil.error("玩湃币不足！");
        }
@@ -1119,9 +1099,9 @@
            System.err.println("修改");
            boolean b = coursePackageOrderService.updateById(packagePayment);

        }catch (Exception e){
            System.err.println("报错"+e.getCause());
            System.err.println("报错"+e.getMessage());
        } catch (Exception e) {
            System.err.println("报错" + e.getCause());
            System.err.println("报错" + e.getMessage());
            e.printStackTrace();
        }
        appUser.setPlayPaiCoins(ToolUtil.isNotEmpty(appUser.getPlayPaiCoins()) ? appUser.getPlayPaiCoins() - wpGold : wpGold);
@@ -1222,8 +1202,7 @@
                        } else if (start.after(new Date())) {
                            //待上课
                            recordVo.setStatus(1);
                        }
                        else {
                        } else {
                            CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
                                    .eq("coursePackageSchedulingId", byId.getId()).last("limit 1"));
                            if (ToolUtil.isNotEmpty(cancelledClasses)) {
@@ -1336,22 +1315,22 @@

        List<Map<String, Object>> list = new ArrayList<>();

        if (coursePackage.getType()==1){
      list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);
        }else {
        if (coursePackage.getType() == 1) {
            list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);
        } else {
            list = this.baseMapper.queryRegistrationRecord1(page, coursePackageId, userIds, studentIds);
        }

        list.addAll(this.baseMapper.queryRegistrationRecord3(coursePackageId,userIds,studentIds));
        list.addAll(this.baseMapper.queryRegistrationRecord3(coursePackageId, userIds, studentIds));
        for (Map<String, Object> map : list) {


            Long id = Long.valueOf(map.get("id").toString());
            Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
            Integer studentId = 0;
            if (coursePackage.getType()==1) {
            if (coursePackage.getType() == 1) {
                studentId = Integer.valueOf(map.get("studentId").toString());
            }else {
            } else {
                studentId = Integer.valueOf(map.get("studentIds").toString().split(",")[0]);
            }

@@ -1363,7 +1342,7 @@
            Integer integer = cpsMapper.selectCount(new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId)
                    .eq("studentId", studentId).eq("coursePackagePaymentId", id).eq("signInOrNot", 2));

            int count = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageId", coursePackageId).eq("studentId", studentId).eq("signInOrNot",2));
            int count = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageId", coursePackageId).eq("studentId", studentId).eq("signInOrNot", 2));

            map.put("absencesNumber", count);

@@ -1559,12 +1538,12 @@
        //需要购买使用的课时数
        Integer num = req.getNum();
        //需要删除多余的排课记录
        if(num.compareTo(laveClassHours1) > 0){
        if (num.compareTo(laveClassHours1) > 0) {
            //课时数差额
            int number1 = num - laveClassHours1;
            double o = number1 % coursePackage.getNeedNum();
            int l = 0;
            if(0 != o){
            if (0 != o) {
                l = 1;
            }
            int n = Double.valueOf(number1 / coursePackage.getNeedNum()).intValue() + l;
@@ -1620,7 +1599,7 @@
        coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() - req.getNum());
        coursePackageOrderStudentService.updateById(coursePackageOrderStudent);
        Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
        if(3 >= laveClassHours){
        if (3 >= laveClassHours) {
            AppUser appUser = appuClient.queryAppUser(coursePackageOrderStudent.getAppUserId());
            //发送短信提醒
            aLiSendSms.sendSms(appUser.getPhone(), "SMS_463646317", "");