From 5dc40fcd64b0513150f1d8335ab849e6d8cdc28e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 04 七月 2025 19:42:49 +0800
Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付

---
 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java |  697 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 376 insertions(+), 321 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 25b9b3e..40cbbff 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -5,7 +5,12 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.domain.Person;
+import com.alipay.api.request.AlipayTradeOrderSettleRequest;
+import com.alipay.api.response.AlipayTradeOrderSettleResponse;
 import com.alipay.api.response.AlipayTradeQueryResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,10 +20,7 @@
 import com.dsh.course.entity.*;
 import com.dsh.course.entity.TAppUser;
 import com.dsh.course.entity.dto.StudentQeryDto;
-import com.dsh.course.feignclient.account.AppUserClient;
-import com.dsh.course.feignclient.account.CoachClient;
-import com.dsh.course.feignclient.account.StudentClient;
-import com.dsh.course.feignclient.account.UserIntegralChangesClient;
+import com.dsh.course.feignclient.account.*;
 import com.dsh.course.feignclient.account.model.*;
 import com.dsh.course.feignclient.activity.BenefitVideoClient;
 import com.dsh.course.feignclient.activity.CouponClient;
@@ -35,6 +37,7 @@
 import com.dsh.course.model.vo.response.*;
 import com.dsh.course.service.*;
 import com.dsh.course.util.*;
+import com.dsh.course.util.wx.WxV3PayConfig;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +52,8 @@
 import javax.annotation.Resource;
 import javax.persistence.criteria.CriteriaBuilder;
 import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.MathContext;
 import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -122,6 +127,14 @@
     @Resource
     private UserIntegralChangesClient userIntegralChangesClient;
 
+    @Resource
+    private StudentHonorClient studentHonorClient;
+
+
+
+
+
+
 
     @Override
     public List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query) {
@@ -152,140 +165,96 @@
 
     @Override
     public List<Map<String, Object>> getStudentTotal(StudentQeryDto studentQeryDto) {
-//        String cityCode = studentQeryDto.getCityCode();
-//        String start = studentQeryDto.getStart();
-//        String end = studentQeryDto.getEnd();
-//        //获取用户数据
-//        List<Integer> appUserIds = null;
-//        if(ToolUtil.isNotEmpty(cityCode)){
-//            List<AppUser> appUsers = appuClient.queryAppUserByCityCode(cityCode);
-//            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){
-//            status.in("appUserId", appUserIds);
-//        }
-//        List<Map<String, Object>> maps = this.baseMapper.getStudentTotal(appUserIds, studentQeryDto.getStart(), studentQeryDto.getEnd());
-//        List<Map<String, Object>> list = new ArrayList<>();
-//        for (Map<String, Object> objectMap : maps) {
-//            Integer studentId = Integer.valueOf(objectMap.get("studentId").toString());
-//            Integer appUserId = Integer.valueOf(objectMap.get("appUserId").toString());
-//            Integer coursePackageId = Integer.valueOf(objectMap.get("coursePackageId").toString());
-//            Integer number = Integer.valueOf(objectMap.get("number").toString());
-//            Map<String, Object> map = new HashMap<>();
-//            Student student = studentClient.queryStudentById(studentId);
-//            map.put("studentName", student.getName());
-//            AppUser appUser = appuClient.queryAppUser(appUserId);
-//            map.put("province", appUser.getProvince());
-//            map.put("provinceCode", appUser.getProvinceCode());
-//            map.put("city", appUser.getCity());
-//            map.put("cityCode", appUser.getCityCode());
-//            TCoursePackage coursePackage = coursePackageService.getById(coursePackageId);
-//            map.put("courseName", coursePackage.getName());
-//            map.put("totalClassHours", number);
-//            map.put("cashPayment", coursePackageOrder.getCashPayment());
-//            map.put("hasHours", )
-//
-//
-//        }
+        String cityCode = studentQeryDto.getCityCode();
+        //获取用户数据
+        List<Integer> appUserIds = null;
+        if(ToolUtil.isNotEmpty(cityCode)){
+            List<AppUser> appUsers = appuClient.queryAppUserByCityCode(cityCode);
+            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){
+            status.in("appUserId", appUserIds);
+        }
+        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")){
+                continue;
+            }
+            Integer studentId = Integer.valueOf(objectMap.get("studentId").toString());
+            Integer appUserId = Integer.valueOf(objectMap.get("appUserId").toString());
+            Integer coursePackageId = Integer.valueOf(objectMap.get("coursePackageId").toString());
+            Integer number = Integer.valueOf(objectMap.get("number").toString());
+            Map<String, Object> map = new HashMap<>();
+            Student student = studentClient.queryStudentById(studentId);
+            if(null == student){
+                continue;
+            }
+            map.put("studentName", student.getName());
+            AppUser appUser = appuClient.queryAppUser(appUserId);
+            if(null == appUser){
+                continue;
+            }
+            map.put("province", appUser.getProvince());
+            map.put("provinceCode", appUser.getProvinceCode());
+            map.put("city", appUser.getCity());
+            map.put("cityCode", appUser.getCityCode());
+            TCoursePackage coursePackage = coursePackageService.getById(coursePackageId);
+            map.put("courseName", coursePackage.getName());
+            map.put("totalClassHours", number);
 
+            CoursePackageOrder coursePackageOrder = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>().eq("appUserId", appUserId)
+                    .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){
+                cashPayment = coursePackageOrder.getCashPayment().divide(new BigDecimal(coursePackageOrder.getClassHours()), new MathContext(2, RoundingMode.HALF_EVEN)).doubleValue();
+            }
+            map.put("cashPayment", cashPayment * number);
 
