历史商城订单同步

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

@@ -1472,7 +1472,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     @Transactional
     public void mallBuyOrderCallback1(Long orderId) {
-        Date nowDate = new Date();
         StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.get(orderId);
 
         Integer userId = studentPaymentOrder.getUserId();
@@ -1480,7 +1479,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         Map<Integer, String> map = new HashMap<>();
         map.put(userId, userId.toString());
 
-        if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             try {
                 contractService.transferProduceContract(userId, null, studentPaymentOrder.getType());
             } catch (Exception e) {
@@ -1591,44 +1589,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     }
                 }
             }
-            // 完全余额支付 不生成下面的记录
-            if (BigDecimal.ZERO.compareTo(studentPaymentOrder.getActualAmount()) == 0) return;
-
-            //插入交易明细
-            BigDecimal amount = studentPaymentOrder.getActualAmount();
-            SysUserCashAccount cashAccount = sysUserCashAccountService.get(userId);
-            //充值
-            SysUserCashAccountDetail rechargeDetail = new SysUserCashAccountDetail();
-            rechargeDetail.setAmount(amount);
-            rechargeDetail.setBalance(cashAccount.getBalance().add(amount));
-            rechargeDetail.setComment("缴费前充值");
-            rechargeDetail.setStatus(DealStatusEnum.SUCCESS);
-            rechargeDetail.setTransNo(studentPaymentOrder.getTransNo());
-            rechargeDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
-            rechargeDetail.setUserId(userId);
-            rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-            if (studentPaymentOrder.getComAmount() != null) {
-                rechargeDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
-                rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
-            }
-            sysUserCashAccountDetailService.insert(rechargeDetail);
-            //缴费
-            SysUserCashAccountDetail paymentDetail = new SysUserCashAccountDetail();
-            paymentDetail.setAmount(amount.negate());
-            paymentDetail.setBalance(cashAccount.getBalance());
-            paymentDetail.setComment("商品销售");
-            paymentDetail.setStatus(DealStatusEnum.SUCCESS);
-            paymentDetail.setTransNo(studentPaymentOrder.getTransNo());
-            paymentDetail.setType(PlatformCashAccountDetailTypeEnum.GOODS_SELL);
-            paymentDetail.setUserId(userId);
-            sysUserCashAccountDetailService.insert(paymentDetail);
-        } else if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
-
-            if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
-                sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "商城购买支付失败");
-            }
-            sysCouponCodeService.quit(studentPaymentOrder.getCouponCodeId());
-        }
     }
 
     @Override