From 17b7d16e4f5998dfc60d133ea08712b0abc46f84 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 09:12:00 +0800
Subject: [PATCH] bug修改
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 248 +++++++++++++++---------------------------------
1 files changed, 79 insertions(+), 169 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 121df37..4c5e1c5 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
@@ -24,8 +24,10 @@
import com.dsh.course.feignclient.account.model.*;
import com.dsh.course.feignclient.activity.BenefitVideoClient;
import com.dsh.course.feignclient.activity.CouponClient;
+import com.dsh.course.feignclient.activity.UserCouponClient;
import com.dsh.course.feignclient.activity.model.BenefitsVideos;
import com.dsh.course.feignclient.activity.model.Coupon;
+import com.dsh.course.feignclient.activity.model.UserCoupon;
import com.dsh.course.feignclient.model.RecordAppoint;
import com.dsh.course.feignclient.other.StoreClient;
import com.dsh.course.feignclient.other.model.Store;
@@ -37,6 +39,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;
@@ -107,6 +110,8 @@
@Resource
private CouponClient client;
+ @Resource
+ private UserCouponClient userCouponClient;
@Resource
private PayMoneyUtil payMoneyUtil;
@@ -128,11 +133,6 @@
@Resource
private StudentHonorClient studentHonorClient;
-
-
-
-
-
@Override
@@ -167,20 +167,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());
@@ -189,12 +189,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());
@@ -209,7 +209,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);
@@ -245,7 +245,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);
@@ -531,14 +531,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);
@@ -598,7 +596,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;
@@ -639,7 +637,7 @@
response.setVipAmount(discountMember);
break;
case 2:
- if (playPaiCoin!=null) {
+ if (playPaiCoin != null) {
response.setWpGold(playPaiCoin);
}
break;
@@ -798,10 +796,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();
@@ -817,13 +815,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);
@@ -852,7 +850,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());
@@ -866,9 +864,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");
@@ -885,7 +883,7 @@
// }
}
try {
- return WeChatPayment(code, money,request.getLessonId());
+ return WeChatPayment(code, money, request.getLessonId());
} catch (Exception e) {
return ResultUtil.runErr();
}
@@ -919,93 +917,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);
- // 是否分账 0否1是
- int isFenZhang= 1;
- String merchantNumber = "";
- if (store.getOperatorId()==null || store.getOperatorId()==0){
- // 平台
- isFenZhang = 0;
+ 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 {
+ 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(), "");
}
- System.err.println("拉起支付");
- ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费"+"-"+isFenZhang, "", code, request.toString(),
- "/base/coursePackage/wechatRegisteredCoursesCallback", "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) || "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);
- //修改课时有效期
-
- CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
- .eq("coursePackageId", coursePackageOrder1.getId())
- .eq("classHours", coursePackageOrder1.getClassHours())
- );
- coursePackageService.addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
-
- break;
- }
- if ("USERPAYING".equals(s) || "NOTPAY".equals(s)) {
- num++;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }).start();
- }
- return weixinpay;
}
+
private String smid = "2088330203191220";//平台支付宝商户号
-// public static void main(String[] args) {
+ // public static void main(String[] args) {
// BigDecimal bigDecimal = new BigDecimal("100");
//
//
@@ -1028,18 +966,22 @@
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{
- smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
+ } else {
+ smid1 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
}
- ResultUtil alipay = payMoneyUtil.alipay(smid1,"课包购买", "课包购买", "", code, request.toString(),
+ 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;
+ String finalSmid = smid1;
new Thread(new Runnable() {
@Override
public void run() {
@@ -1077,23 +1019,8 @@
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);
- }
+ Thread.sleep(30000);
+ payMoneyUtil.confirm(finalSmid, code, tradeNo, request.toString());
break;
}
if ("WAIT_BUYER_PAY".equals(s)) {
@@ -1161,10 +1088,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("玩湃币不足！");
}
@@ -1176,9 +1103,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);
@@ -1279,8 +1206,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)) {
@@ -1343,7 +1269,11 @@
coursePackageOrder1.setOrderNumber(orderNumber);
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
+ TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
+ // 将用户优惠券修改为已使用
+ Long userCouponId = coursePackageOrder1.getUserCouponId();
+ userCouponClient.updateUserCouponStatus(userCouponId,coursePackage.getStoreId(),coursePackage.getSiteId());
CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
.eq("coursePackageId", coursePackageOrder1.getCoursePackageId())
.eq("classHours", coursePackageOrder1.getClassHours())
@@ -1353,27 +1283,7 @@
Integer storeId = byId.getStoreId();
Store store = storeClient.queryStoreById(storeId);
- if (store.getOperatorId()!=null && store.getOperatorId()!=0){
- // 休眠两分钟后再调用分账接口 避免提示订单正在处理中
- Thread.sleep(120000);
- // 根据运营商id获取对应运营商分账比例 返回格式: 微信分账比例,支付宝分账比例
- String proportionByOperatorId = storeClient.getProportionByOperatorId(store.getOperatorId());
- String[] split = proportionByOperatorId.split(",");
- String s1 = split[0];
- if (!s1.equals("未设置")){
- BigDecimal bigDecimal = new BigDecimal(s1);
- // 分账比例
- BigDecimal bigDecimal1 = bigDecimal.divide(new BigDecimal(100)).setScale(2);
- // 微信商户号
- String s2 = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
- String nonce_str = UUIDUtil.getRandomCode(16);
- ResultUtil fenzhang = payMoneyUtil.fenzhang(orderNumber, coursePackageOrder1.getCashPayment().multiply(bigDecimal1), s2,nonce_str);
- if (!fenzhang.getCode().equals(200)){
- System.err.println("分账失败 原因是:"+fenzhang.getData());
- }
- }
- }
return ResultUtil.success();
}
@@ -1413,22 +1323,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]);
}
@@ -1440,7 +1350,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);
@@ -1636,12 +1546,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;
@@ -1697,7 +1607,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", "");
--
Gitblit v1.7.1