-//        List<Map<String, Object>> studentTotal = this.baseMapper.getStudentTotal(studentQeryDto);
-//        for (Map<String, Object> student : studentTotal) {
-//            Integer appUserId = (Integer) student.get("appUserId");
-//            AppUser appUser = appuClient.queryAppUser(appUserId);
-//            student.put("province", appUser.getProvince());
-//            student.put("provinceCode", appUser.getProvinceCode());
-//
-//            student.put("city", appUser.getCity());
-//            student.put("cityCode", appUser.getCityCode());
-//
-//            Student studentId = studentClient.queryStudentById((Integer) student.get("studentId"));
-//            student.put("studentName", studentId.getName());
-//            BigDecimal cashPayment = (BigDecimal) student.get("cashPayment");
-//            BigDecimal totalClassHours = (BigDecimal) student.get("totalClassHours");
-//            BigDecimal hasHours = (BigDecimal) student.get("hasHours");
-//            if (cashPayment == null) {
-//                continue;
-//            }
-//            if (totalClassHours.compareTo(BigDecimal.ZERO) == 0) {
-//                totalClassHours = totalClassHours.add(new BigDecimal("1"));
-//            }
-//            BigDecimal hasPayment = cashPayment.divide(totalClassHours, 2, RoundingMode.HALF_UP)
-//                    .multiply(hasHours).setScale(2, RoundingMode.HALF_UP);
-//            student.put("hasPayment", hasPayment);
-//        }
-//
-//        if (studentQeryDto.getCityCode() != null && studentQeryDto.getCityCode() != "") {
-//            String value = studentQeryDto.getCityCode();
-//            boolean allZeros = value.substring(value.length() - 4).endsWith("0000");
-//            System.out.println(allZeros); // Output: true
-//            if (allZeros) {
-//                Iterator<Map<String, Object>> iterator = studentTotal.iterator();
-//                while (iterator.hasNext()) {
-//                    Map<String, Object> student = iterator.next();
-//                    String cityCode = (String) student.get("provinceCode");
-//                    if (!cityCode.equals(studentQeryDto.getCityCode())) {
-//                        iterator.remove(); // Remove the element from the list
-//                    }
-//                }
-//            } else {
-//                Iterator<Map<String, Object>> iterator = studentTotal.iterator();
-//                while (iterator.hasNext()) {
-//                    Map<String, Object> student = iterator.next();
-//                    String cityCode = (String) student.get("cityCode");
-//                    if (!cityCode.equals(studentQeryDto.getCityCode())) {
-//                        iterator.remove(); // Remove the element from the list
-//                    }
-//                }
-//            }
-//        }
-//
-//        if (studentQeryDto.getStudentName() != null && studentQeryDto.getStudentName() != "") {
-//            List<Map<String, Object>> totallike = new ArrayList<>();
-//            for (Map<String, Object> student : studentTotal) {
-//                String studentName = (String) student.get("studentName");
-//                if (studentName.contains(studentQeryDto.getStudentName())) {
-//                    totallike.add(student);
-//                }
-//
-//            }
-//            return totallike;
-//        }
-//        return studentTotal;
-        return null;
+            int count = coursePackageSchedulingService.count(new QueryWrapper<CoursePackageScheduling>().eq("studentId", studentId)
+                    .eq("coursePackageId", coursePackageId).eq("status", 3));
+            map.put("hasHours", count);
+            map.put("hasPayment", count * cashPayment);
+
+            list.add(map);
+        }
+        return list;
     }
 
     @Override
     public List<Map<String, Object>> bypac(PacQueryDto pacQueryDto) {
-        if (pacQueryDto.getCityCode() != null && pacQueryDto.getCityCode() != "") {
-            String value = pacQueryDto.getCityCode();
-            boolean allZeros = value.substring(value.length() - 4).endsWith("0000");
-            System.out.println(allZeros); // Output: true
+        List<Map<String, Object>> maps = this.baseMapper.pacQueryDto(pacQueryDto.getStart(), pacQueryDto.getEnd(), pacQueryDto.getStoreIds(), pacQueryDto.getName());
+        for (Map<String, Object> map : maps) {
+            Integer id = Integer.valueOf(map.get("id").toString());
+            Integer storeId = Integer.valueOf(map.get("storeId").toString());
+            Integer number = Integer.valueOf(map.get("number").toString());
+            Store store = storeClient.queryStoreById(storeId);
+            map.put("store", store.getName());
+            map.put("totalClassHours", number);
 
-            if (allZeros) {
-                pacQueryDto.setProvinceCode(pacQueryDto.getCityCode());
-                pacQueryDto.setCityCode(null);
+            List<CoursePackageOrder> list = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>()
+                    .eq("coursePackageId", id).eq("payStatus", 2).eq("state", 1)
+                    .gt("cashPayment", 0));
+
+
+            Double cashPayment = 0D;
+            BigDecimal p = new BigDecimal(0);
+            for (CoursePackageOrder coursePackageOrder : list) {
+                p = p.add(coursePackageOrder.getCashPayment());
             }
-
-        }
-        List<Map<String, Object>> maps = this.baseMapper.pacQueryDto(pacQueryDto);
-
-        if (pacQueryDto.getName() != null && pacQueryDto.getName() != "") {
-            List<Map<String, Object>> totallike = new ArrayList<>();
-            for (Map<String, Object> student : maps) {
-                String studentName = (String) student.get("name");
-                if (studentName.contains(pacQueryDto.getName())) {
-                    totallike.add(student);
-                }
-
+            if(list.size() > 0){
+                cashPayment = p.divide(new BigDecimal(list.size()), new MathContext(2, RoundingMode.HALF_EVEN)).doubleValue();
             }
-            return totallike;
+            map.put("cashPayment", cashPayment * number);
+
+            int count = coursePackageSchedulingService.count(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", id).eq("status", 3));
+            map.put("hasHours", count);
+            map.put("lavePay", count * cashPayment);
         }
-
-
         return maps;
     }
 
@@ -403,6 +372,7 @@
                 .eq("coursePackageId", detailsRequest.getCoursePackageId())
                 .eq("courseId", detailsRequest.getVideoId())
         );
+        //完成学习
         if (null != userVideoDetails && userVideoDetails.getState() == 1 && detailsRequest.getIsOver() == 1) {
             userVideoDetails.setState(2);
             userVideoDetails.setUpdateTime(new Date());
@@ -413,11 +383,19 @@
             AppUser appUser = appuClient.queryAppUser(coursePackageScheduling.getAppUserId());
             appUser.setIntegral((null == appUser.getIntegral() ? 0 : appUser.getIntegral()) + (null == coursePackageScheduling.getIntegral() ? 0 : coursePackageScheduling.getIntegral()));
             appuClient.updateAppUser(appUser);
+            //保存用户积分变动记录
             SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
             vo.setAppUserId(coursePackageScheduling.getAppUserId());
             vo.setIntegral(coursePackageScheduling.getIntegral());
             vo.setType(4);
             userIntegralChangesClient.saveUserIntegralChanges(vo);
+            //添加勋章数据
+            Integer number = uvdmapper.selectCount(new QueryWrapper<UserVideoDetails>().eq("appUserId", appUserId).eq("state", 2));
+            StudentHonor studentHonor = new StudentHonor();
+            studentHonor.setAppUserId(appUserId);
+            studentHonor.setHonorType(4);
+            studentHonor.setNumber(number);
+            studentHonorClient.saveStudentHonor(studentHonor);
             return "SUCCESS";
         }
         return "ERROR";
@@ -457,7 +435,6 @@
                     TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
                     Store store = stoClient.queryStoreById(coursePackage.getStoreId());
                     RegisterCourseVo registerCourseVo = new RegisterCourseVo();
-                    // 2.0
                     registerCourseVo.setType(coursePackage.getType());
 
                     registerCourseVo.setOrderId(tCoursePackagePayment.getOrderId().longValue());
@@ -467,8 +444,6 @@
                     registerCourseVo.setPackageImg(coursePackage.getCoverDrawing());
                     String storeAndCourse = coursePackage.getName() + "(" + store.getName() + ")";
                     registerCourseVo.setCourseNameStore(storeAndCourse);
-//                registerCourseVo.setCourseTime(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
-                    // 2.0
                     registerCourseVo.setCourseTime(new SimpleDateFormat("yyyy-MM-dd").format(tCoursePackagePayment.getInsertTime()));
                     Coach coach = coachClient.queryCoachById(coursePackage.getCoachId());
                     registerCourseVo.setCourseTeacher(ToolUtil.isEmpty(coach) ? "" : coach.getName());
@@ -553,6 +528,9 @@
     @Autowired
     private TCoursePackageService coursePackageService;
 
+    @Autowired
+    private ALiSendSms aLiSendSms;
+
 
 
 
@@ -572,7 +550,7 @@
 
 
         response.setChooseHours(coursePackageOrder.getClassHours());
-        response.setStuIds(coursePackageOrder.getStudentIds().split(","));
+        response.setStuIds(coursePackageOrder.getStudentIds().split(";"));
         response.setPayType(coursePackageOrder.getPayType());
         response.setPayPrice(coursePackageOrder.getCashPayment());
         response.setCoinPrice(coursePackageOrder.getPlayPaiCoin());
@@ -820,36 +798,37 @@
     }
 
     @Override
-    public ResultUtil ContinuationOrpaymentCourse(Integer ids, ClasspaymentRequest request) {
-        AppUser userIdFormRedis = appuClient.queryAppUser(ids);
-        TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(request.getCoursePayId());
+    public ResultUtil ContinuationOrpaymentCourse(Integer userId, ClasspaymentRequest request) {
+        System.err.println("请求参数"+request);
+        AppUser appUser = appuClient.queryAppUser(userId);
+        CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(request.getCoursePayId());
+        System.err.println("上次支付记录"+coursePackageOrder);
         String code = "";
-        BigDecimal money = tCoursePackagePayment.getCashPayment();
-        Integer wpGold = tCoursePackagePayment.getPlayPaiCoin();
-        if (tCoursePackagePayment.getPayStatus() == 1) {
-//            待支付的订单
-            code = tCoursePackagePayment.getCode();
-            tCoursePackagePayment.setPayType(request.getPayType());
+        BigDecimal money = BigDecimal.valueOf(request.getCash());
+        Integer wpGold = request.getPlayPaiCoin();
+        if (coursePackageOrder.getPayStatus() == 1) {
+            code = coursePackageOrder.getCode();
+            coursePackageOrder.setPayType(request.getPayType());
             if (request.getUseConpon() == 1) {
-                tCoursePackagePayment.setUserCouponId(Long.valueOf(request.getUseConpon()));
+                coursePackageOrder.setUserCouponId(Long.valueOf(request.getUseConpon()));
             }
-            this.baseMapper.updateById(tCoursePackagePayment);
+            coursePackageOrder.setAppUserId(null);
+            coursePackageOrderService.updateById(coursePackageOrder);
         } else {
-//            续课的订单
-//            查询是否续课优惠
-
             CoursePackagePaymentConfig paymentConfig = cpConfigMapper.selectOne(new QueryWrapper<CoursePackagePaymentConfig>()
                     .eq("coursePackageId", request.getLessonId())
                     .eq("classHours", request.getCourseHoursNum()));
+            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);
             if (ToolUtil.isNotEmpty(coursePackageDiscount)) {
                 String content = coursePackageDiscount.getContent();
                 JSONObject jsonObject = JSON.parseObject(content);
-                if (userIdFormRedis.getIsVip() == 1) {
+                if (appUser.getIsVip() == 1) {
                     Double jsonObjectDouble = jsonObject.getDouble("num1");
                     money = BigDecimal.valueOf(jsonObjectDouble);
                 } else {
@@ -857,55 +836,64 @@
                     money = BigDecimal.valueOf(jsonObjectDouble);
                 }
             }
-            TCoursePackagePayment newPayment = new TCoursePackagePayment();
+            CoursePackageOrder newPayment = new CoursePackageOrder();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
             newPayment.setCode(sdf.format(new Date()) + UUIDUtil.getNumberRandom(5));
-            newPayment.setAppUserId(userIdFormRedis.getId());
-            newPayment.setStudentId(request.getStuId());
+            newPayment.setAppUserId(appUser.getId());
+            newPayment.setStudentIds(request.getStuId().toString());
             newPayment.setCoursePackageId(request.getLessonId());
-            newPayment.setClassHours(tCoursePackagePayment.getClassHours());
-            newPayment.setOriginalPrice(tCoursePackagePayment.getOriginalPrice());
-            newPayment.setTotalClassHours(tCoursePackagePayment.getTotalClassHours());
-            newPayment.setLaveClassHours(tCoursePackagePayment.getTotalClassHours());
+            newPayment.setClassHours(request.getCourseHoursNum());
+            newPayment.setOriginalPrice(coursePackageOrder.getOriginalPrice());
             if (request.getUseConpon() == 1) {
                 newPayment.setUserCouponId(Long.valueOf(request.getUseConpon()));
             }
-            newPayment.setAbsencesNumber(0);
             newPayment.setPayUserType(1);
             newPayment.setPayStatus(1);
             newPayment.setStatus(1);
             newPayment.setPayType(request.getPayType());
             newPayment.setState(1);
             newPayment.setInsertTime(new Date());
-            this.baseMapper.insert(newPayment);
+            if (request.getCash()!=null && request.getCash()!=0){
+                newPayment.setCashPayment(BigDecimal.valueOf(request.getCash()));
+            }
+            newPayment.setPlayPaiCoin(request.getPlayPaiCoin());
+            newPayment.setOrderType(1);
+            newPayment.setUserCouponId(request.getConponId());
+            coursePackageOrderService.save(newPayment);
             code = newPayment.getCode();
         }
+        System.err.println("选择");
         switch (request.getPayType()) {
             case 1:
                 if (request.getUseConpon() == 1) {
-                    Coupon coupon = client.queryCouponById(request.getConponId());
-                    if (coupon.getType() == 1) {
-                        Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
-                        Double conditionalAmount = (Double) couponRules.get("conditionalAmount");
-                        Double deductionAmount = (Double) couponRules.get("deductionAmount");
-                        if (money.compareTo(BigDecimal.valueOf(conditionalAmount)) >= 0) {
-                            money = BigDecimal.valueOf(deductionAmount);
-                        }
-                    }
-                    if (coupon.getType() == 2) {
-                        Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
-                        Object amount = couponRules.get("deductionAmount");
-                        money = BigDecimal.valueOf((Double) amount);
-                    }
+                    Integer coupon1 = client.queryUserCouponById(request.getConponId());
+                    System.err.println("优惠券id"+coupon1);
+                    Coupon coupon = client.queryCouponById(coupon1);
+                    System.err.println("优惠券信息"+coupon);
+//                    if (coupon.getType() == 1) {
+//                        Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
+//                        Double conditionalAmount = (Double) couponRules.get("conditionalAmount");
+//                        Double deductionAmount = (Double) couponRules.get("deductionAmount");
+//                        if (money.compareTo(BigDecimal.valueOf(conditionalAmount)) >= 0) {
+//                            money = BigDecimal.valueOf(deductionAmount);
+//                        }
+//                    }
+//                    if (coupon.getType() == 2) {
+//                        Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
+//                        System.err.println("优惠券规则"+couponRules);
+//                        Object amount = couponRules.get("conditionalAmount");
+//                        money = BigDecimal.valueOf((Double) amount);
+//                    }
                 }
                 try {
-                    return WeChatPayment(code, money);
+                    return WeChatPayment(code, money,request.getLessonId());
                 } catch (Exception e) {
                     return ResultUtil.runErr();
                 }
             case 2:
                 if (request.getUseConpon() == 1) {
-                    Coupon coupon = client.queryCouponById(request.getConponId());
+                    Integer coupon1 = client.queryUserCouponById(request.getConponId());
+                    Coupon coupon = client.queryCouponById(coupon1);
                     if (coupon.getType() == 1) {
                         Map<String, Object> couponRules = client.getCouponRules(coupon.getId());
                         Double conditionalAmount = (Double) couponRules.get("conditionalAmount");
@@ -920,9 +908,11 @@
                         money = BigDecimal.valueOf((Double) amount);
                     }
                 }
+
                 return AlipayPayment(code, money);
             case 3:
-                PlaypaiGoldPayment(userIdFormRedis, code, wpGold);
+                System.err.println("选择");
+                PlaypaiGoldPayment(appUser, code, wpGold);
                 break;
             default:
                 break;
@@ -930,134 +920,212 @@
         return ResultUtil.success();
     }
 
-
-    public ResultUtil WeChatPayment(String code, BigDecimal request) throws Exception {
-        TCoursePackagePaymentMapper baseMapper1 = this.baseMapper;
-        ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, request.toString(),
+    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);
+        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", "");
-        if (weixinpay.getCode() == 200) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        int num = 1;
-                        int wait = 0;
-                        while (num <= 10) {
-                            int min = 5000;
-                            wait += (min * num);
-                            Thread.sleep(wait);
-                            TCoursePackagePayment coursePackagePayment = baseMapper1.getCoursePackagePaymentByCode(code);
-                            if (coursePackagePayment.getPayStatus() == 2) {
-                                break;
-                            }
-                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
-                            if (resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1) {
-                                /**
-                                 * SUCCESS—支付成功,
-                                 * REFUND—转入退款,
-                                 * NOTPAY—未支付,
-                                 * CLOSED—已关闭,
-                                 * REVOKED—已撤销(刷卡支付),
-                                 * USERPAYING--用户支付中,
-                                 * PAYERROR--支付失败(其他原因,如银行返回失败)
-                                 */
-                                Map<String, String> data1 = resultUtil.getData();
-                                String s = data1.get("trade_state");
-                                String transaction_id = data1.get("transaction_id");
-                                if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
-                                    coursePackagePayment.setState(3);
-                                    baseMapper1.deleteById(coursePackagePayment.getId());
-                                    break;
-                                }
-                                if ("SUCCESS".equals(s)) {
-                                    coursePackagePayment.setPayStatus(2);
-                                    coursePackagePayment.setOrderNumber(transaction_id);
-                                    baseMapper1.updateById(coursePackagePayment);
-                                    break;
-                                }
-                                if ("USERPAYING".equals(s)) {
-                                    num++;
-                                }
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }).start();
+            return weixinpay;
+        }else{
+            String s = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
+            System.err.println("微信商户号"+s);
+            if(!StringUtils.hasLength(s)){
+                return ResultUtil.error("运营商未配置微信商户号,获取支付失败!");
+            }
+            return payMoneyUtil.weixinpayV3(s,"课包续费",code,
+                    "/base/coursePackage/wechatRegisteredCoursesCallback1",request.toString(),"");
         }
-        return weixinpay;
     }
+    private String smid = "2088330203191220";//平台支付宝商户号
 
-
+//    public static void main(String[] args) {
+//        BigDecimal bigDecimal = new BigDecimal("100");
+//
+//
+//        String s = "1";
+//        double v = Double.parseDouble(s);
+//        double v1 = v * 0.01;
+//
+//        BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(v1));
+//        BigDecimal multiply = bigDecimal1.multiply(bigDecimal);
+//        System.err.println(v);
+//        System.err.println(v1);
+//        System.err.println(multiply);
+//    }
     public ResultUtil AlipayPayment(String code, BigDecimal request) {
+        // 二级商户商户号
+        String smidUser;
         TCoursePackagePaymentMapper baseMapper1 = this.baseMapper;
-        ResultUtil alipay = payMoneyUtil.alipay("课包购买", "课包购买", "", code, request.toString(),
-                "/base/coursePackage/alipayRegisteredCoursesCallback");
-        if (alipay.getCode() == 200) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        int num = 1;
-                        int wait = 0;
-                        while (num <= 10) {
-                            int min = 5000;
-                            wait += (min * num);
-                            Thread.sleep(wait);
-                            TCoursePackagePayment coursePackagePayment = baseMapper1.getCoursePackagePaymentByCode(code);
-                            if (coursePackagePayment.getPayStatus() == 2) {
-                                break;
-                            }
-                            AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(code);
-
-                            if (coursePackagePayment.getPayStatus() == 1) {
-                                /**
-                                 * WAIT_BUYER_PAY(交易创建,等待买家付款)、
-                                 * TRADE_CLOSED(未付款交易超时关闭,或支付完成后全额退款)、
-                                 * TRADE_SUCCESS(交易支付成功)、
-                                 * TRADE_FINISHED(交易结束,不可退款)
-                                 */
-//                                Map<String, String> data1 = resultUtil.getData();
-                                String s = alipayTradeQueryResponse.getTradeStatus();
-                                String tradeNo = alipayTradeQueryResponse.getTradeNo();
-                                if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
-                                    coursePackagePayment.setState(3);
-                                    baseMapper1.deleteById(coursePackagePayment.getId());
-                                    break;
-                                }
-                                if ("TRADE_SUCCESS".equals(s)) {
-                                    coursePackagePayment.setPayStatus(2);
-                                    coursePackagePayment.setOrderNumber(tradeNo);
-                                    baseMapper1.updateById(coursePackagePayment);
-                                    break;
-                                }
-                                if ("WAIT_BUYER_PAY".equals(s)) {
-                                    num++;
-                                }
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }).start();
+        TCoursePackagePayment coursePackagePayment = baseMapper1.getCoursePackagePaymentByCode(code);
+        // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
+        Integer coursePackageId = coursePackagePayment.getCoursePackageId();
+        TCoursePackage byId = coursePackageService.getById(coursePackageId);
+        Store store = storeClient.queryStoreById(byId.getStoreId());
+        String smid1="";
+        if (store.getOperatorId() == null ){
+            smid1 = smid;
+        }else if (store.getOperatorId() == 0){
+            smid1 = smid;
+        }else{
+            smid1 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
         }
+        if (!StringUtils.hasLength(smid1)){
+            return ResultUtil.error("运营商未配置支付宝商户号,获取支付失败!");
+        }
+        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();
+//        }
         return alipay;
     }
 
