Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2024-01-30 197431f6ce578d87a0156d2b8b13f1d327ba5e1e

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java

@@ -1168,15 +1168,15 @@
    })
    public ResultUtil continuationOperation(ClasspaymentRequest request) {
        try {
            Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
            if (null == userIdFormRedis) {
            Integer userId = tokenUtil.getUserIdFormRedis();
            if (null == userId) {
                return ResultUtil.tokenErr();
            }
            Integer couponId = request.getConponId();
            if (couponId == null || couponId == 0) {
                request.setConponId(null);
            }
            return packagePaymentService.ContinuationOrpaymentCourse(userIdFormRedis, request);
            return packagePaymentService.ContinuationOrpaymentCourse(userId, request);
        } catch (Exception e) {
            return ResultUtil.runErr();
        }