From d47bf3e1e3bf56b60ea6a1649ddd618d5ae803f1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 十二月 2025 09:13:14 +0800
Subject: [PATCH] bug修改
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 334 ++++++++++++++++++++++++++++---------------------------
1 files changed, 171 insertions(+), 163 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 1d0b910..0c69ce0 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -36,8 +36,10 @@
import com.dsh.course.model.*;
import com.dsh.course.service.*;
import com.dsh.course.util.*;
+import com.dsh.course.util.wx.WxV3PayConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -143,12 +145,6 @@
@Override
public List<CoursePackageListVo> queryCourseList(Integer uid, CoursePackageList coursePackageList) throws Exception {
AppUser appUser = appUserClient.queryAppUser(uid);
-// Map<String, String> geocode = gdMapGeocodingUtil.geocode(coursePackageList.getLon(), coursePackageList.getLat());
-// String provinceCode = geocode.get("provinceCode");
-// String cityCode = geocode.get("cityCode");
-// QueryWrapper<TCoursePackage> wrapper = new QueryWrapper<TCoursePackage>().in("status", Arrays.asList(1, 2))
-// .eq("auditStatus", 2).eq("state", 1).eq("provinceCode", provinceCode).eq("cityCode", cityCode);
-
QueryWrapper<TCoursePackage> wrapper = new QueryWrapper<TCoursePackage>().in("status", Arrays.asList(1, 2))
.eq("auditStatus", 2).eq("state", 1);
if (null != coursePackageList.getCoursePackageTypeId()) {
@@ -171,7 +167,6 @@
List<TCoursePackage> list1 = this.list(wrapper.last(" order by sort desc, insertTime desc"));
Date currentTime = new Date();
-// Filter the list based on the conditions
List<TCoursePackage> list = list1.stream()
.filter(coursePackage -> coursePackage.getType() != 2 || currentTime.before(coursePackage.getEndTime()))
.collect(Collectors.toList());
@@ -188,7 +183,6 @@
coursePackageListVo.setStoreName(null != store ? store.getName() : "");
coursePackageListVo.setCoverDrawing(coursePackage.getCoverDrawing());
- // 2.0修改
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
ArrayList<String> classTime = new ArrayList<>();
@@ -311,35 +305,8 @@
}
coursePackageListVo.setPaymentPrice(paymentPrice);
- double vipPrice1 = coursePackageListVo.getVipPrice();
- double originalPrice1 = coursePackageListVo.getOriginalPrice();
- double paymentPrice1 = coursePackageListVo.getPaymentPrice();
-
-// double minPrice = Math.min(vipPrice1, Math.min(originalPrice1, paymentPrice1));
-// double maxPrice = Math.max(vipPrice1, Math.max(originalPrice1, paymentPrice1));
-// coursePackageListVo.setPaymentPrice(minPrice);
-// coursePackageListVo.setOriginalPrice(maxPrice);
-// System.out.println("Minimum price: " + minPrice);
-
-
-// }
-// else{
-// List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
-// .eq("type", 1).eq("auditStatus", 2).eq("status",1));
-// Double vipPrice = coursePackagePaymentConfig.getCashPayment();
-// for (TCoursePackageDiscount coursePackageDiscount : list2) {
-// Double num1 = JSON.parseObject(coursePackageDiscount.getContent()).getDouble("discountMember");
-// if(vipPrice.compareTo(num1) > 0){
-// vipPrice = num1;
-// }
-// }
-// coursePackageListVo.setPaymentPrice(vipPrice);
-// coursePackageListVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
-// }
-
if (coursePackageListVo.getPaymentPrice() < coursePackageListVo.getVipPrice()) {
coursePackageListVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
-// coursePackageListVo.setVipPrice(null);
}
if (appUser.getIsVip() == 1) {
@@ -445,7 +412,6 @@
coursePackageListVo.setPayType(2);
}
- // 2.0修改
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
ArrayList<String> classTime = new ArrayList<>();
@@ -916,6 +882,7 @@
}
+ System.err.println("课程报名！！！");
if (paymentCourseVo.getPayType() == 1) {//微信支付
return weChatPaymentCourse(uid, price, paymentCourseVo);
}
@@ -955,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());
@@ -966,6 +934,7 @@
coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
+ coursePackageOrder.setOrderType(1);
coursePackageOrderService.save(coursePackageOrder);
orderId = coursePackageOrder.getId();
}else{
@@ -975,73 +944,35 @@
coursePackageOrder.setAppUserId(null);
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
+
coursePackageOrderService.updateById(coursePackageOrder);
}
+ TCoursePackage byId = coursePackageService.getById(paymentCourseVo.getId());
+ Integer storeId = byId.getStoreId();
+ Store store = storeClient.queryStoreById(storeId);
- ResultUtil weixinpay = payMoneyUtil.weixinpay("购买课程", coursePackagePaymentConfig.getId().toString(), code, paymentPrice.toString(), "/base/course/weChatPaymentCourseCallback", "APP", "");
- if (weixinpay.getCode() == 200) {
- String finalCode = code;
- 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);
- CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
- .eq("code", finalCode).eq("state", 1));
- if (coursePackageOrder1.getPayStatus() == 2) {
- break;
- }
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(finalCode, "");
- if (resultUtil.getCode() == 200 && coursePackageOrder1.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) {
- //有待支付的订单，这里不处理
-// coursePackageOrder1.setState(3);
-// coursePackageOrderService.updateById(coursePackageOrder1);
- break;
- }
- if ("SUCCESS".equals(s)) {
- coursePackageOrder1.setPayStatus(2);
- coursePackageOrder1.setOrderNumber(transaction_id);
- coursePackageOrder1.setAppUserId(null);
- coursePackageOrderService.updateById(coursePackageOrder1);
- //修改课时有效期
-
-
- addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
- break;
- }
- if ("USERPAYING".equals(s)) {
- num++;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
+ if (store.getOperatorId()==null || store.getOperatorId()==0){
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("报名运动营", "", code, paymentPrice.toString(),
+ "/base/course/weChatPaymentCourseCallback", "APP", "");
+ 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/course/weChatPaymentCourseCallback1",paymentPrice.toString(),"");
}
- return weixinpay;
+
+// return payMoneyUtil.weixinpayV3(WxV3PayConfig.smidVx,"报名运动营",code,
+// "/base/course/weChatPaymentCourseCallback1",Long.valueOf(paymentPrice.toString()),
+// coursePackagePaymentConfig.getId()+"");
}
private String smid = "2088330203191220";//平台支付宝商户号
+ private String smidVx = "2088330203191220";//平台微信商户号
/**
* 课程支付宝支付
*
@@ -1061,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());
@@ -1074,6 +1007,7 @@
coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
+ coursePackageOrder.setOrderType(1);
coursePackageOrderService.save(coursePackageOrder);
}else {
CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(paymentCourseVo.getOrderId());
@@ -1082,22 +1016,33 @@
coursePackageOrder.setAppUserId(null);
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
+
coursePackageOrderService.updateById(coursePackageOrder);
}
// 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
Integer coursePackageId = paymentCourseVo.getId();
TCoursePackage byId = coursePackageService.getById(coursePackageId);
Store store = storeClient.queryStoreById(byId.getStoreId());
- if (store.getOperatorId() == null ){
+ if (store.getOperatorId() == null){
smid1 = smid;
}else{
- smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
+ if (store.getOperatorId()==0){
+ smid1 = smid;
+ }else{
+ smid1 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
+ }
}
- ResultUtil alipay = payMoneyUtil.alipay(smid1,"购买课程", "购买课程",
+ if (!StringUtils.hasLength(smid1)){
+ return ResultUtil.error("运营商未配置支付宝商户号，获取支付失败!");
+ }
+ ResultUtil alipay = payMoneyUtil.alipay(smid1,"报名运动营", "报名运动营",
coursePackagePaymentConfig.getId().toString(),
code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
if (alipay.getCode() == 200) {
String finalCode = code;
+ String finalSmid = smid1;
+ String finalCode1 = code;
new Thread(new Runnable() {
@Override
public void run() {
@@ -1137,24 +1082,8 @@
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
- moneyOut(tradeNo,tradeNo,finalCode);
- // 根据课程id 查询这个课程属于哪个门店 属于哪个运营商
- Integer id = paymentCourseVo.getId();
- TCoursePackage byId = coursePackageService.getById(id);
- Integer storeId = byId.getStoreId();
- Store store = storeClient.queryStoreById(storeId);
- Integer operatorId = store.getOperatorId();
- if (operatorId==null){
- String smid ="2088330203191220";
- // 说明是平台的
- payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
- break;
- }else{
- // 当前课程不属于门店 查询这个课程属于哪个门店 属于哪个运营商
- String smidByOperatorId = storeClient.getSMIDByOperatorId(operatorId);
- payMoneyUtil.confirm(smidByOperatorId,finalCode,tradeNo,paymentPrice.toString());
- break;
- }
+ Thread.sleep(30000);
+ payMoneyUtil.confirm(finalSmid, finalCode1, tradeNo, paymentPrice.toString());
}
if ("WAIT_BUYER_PAY".equals(s)) {
num++;
@@ -1170,7 +1099,52 @@
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 void moneyOut(String outNum, String tradeNo,String code) throws AlipayApiException {
AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
@@ -1272,12 +1246,14 @@
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());
coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
+ coursePackageOrder.setOrderType(1);
coursePackageOrderService.save(coursePackageOrder);
orderId = coursePackageOrder.getId();
}else{
@@ -1303,20 +1279,31 @@
* @return
*/
@Override
- public ResultUtil paymentCourseCallback(String code, String trade_no, String attach) throws AlipayApiException {
+ 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 (coursePackageOrder1.getPayStatus() == 2) {
+ if (null == coursePackageOrder1 || coursePackageOrder1.getPayStatus() == 2) {
return ResultUtil.success();
}
coursePackageOrder1.setPayStatus(2);
coursePackageOrder1.setOrderNumber(trade_no);
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
-
+ TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
+ // 将用户优惠券修改为已使用
+ Long userCouponId = coursePackageOrder1.getUserCouponId();
+ if (userCouponId!=null){
+ userCouponClient.updateUserCouponStatus(userCouponId,coursePackage.getStoreId(),coursePackage.getSiteId());
+ }
CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(attach);
addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
- moneyOut(trade_no,trade_no,code);
+// TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
+// Store store = storeClient.queryStoreById(byId.getStoreId());
+// moneyOut(trade_no,trade_no,code);
return ResultUtil.success();
}
@@ -1324,10 +1311,16 @@
/**
* 支付成功后添加学员课时数据
*
- * @param coursePackagePaymentConfig
*/
- public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfig) {
+ @Override
+ 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()));
@@ -1341,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));
@@ -1361,19 +1355,22 @@
coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
//更新学员课时有效期
+ boolean b = true;
if(null == student.getValidity()){
student.setValidity(calendar.getTime());
addOldPackageStudent(student);
+ b = false;
}else if(calendar.getTimeInMillis() > student.getValidity().getTime()){
student.setValidity(calendar.getTime());
addOldPackageStudent(student);
+ b = false;
}
studentClient.frozen(student);
//开始排课
- addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
-
-
+ if(b){
+ addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
+ }
//课时记录
CourseCounsum courseCounsum = new CourseCounsum();
@@ -1381,7 +1378,7 @@
courseCounsum.setChangeType(1);
courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
courseCounsum.setInsertTime(new Date());
- courseCounsum.setReason("购买课包");
+ courseCounsum.setReason("报名运动营");
courseCounsumService.save(courseCounsum);
//账单记录
if(coursePackageOrder.getPayType() != 3){
@@ -1393,9 +1390,8 @@
courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
courseCounsumService.save(courseCounsum1);
}
-
-
} else {
+ System.err.println("更新");
Date useTime = coursePackageOrderStudent.getUseTime();
coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours());
coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + coursePackagePaymentConfig.getClassHours());
@@ -1408,20 +1404,26 @@
coursePackageOrderStudent.setUseTime(calendar.getTime());
coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
//更新学员课时有效期
+ boolean b = true;
if(null == student.getValidity()){
student.setValidity(calendar.getTime());
addOldPackageStudent(student);
+ b = false;
}else if(calendar.getTimeInMillis() > student.getValidity().getTime()){
student.setValidity(calendar.getTime());
addOldPackageStudent(student);
+ b = false;
}
studentClient.frozen(student);
//中间断课，没有连续续费的情况需要重新排课
- if (useTime.compareTo(new Date()) < 0) {
- addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
+// if (useTime.compareTo(new Date()) < 0 && b) {
+// addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
+// }
+ //开始排课
+ if(b){
+ addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
}
-
//课时记录
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
@@ -1440,15 +1442,10 @@
courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
courseCounsumService.save(courseCounsum1);
}
-
-
}
-
-
-
}
if(coursePackage.getType() == 2){
- addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), null, null);
+ addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), null, null);
}
}
}
@@ -1457,12 +1454,17 @@
/**
* 新购买课程后的排课
*
- * @param userId
* @param sId
* @throws ParseException
*/
- private void addPackageStudent(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent, Date validity) {
+ private void addPackageStudent(TCoursePackage tCoursePackage, CoursePackageOrder coursePackageOrder, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent, Date validity) {
try {
+ Integer userId = coursePackageOrder.getAppUserId();
+ //扣除课时数
+ Integer codeTime = tCoursePackage.getCodeTime();
+ Integer totalClassHours = coursePackageOrder.getClassHours();
+ // 排课次数
+ Integer schedulingNum= totalClassHours/codeTime;
//1常规 2假期 3体验
if (tCoursePackage.getType() == 1) {
//上课星期
@@ -1475,23 +1477,23 @@
.orderByDesc("classDate")
.last(" limit 0, 1")
);
- if(null != one){
- //先检测是否需要继续进行排课
- Calendar calendar1 = Calendar.getInstance();
- calendar1.setTime(one.getClassDate());
- int day_week1 = calendar1.get(Calendar.DAY_OF_WEEK);
- day_week1 = day_week1 - 1 == 0 ? 7 : day_week1 - 1;
- int week_of_month = calendar1.get(Calendar.WEEK_OF_MONTH);
-
- Calendar calendar2 = Calendar.getInstance();
- calendar2.setTime(new Date());
- int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);
-
- //最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
- if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
- return;
- }
- }
+// if(null != one){
+// //先检测是否需要继续进行排课
+// Calendar calendar1 = Calendar.getInstance();
+// calendar1.setTime(one.getClassDate());
+// int day_week1 = calendar1.get(Calendar.DAY_OF_WEEK);
+// day_week1 = day_week1 - 1 == 0 ? 7 : day_week1 - 1;
+// int week_of_month = calendar1.get(Calendar.WEEK_OF_MONTH);
+//
+// Calendar calendar2 = Calendar.getInstance();
+// calendar2.setTime(new Date());
+// int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);
+//
+// //最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
+// if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
+// return;
+// }
+// }
//上课时段
String[] split = tCoursePackage.getClassStartTime().split(",");
@@ -1501,11 +1503,14 @@
//剩余课时
Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
- //扣除课时数
- Integer codeTime = tCoursePackage.getCodeTime();
- //排课 本周+下周，课时不够扣则直接剩余不排课
+
+ //排课 课时不够扣则直接剩余不排课
Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
+ if (one!=null){
+ calendar.setTime(one.getClassDate());
+ }else{
+ calendar.setTime(new Date());
+ }
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
@@ -1514,7 +1519,7 @@
day_week = day_week - 1 == 0 ? 7 : day_week - 1;
int num = 8 - day_week + 7;
- for (int i = 0; i < num; i++) {
+ for (int i = 0; i < schedulingNum; i++) {
Date time = calendar.getTime();
//判断当天是否在排课星期内
@@ -1522,6 +1527,7 @@
day = day - 1 == 0 ? 7 : day - 1;
if (!week.contains(day)) {
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ schedulingNum--;
continue;
}
@@ -1542,6 +1548,8 @@
//有体验购课，不进行排课
if(count != 0){
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ schedulingNum--;
+
continue;
}
--
Gitblit v1.7.1