+    private void extracted(Store store, CoursePackageOrder coursePackageOrder1, String tradeNo) throws Exception {
+        // 分账
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+                "2021004105665036",
+                "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==",
+                "json", "GBK",
+                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB",
+                "RSA2");
+        AlipayTradeOrderSettleRequest request = new AlipayTradeOrderSettleRequest();
+        String randomCode = UUIDUtil.getRandomCode(16);
+        String proportionByOperatorId = storeClient.getProportionByOperatorId(store.getOperatorId());
+        // 支付宝分账比例
+        String s1 = proportionByOperatorId.split(",")[1];
+        double i = Double.parseDouble(s1);
+        double v = i * 0.01;
+        BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(v));
+        BigDecimal cashPayment = coursePackageOrder1.getCashPayment();
+        // 分账金额
+        BigDecimal bigDecimal2 = cashPayment.multiply(bigDecimal1).setScale(2, RoundingMode.DOWN);
+        request.setBizContent("{" +
+                "  \"out_request_no\":\"" + randomCode + "\"," +
+                "  \"trade_no\":\"" + tradeNo + "\"," +
+                "  \"royalty_parameters\":[" +
+                "    {" +
+                "      \"royalty_type\":\"transfer\"," +
+                "      \"trans_out\":\"" + storeClient.getSMIDByOperatorId(store.getOperatorId()) + "\"," +
+                "      \"trans_out_type\":\"userId\"," +
+                "      \"trans_in_type\":\"userId\"," +
+                "      \"trans_in\":\"" + smid + "\"," +
+                "      \"amount\":" + bigDecimal2 + "," +
+                "      \"desc\":\"平台服务费\"," +
+                "      \"royalty_scene\":\"平台服务费\"," +
+                "    }" +
+                "  ]," +
+                "  \"extend_params\":{" +
+                "    \"royalty_finish\":\"true\"" +
+                "  }," +
+                "  \"royalty_mode\":\"async\"" +
+                "}");
+        AlipayTradeOrderSettleResponse response = alipayClient.execute(request);
+        if (response.isSuccess()) {
+            System.out.println("调用成功");
+        } else {
+            System.out.println("调用失败");
+        }
+    }
+
     public ResultUtil PlaypaiGoldPayment(AppUser appUser, String code, Integer wpGold) {
-        TCoursePackagePayment packagePayment = this.baseMapper.selectOne(new QueryWrapper<TCoursePackagePayment>()
+        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);
         if (appUser.getPlayPaiCoins() < wpGold) {
-            return ResultUtil.error("玩牌币不足!");
+            return ResultUtil.error("玩湃币不足!");
         }
         packagePayment.setPayStatus(2);
         packagePayment.setPayUserId(appUser.getId());
         packagePayment.setPlayPaiCoin(wpGold);
-        this.baseMapper.updateById(packagePayment);
+        System.err.println("扣去玩湃币");
+        try {
+            System.err.println("修改");
+            boolean b = coursePackageOrderService.updateById(packagePayment);
 
+        }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);
+
         appuClient.updateAppUser(appUser);
         return ResultUtil.success();
     }
