|
@@ -509,21 +509,31 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
orderStatus = 6;
|
|
orderStatus = 6;
|
|
|
}
|
|
}
|
|
|
LocalDateTime confireDate = tradeOrderDO.getConfirmDate();
|
|
LocalDateTime confireDate = tradeOrderDO.getConfirmDate();
|
|
|
|
|
+ BigDecimal newPayAmount = tradeOrderDO.getAmount().subtract(amount);
|
|
|
LambdaUpdateWrapper<TradeOrderDO> updateWrapper = Wrappers.<TradeOrderDO>lambdaUpdate()
|
|
LambdaUpdateWrapper<TradeOrderDO> updateWrapper = Wrappers.<TradeOrderDO>lambdaUpdate()
|
|
|
.set(TradeOrderDO::getOrderStatus, orderStatus)
|
|
.set(TradeOrderDO::getOrderStatus, orderStatus)
|
|
|
.set(TradeOrderDO::getConfirmDate, confireDate)
|
|
.set(TradeOrderDO::getConfirmDate, confireDate)
|
|
|
.set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
|
|
.set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
|
|
|
.set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
|
|
.set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
|
|
|
.set(TradeOrderDO::getDeposiStatus, 1)
|
|
.set(TradeOrderDO::getDeposiStatus, 1)
|
|
|
- .set(TradeOrderDO::getPayAmount, tradeOrderDO.getAmount().subtract(amount))
|
|
|
|
|
|
|
+ .set(TradeOrderDO::getPayAmount, newPayAmount)
|
|
|
.set(TradeOrderDO::getFreeAmount, amount)
|
|
.set(TradeOrderDO::getFreeAmount, amount)
|
|
|
.eq(TradeOrderDO::getId, orderId);
|
|
.eq(TradeOrderDO::getId, orderId);
|
|
|
if(confireDate == null){
|
|
if(confireDate == null){
|
|
|
updateWrapper.set(TradeOrderDO::getConfirmDate, LocalDateTime.now());
|
|
updateWrapper.set(TradeOrderDO::getConfirmDate, LocalDateTime.now());
|
|
|
}
|
|
}
|
|
|
tradeOrderMapper.update(updateWrapper);
|
|
tradeOrderMapper.update(updateWrapper);
|
|
|
|
|
+ String str ="";
|
|
|
|
|
+ if(tradeOrderDO.getPayAmount().compareTo(newPayAmount)!=0){
|
|
|
|
|
+ str+=",支付金额发送变化,从"+tradeOrderDO.getPayAmount()+"到"+newPayAmount;
|
|
|
|
|
+ }
|
|
|
|
|
+ BigDecimal oldFreeAmount = tradeOrderDO.getFreeAmount()==null?BigDecimal.ZERO:tradeOrderDO.getFreeAmount();
|
|
|
|
|
+ if(oldFreeAmount.compareTo(amount)!=0){
|
|
|
|
|
+ str+=",优惠金额发送变化,从"+tradeOrderDO.getFreeAmount()+"到"+amount;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
Map<String, Object> extMap = new HashMap<>();
|
|
Map<String, Object> extMap = new HashMap<>();
|
|
|
- extMap.put("result", "审核通过,审核意见:"+auditAdvice);
|
|
|
|
|
|
|
+ extMap.put("result", "审核通过,审核意见:"+auditAdvice+" "+str);
|
|
|
TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
|
|
TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
|
|
|
} else {
|
|
} else {
|
|
|
AuditUserDO auditUserDO = auditUserMapper.selectOne(new QueryWrapper<AuditUserDO>().eq("type", tradeOrderDO.getAuditType()).eq("audit_status", tradeOrderDO.getAuditStatus() + 1).last("limit 1"));
|
|
AuditUserDO auditUserDO = auditUserMapper.selectOne(new QueryWrapper<AuditUserDO>().eq("type", tradeOrderDO.getAuditType()).eq("audit_status", tradeOrderDO.getAuditStatus() + 1).last("limit 1"));
|