学员活动购买

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -2308,21 +2308,21 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-    public void orderCallback(StudentPaymentOrder studentPaymentOrder) {
-        Integer userId = studentPaymentOrder.getUserId();
-        Integer tenantId = studentPaymentOrder.getTenantId();
-        StudentPaymentOrder order = studentPaymentOrderDao.lockOrder(studentPaymentOrder.getId());
+    public void orderCallback(StudentPaymentOrder order) {
+        Integer userId = order.getUserId();
+        Integer tenantId = order.getTenantId();
+        /*StudentPaymentOrder order = studentPaymentOrderDao.lockOrder(studentPaymentOrder.getId());
         if (!order.getStatus().equals(DealStatusEnum.ING)) {
             return;
-        }
+        }*/
         //更新订单状态
-        int updateCount = studentPaymentOrderService.update(studentPaymentOrder);
+        int updateCount = studentPaymentOrderService.update(order);
         if (updateCount <= 0) {
             throw new BizException("订单更新失败");
         }
         Date date = new Date();
         ClassGroup classGroup = classGroupDao.get(order.getClassGroupId());
-        if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
+        if (order.getStatus() == DealStatusEnum.SUCCESS) {
             VipGroup vipGroup = vipGroupDao.get(Long.parseLong(classGroup.getMusicGroupId()));
             if (vipGroup.getStatus() == VipGroupStatusEnum.DELETE ||
                     vipGroup.getStatus() == VipGroupStatusEnum.CANCEL ||
@@ -2335,7 +2335,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 sysCouponCodeService.quit(order.getCouponCodeId());
             } else {
                 //活动赠送
-                Integer activityUserMapperId = studentPaymentOrderService.activityGive(vipGroup.getVipGroupActivityId(), studentPaymentOrder,
+                Integer activityUserMapperId = studentPaymentOrderService.activityGive(vipGroup.getVipGroupActivityId(), order,
                         vipGroup.getId().toString(), null, vipGroup.getUserId());
 
                 //生成班级学员关联
@@ -2448,9 +2448,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 sysUserIncomeCashAccountDetail.setAmount(order.getActualAmount());
                 sysUserIncomeCashAccountDetail.setBalance(sysUserCashAccount.getBalance().add(order.getActualAmount()));
                 sysUserIncomeCashAccountDetail.setAttribute(order.getTransNo());
-                sysUserIncomeCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-                sysUserIncomeCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount());
-                sysUserIncomeCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount());
+                sysUserIncomeCashAccountDetail.setChannel(order.getPaymentChannel());
+                sysUserIncomeCashAccountDetail.setComAmount(order.getComAmount());
+                sysUserIncomeCashAccountDetail.setPerAmount(order.getPerAmount());
 
                 //支出
                 SysUserCashAccountDetail sysUserExpendCashAccountDetail = new SysUserCashAccountDetail();
@@ -2460,12 +2460,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 sysUserExpendCashAccountDetail.setAmount(order.getActualAmount().negate());
                 sysUserExpendCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
                 sysUserExpendCashAccountDetail.setAttribute(order.getTransNo());
-                sysUserExpendCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-                if (studentPaymentOrder.getComAmount() != null) {
-                    sysUserExpendCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
+                sysUserExpendCashAccountDetail.setChannel(order.getPaymentChannel());
+                if (order.getComAmount() != null) {
+                    sysUserExpendCashAccountDetail.setComAmount(order.getComAmount().negate());
                 }
-                if (studentPaymentOrder.getPerAmount() != null) {
-                    sysUserExpendCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
+                if (order.getPerAmount() != null) {
+                    sysUserExpendCashAccountDetail.setPerAmount(order.getPerAmount().negate());
                 }
 
                 sysUserCashAccountDetailService.insert(sysUserIncomeCashAccountDetail);
@@ -2491,8 +2491,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             }
         } else {
             classGroup.setStudentNum(classGroup.getStudentNum() - 1);
-            if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().doubleValue() > 0) {
-                sysUserCashAccountService.updateBalance(userId, studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS,
+            if (order.getBalancePaymentAmount() != null && order.getBalancePaymentAmount().doubleValue() > 0) {
+                sysUserCashAccountService.updateBalance(userId, order.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS,
                         "VIP课购买失败");
             }
             sysCouponCodeService.quit(order.getCouponCodeId());