|
@@ -393,13 +393,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
tradeOrderAuditMapper.insert(tradeOrderAuditDO);
|
|
tradeOrderAuditMapper.insert(tradeOrderAuditDO);
|
|
|
|
|
|
|
|
if (tradeOrderDO.getAuditStatus() + 1 > tradeOrderDO.getAuditType()) {
|
|
if (tradeOrderDO.getAuditStatus() + 1 > tradeOrderDO.getAuditType()) {
|
|
|
- tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
|
|
|
|
|
- .set(TradeOrderDO::getOrderStatus, TradeOrderStatusEnum.UNPAID.getStatus())
|
|
|
|
|
- .set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
|
|
|
|
|
- .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
|
|
|
|
|
- .set(TradeOrderDO::getDeposiStatus, 1)
|
|
|
|
|
- .eq(TradeOrderDO::getId, orderId)
|
|
|
|
|
- );
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
Map map = new HashMap();
|
|
Map map = new HashMap();
|
|
@@ -424,16 +418,28 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
log.error("发送短信异常", e);
|
|
log.error("发送短信异常", e);
|
|
|
}
|
|
}
|
|
|
|
|
+ AtomicReference<BigDecimal> amount = new AtomicReference<>(BigDecimal.ZERO);
|
|
|
try {
|
|
try {
|
|
|
List<OrderPolicyDO> orderPolicyList = orderPolicyMapper.selectList(OrderPolicyDO::getOrderId, orderId);
|
|
List<OrderPolicyDO> orderPolicyList = orderPolicyMapper.selectList(OrderPolicyDO::getOrderId, orderId);
|
|
|
|
|
+
|
|
|
if (!orderPolicyList.isEmpty()) {
|
|
if (!orderPolicyList.isEmpty()) {
|
|
|
orderPolicyList.forEach(item -> {
|
|
orderPolicyList.forEach(item -> {
|
|
|
|
|
+ amount.set(amount.get().add(item.getAmount()));
|
|
|
policyApi.updatePolicySurplusNum(item.getId(), tradeOrderDO.getVoyageId(), item.getPreUseNum());
|
|
policyApi.updatePolicySurplusNum(item.getId(), tradeOrderDO.getVoyageId(), item.getPreUseNum());
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
|
log.error("政策执行异常", e);
|
|
log.error("政策执行异常", e);
|
|
|
}
|
|
}
|
|
|
|
|
+ tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
|
|
|
|
|
+ .set(TradeOrderDO::getOrderStatus, TradeOrderStatusEnum.UNPAID.getStatus())
|
|
|
|
|
+ .set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
|
|
|
|
|
+ .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
|
|
|
|
|
+ .set(TradeOrderDO::getDeposiStatus, 1)
|
|
|
|
|
+ .set(TradeOrderDO::getPayAmount, tradeOrderDO.getPayAmount().subtract(amount.get()))
|
|
|
|
|
+ .eq(TradeOrderDO::getId, orderId)
|
|
|
|
|
+ );
|
|
|
Map<String, Object> extMap = new HashMap<>();
|
|
Map<String, Object> extMap = new HashMap<>();
|
|
|
extMap.put("result", "审核通过");
|
|
extMap.put("result", "审核通过");
|
|
|
TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
|
|
TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
|