@@ -1080,17 +1148,8 @@
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd");
         SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
         if (tCoursePackagePayments.size() > 0) {
-
-//            int pageNum = 1; // 页码
             int pageSize = 10; // 每页记录数
             Page<CoursePackageStudent> page = new Page<>(pageNum, pageSize);
-
-//            for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
-//                List<CoursePackageStudent> coursePackageStudent1 = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
-//                        .in("coursePackageId",ids)
-//                        .eq("studentId",stuId)
-//                        .eq("appUserId",appUserId)
-//                        .eq("reservationStatus",1));
             IPage<CoursePackageStudent> coursePackageStudentPage = cpsMapper.selectPage(page, new QueryWrapper<CoursePackageStudent>()
                     .in("coursePackageId", ids)
                     .eq("studentId", stuId)
@@ -1127,19 +1186,8 @@
                         }
                     }
 
-//                        recordVo.setCourseHours(tCoursePackagePayment.getClassHours());
-                    Date date = DateUtil.getDate();
-
-
                     CoursePackageScheduling byId = coursePackageSchedulingService.getById(coursePackageStudent.getCoursePackageSchedulingId());
-//                        String classStartTime = coursePackage.getClassStartTime();
-//                        String classEndTime = coursePackage.getClassEndTime();
                     //这里是过滤今天之后的数据
