|
|
@@ -429,9 +429,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
order.setPaymentBusinessChannel(rpMap.get("channelType"));
|
|
|
order.setTenantId(this.get(order.getId()).getTenantId());
|
|
|
TenantContextHolder.setTenantId(order.getTenantId());
|
|
|
- if (StringUtils.isEmpty(rpMap.get("callback")) || !"0".equals(rpMap.get("callback"))) {
|
|
|
- callOrderCallBack(order);
|
|
|
- }
|
|
|
+ callOrderCallBack(order);
|
|
|
|
|
|
if (status.equals(DealStatusEnum.SUCCESS)
|
|
|
&& StringUtils.isNotBlank(order.getPaymentChannel())
|
|
|
@@ -1166,7 +1164,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
studentPaymentRouteOrderService.addRouteOrder(model.getOrderNo(), student.getOrganId(), balance);
|
|
|
Map<String, String> notifyMap = new HashMap<>();
|
|
|
notifyMap.put("tradeState", "1");
|
|
|
- notifyMap.put("callback", "0");
|
|
|
notifyMap.put("balanceAmount",studentPaymentOrder.getBalancePaymentAmount() == null?"0":studentPaymentOrder.getBalancePaymentAmount().toString());
|
|
|
notifyMap.put("merOrderNo", studentPaymentOrder.getOrderNo());
|
|
|
studentPaymentOrderService.updateOrder(notifyMap);
|
|
|
@@ -1219,6 +1216,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
} catch (Exception e) {
|
|
|
logger.error("产品协议生成失败", e);
|
|
|
}
|
|
|
+ // 完全余额支付 不生成下面的记录
|
|
|
+ if (BigDecimal.ZERO.compareTo(studentPaymentOrder.getActualAmount()) == 0) return;
|
|
|
+
|
|
|
//插入交易明细
|
|
|
BigDecimal amount = studentPaymentOrder.getActualAmount();
|
|
|
SysUserCashAccount cashAccount = sysUserCashAccountService.get(userId);
|
liujunchi