bug修改

无关风月

2025-12-10 efd48fe10bde8a50106aedf60ea6dc7f1e74e264

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

@@ -882,6 +882,7 @@

        }

        System.err.println("课程报名！！！");
        if (paymentCourseVo.getPayType() == 1) {//微信支付
            return weChatPaymentCourse(uid, price, paymentCourseVo);
        }
@@ -921,6 +922,7 @@
            coursePackageOrder.setAppUserId(uid);
            coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
            coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
            coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
            coursePackageOrder.setPayType(paymentCourseVo.getPayType());
            coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
            coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice());
@@ -942,6 +944,8 @@
            coursePackageOrder.setAppUserId(null);
            coursePackageOrder.setPayUserType(1);
            coursePackageOrder.setPayUserId(uid);
            coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());

            coursePackageOrderService.updateById(coursePackageOrder);
        }
        TCoursePackage byId = coursePackageService.getById(paymentCourseVo.getId());
@@ -988,6 +992,8 @@
            CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
            coursePackageOrder.setCode(code);
            coursePackageOrder.setAppUserId(uid);
            coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());

            coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
            coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
            coursePackageOrder.setPayType(paymentCourseVo.getPayType());
@@ -1010,6 +1016,8 @@
            coursePackageOrder.setAppUserId(null);
            coursePackageOrder.setPayUserType(1);
            coursePackageOrder.setPayUserId(uid);
            coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());

            coursePackageOrderService.updateById(coursePackageOrder);
        }
        // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
@@ -1238,6 +1246,7 @@
            coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId());
            coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice));
            coursePackageOrder.setPlayPaiCoin(paymentCourseVo.getPrice().intValue());
            coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
            coursePackageOrder.setPayUserType(1);
            coursePackageOrder.setPayStatus(2);
            coursePackageOrder.setPayUserId(appUser.getId());
@@ -1271,6 +1280,10 @@
     */
    @Override
    public ResultUtil paymentCourseCallback(String code, String trade_no, String attach) throws Exception {
        System.err.println("进入回调");
        System.err.println("code"+ code);
        System.err.println("trade_no"+ trade_no);
        System.err.println("attach"+trade_no);
        CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
                .eq("code", code).eq("state", 1));
        if (null == coursePackageOrder1 || coursePackageOrder1.getPayStatus() == 2) {
@@ -1283,12 +1296,13 @@
        TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
        // 将用户优惠券修改为已使用
        Long userCouponId = coursePackageOrder1.getUserCouponId();

        userCouponClient.updateUserCouponStatus(userCouponId,coursePackage.getStoreId(),coursePackage.getSiteId());
//        CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(attach);
//        addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
        TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
        Store store = storeClient.queryStoreById(byId.getStoreId());
        if (userCouponId!=null){
            userCouponClient.updateUserCouponStatus(userCouponId,coursePackage.getStoreId(),coursePackage.getSiteId());
        }
        CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(attach);
        addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
//        TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
//        Store store = storeClient.queryStoreById(byId.getStoreId());
//        moneyOut(trade_no,trade_no,code);
        return ResultUtil.success();
    }
@@ -1297,11 +1311,16 @@
    /**
     * 支付成功后添加学员课时数据
     *
     * @param coursePackagePaymentConfig
     */
    @Override
    public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfig) {
    public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfigServiceById) {
        System.err.println("添加学员课时数据");
        System.err.println("coursePackageOrderId"+coursePackageOrderId);
//        System.err.println("coursePackagePaymentConfig"+coursePackagePaymentConfig);

        CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePackageOrderId);
        CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(coursePackageOrder.getCoursePackagePaymentConfigId());

        // 发放优惠券
        userCouponClient.sendUserCoupon(new SendCouponReq(coursePackageOrder.getAppUserId(), coursePackagePaymentConfig.getCouponIds()));

@@ -1315,6 +1334,7 @@
                CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getOne(new QueryWrapper<CoursePackageOrderStudent>().eq("studentId", id)
                        .eq("coursePackageId", coursePackageOrder.getCoursePackageId()).eq("state", 1));
                if (null == coursePackageOrderStudent) {
                    System.err.println("新增课包订单学员数据");
                    coursePackageOrderStudent = new CoursePackageOrderStudent();
                    coursePackageOrderStudent.setAppUserId(coursePackageOrder.getAppUserId());
                    coursePackageOrderStudent.setStudentId(Integer.valueOf(id));
@@ -1371,6 +1391,7 @@
                        courseCounsumService.save(courseCounsum1);
                    }
                } else {
                    System.err.println("更新");
                    Date useTime = coursePackageOrderStudent.getUseTime();
                    coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours());
                    coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + coursePackagePaymentConfig.getClassHours());