-
-//                        if (byId == null||byId.getClassDate().after(new Date())){
-//                            continue;
-//                        }
-
                     if (byId == null) {
                         continue;
                     }
@@ -1149,8 +1197,6 @@
 
 
                     recordVo.setTimeFrame(dateString1 + "-" + dateString2.substring(11));
-
-//                        recordVo.setTimeFrame(simpleDateFormat.format(date)+" "+classStartTime+"-"+classEndTime);
                     Store store = stoClient.queryStoreById(coursePackage.getStoreId());
                     recordVo.setStoreNameAddr(store.getName() + store.getAddress());
                     recordVo.setCourseStuRecordId(coursePackageStudent.getId());
@@ -1177,12 +1223,7 @@
                             //待上课
                             recordVo.setStatus(1);
                         }
-//                            else if(coursePackageStudent.getSignInOrNot()==2){
-//                                recordVo.setStatus(5);
-//                            }
                         else {
-//                                CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
-//                                        .eq("coursePackageId",coursePackageStudent.getCoursePackageId()));
                             CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
                                     .eq("coursePackageSchedulingId", byId.getId()).last("limit 1"));
                             if (ToolUtil.isNotEmpty(cancelledClasses)) {
@@ -1213,13 +1254,11 @@
             }
 
         }
-//        }
-
         return recordVoList;
     }
 
     public List<Integer> getIds(Integer siteId) {
-        HttpRequest httpRequest = HttpRequest.get("https://try.daowepark.com/v7/user_api/general/get_space_area?space_id=" + siteId);
+        HttpRequest httpRequest = HttpRequest.get("https://port.daowepark.com/v7/user_api/general/get_space_area?space_id=" + siteId);
         HttpResponse execute = httpRequest.execute();
         String body = execute.body();
         JSONObject jsonObject = JSONObject.parseObject(body);
@@ -1237,14 +1276,27 @@
     }
 
     @Override
