lishiqiang пре 1 недеља
родитељ
комит
db1f79a3c7

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

@@ -393,8 +393,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             tradeOrderAuditMapper.insert(tradeOrderAuditDO);
 
             if (tradeOrderDO.getAuditStatus() + 1 > tradeOrderDO.getAuditType()) {
-
-
                 try {
                     Map map = new HashMap();
                     map.put("orderNo", tradeOrderDO.getOrderNo());
@@ -533,6 +531,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         .set(TradeOrderDO::getDeposiStatus, 0)
                         .eq(TradeOrderDO::getId, orderId)
                 );
+                Map<String, Object> extMap = new HashMap<>();
+                extMap.put("result", "审核不通过");
+                TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.YD.getStatus(), extMap);
             }
         }
         return CommonResult.success("审核成功");
@@ -2206,7 +2207,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     Map map = new HashMap();
                     Long userId = getLoginUserId();
                     map.put("orderNo", tradeOrderDO.getOrderNo());
-                    map.put("oldOrderStatus", TradeOrderStatusEnum.valueOf(tradeOrderDO.getOrderStatus()));
+                    map.put("oldOrderStatus", TradeOrderStatusEnum.valueOf(tradeOrderDO.getOrderStatus()).getName());
                     map.put("newOrderStatus", TradeOrderStatusEnum.TRANSFER.getName());
                     AdminUserRespDTO user = adminUserApi.getUser(userId);
                     map.put("modifyUser", user.getNickname());
@@ -2231,10 +2232,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 log.error("发送站内信异常", e);
             }
 
-
-
-
-
             //支付倒计时--不超时,有预订单
             Map<String, Object> append = TradeOrderLogUtils.append("result", "订单修改成功");
             append.put("content", content);