zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

培训班

Browse Source
This commit is contained in:
wuchunlei
2025-04-16 16:39:34 +08:00
parent c6b7699e84
commit d1746c678f
11 changed files with 166 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
View File

@@ -10,13 +10,14 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.CopyUtils;
import com.peanut.common.utils.OrderUtils;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.modules.book.service.BookBuyConfigService;
import com.peanut.modules.book.service.BuyOrderService;
import com.peanut.modules.book.service.MyUserService;
import com.peanut.modules.book.service.TransactionDetailsService;
import com.peanut.modules.common.dao.*;
import com.peanut.modules.book.service.*;
import com.peanut.modules.common.entity.*;
import com.peanut.modules.common.service.CouponHistoryService;
import com.peanut.modules.common.service.CouponService;
import com.peanut.modules.common.service.OfflineActivityToUserService;
import com.peanut.modules.common.service.UserVipService;
import com.peanut.modules.common.service.*;
import com.peanut.modules.master.service.UserCourseBuyService;
import com.peanut.modules.pay.alipay.config.AliPayConfig;
import com.peanut.modules.pay.alipay.config.AliPayUtil;
@@ -76,7 +77,7 @@ public class AliPayServiceImpl implements AliPayService {
@Autowired
private CouponHistoryService couponHistoryService;
@Autowired
private OfflineActivityToUserService offlineActivityToUserService;
private TrainingClassService trainingClassService;
@Override
public String pay(AlipayDTO payDto) {
@@ -169,15 +170,11 @@ public class AliPayServiceImpl implements AliPayService {
couponService.useCouponAmount(couponHistory);
}
if("offlineActivity".equals(subject)){
if("trainingClass".equals(subject)){
//更新 订单 记录
buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2");
//插入活动人员关联
OfflineActivityToUser offlineActivityToUser = new OfflineActivityToUser();
offlineActivityToUser.setActivityId(order.getOfflineActivityId());
offlineActivityToUser.setOrderId(order.getOrderId());
offlineActivityToUser.setUserId(ShiroUtils.getUId());
offlineActivityToUserService.save(offlineActivityToUser);
//插入培训班
trainingClassService.addTrainingClassForUser(order);
}
if("relearn".equals(subject)){

21
src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
View File

@@ -8,13 +8,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.modules.book.service.BookBuyConfigService;
import com.peanut.modules.book.service.BuyOrderService;
import com.peanut.modules.book.service.MyUserService;
import com.peanut.modules.book.service.TransactionDetailsService;
import com.peanut.modules.common.dao.*;
import com.peanut.modules.book.service.*;
import com.peanut.modules.common.entity.*;
import com.peanut.modules.common.service.CouponHistoryService;
import com.peanut.modules.common.service.CouponService;
import com.peanut.modules.common.service.OfflineActivityToUserService;
import com.peanut.modules.common.service.UserVipService;
import com.peanut.modules.common.service.*;
import com.peanut.modules.master.service.UserCourseBuyService;
import com.peanut.modules.pay.refund.entity.PayRefundOrder;
import com.peanut.modules.pay.refund.service.PayRefundOrderService;
@@ -83,7 +84,7 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
@Autowired
private CouponHistoryService couponHistoryService;
@Autowired
private OfflineActivityToUserService offlineActivityToUserService;
private TrainingClassService trainingClassService;
@Override
public void prepay(WechatPaymentInfo paymentInfo){
@@ -157,15 +158,11 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
couponService.useCouponAmount(couponHistory);
}
if("offlineActivity".equals(order.getOrderType())){
if("trainingClass".equals(order.getOrderType())){
//更新 订单 记录
buyOrderService.updateOrderStatus(order.getUserId(),orderNo,"2");
//插入活动人员关联
OfflineActivityToUser offlineActivityToUser = new OfflineActivityToUser();
offlineActivityToUser.setActivityId(order.getOfflineActivityId());
offlineActivityToUser.setOrderId(order.getOrderId());
offlineActivityToUser.setUserId(ShiroUtils.getUId());
offlineActivityToUserService.save(offlineActivityToUser);
//插入培训班
trainingClassService.addTrainingClassForUser(order);
}
if("relearn".equals(order.getOrderType())){
//处理抵扣积分