-    public ResultUtil insertVipPaymentCallback(String code, String orderNumber) {
-        TCoursePackagePayment coursePackagePayment = this.baseMapper.getCoursePackagePaymentByCode(code);
-        if (coursePackagePayment.getPayStatus() != 1) {
+    public ResultUtil insertVipPaymentCallback(String code, String orderNumber) throws Exception {
+        CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
+                .eq("code", code).eq("state", 1));
+        if (coursePackageOrder1.getPayStatus() == 2) {
             return ResultUtil.success();
         }
-        coursePackagePayment.setPayStatus(2);
-        coursePackagePayment.setOrderNumber(orderNumber);
-        this.baseMapper.updateById(coursePackagePayment);
+        coursePackageOrder1.setPayStatus(2);
+        coursePackageOrder1.setOrderNumber(orderNumber);
+        coursePackageOrder1.setAppUserId(null);
+        coursePackageOrderService.updateById(coursePackageOrder1);
+
+        CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
+                .eq("coursePackageId", coursePackageOrder1.getCoursePackageId())
+                .eq("classHours", coursePackageOrder1.getClassHours())
+        );
+        coursePackageService.addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
+        TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
+        Integer storeId = byId.getStoreId();
+        Store store = storeClient.queryStoreById(storeId);
+
+
         return ResultUtil.success();
     }
 
@@ -1477,9 +1529,6 @@
     @Autowired
     private TCoursePackageService packageService;
 
-
-    @Autowired
-    private TCoursePackagePaymentService packagePaymentService;
     @Autowired
     private CoursePackageStudentService coursePackageStudentService;
 
@@ -1570,6 +1619,12 @@
 
         coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() - req.getNum());
         coursePackageOrderStudentService.updateById(coursePackageOrderStudent);
+        Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
+        if(3 >= laveClassHours){
+            AppUser appUser = appuClient.queryAppUser(coursePackageOrderStudent.getAppUserId());
+            //发送短信提醒
+            aLiSendSms.sendSms(appUser.getPhone(), "SMS_463646317", "");
+        }
 
 
         CourseCounsum courseCounsum = new CourseCounsum();

--
Gitblit v1.7.1