Explorar el Código

订单审核新增支付金额变化日志

lishiqiang hace 6 días
padre
commit
fda9219b56

+ 12 - 2
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -509,21 +509,31 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     orderStatus = 6;
                 }
                 LocalDateTime confireDate = tradeOrderDO.getConfirmDate();
+                BigDecimal newPayAmount = tradeOrderDO.getAmount().subtract(amount);
                 LambdaUpdateWrapper<TradeOrderDO> updateWrapper = Wrappers.<TradeOrderDO>lambdaUpdate()
                         .set(TradeOrderDO::getOrderStatus, orderStatus)
                         .set(TradeOrderDO::getConfirmDate, confireDate)
                         .set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
                         .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
                         .set(TradeOrderDO::getDeposiStatus, 1)
-                        .set(TradeOrderDO::getPayAmount, tradeOrderDO.getAmount().subtract(amount))
+                        .set(TradeOrderDO::getPayAmount, newPayAmount)
                         .set(TradeOrderDO::getFreeAmount, amount)
                         .eq(TradeOrderDO::getId, orderId);
                 if(confireDate == null){
                     updateWrapper.set(TradeOrderDO::getConfirmDate, LocalDateTime.now());
                 }
                 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<>();
-                extMap.put("result", "审核通过,审核意见:"+auditAdvice);
+                extMap.put("result", "审核通过,审核意见:"+auditAdvice+" "+str);
                 TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
             } else {
                 AuditUserDO auditUserDO = auditUserMapper.selectOne(new QueryWrapper<AuditUserDO>().eq("type", tradeOrderDO.getAuditType()).eq("audit_status", tradeOrderDO.getAuditStatus() + 1).last("limit 1"));