审核意见存取

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -246,8 +246,8 @@ public class OtcTradeOrderController {
     @Operation(summary = "win-订单审核")
     @OperateLog(type = API)
     @PlatTenantEnv
-    public CommonResult<?> orderAudit(@RequestParam Long orderId, @RequestParam Integer auditStatus) {
-        return otcTradeOrderService.orderAudit(orderId, auditStatus);
+    public CommonResult<?> orderAudit(@RequestParam Long orderId, @RequestParam Integer auditStatus, @RequestParam String auditAdvice) {
+        return otcTradeOrderService.orderAudit(orderId, auditStatus,auditAdvice);
     }
 
     @GetMapping("/travl/cancelAudit")

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/OtcTradeOrderService.java

@@ -53,7 +53,7 @@ public interface OtcTradeOrderService {
 
     CommonResult<?> queryCancelAudit(Long orderId);
 
-    CommonResult<?> orderAudit(Long orderId, Integer auditStatus);
+    CommonResult<?> orderAudit(Long orderId, Integer auditStatus,String auditAdvice);
 
     /**
      * 撤回审核

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

@@ -396,12 +396,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.ORDER_AUDIT)
     @Transactional(rollbackFor = Exception.class)
     @TenantIgnore
-    public CommonResult<?> orderAudit(Long orderId, Integer auditStatus) {
+    public CommonResult<?> orderAudit(Long orderId, Integer auditStatus,String auditAdvice) {
         TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(orderId);
         if (tradeOrderDO == null) {
             return CommonResult.error(ORDER_NOT_EXIST);
         }
-
+        if(StringUtils.isBlank(auditAdvice)){
+            auditAdvice="无";
+        }
         if (auditStatus != null && auditStatus == 1) {
             TradeOrderAuditDO tradeOrderAuditDO = new TradeOrderAuditDO();
             tradeOrderAuditDO.setId(IdWorker.getId());
@@ -414,6 +416,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             //审核状态 1、通过 2、不通过
             tradeOrderAuditDO.setAuditStatus(1);
             tradeOrderAuditDO.setAuditType(1);
+            tradeOrderAuditDO.setRemark(auditAdvice);
             tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus());
             tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
             tradeOrderAuditDO.setOrderId(tradeOrderDO.getId());
@@ -472,7 +475,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         .eq(TradeOrderDO::getId, orderId)
                 );
                 Map<String, Object> extMap = new HashMap<>();
-                extMap.put("result", "审核通过");
+                extMap.put("result", "审核通过,审核意见："+auditAdvice);
                 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"));
@@ -484,13 +487,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         .eq(TradeOrderDO::getId, orderId)
                 );
                 Map<String, Object> extMap = new HashMap<>();
-                extMap.put("result", "审核通过，等待下一级审核");
+                extMap.put("result", "审核通过(审核意见："+auditAdvice+")，等待下一级审核");
                 TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), tradeOrderDO.getOrderStatus(), extMap);
             }
         } else {
             TradeOrderAuditDO tradeOrderAuditDO = new TradeOrderAuditDO();
             tradeOrderAuditDO.setId(IdWorker.getId());
             tradeOrderAuditDO.setType(tradeOrderDO.getAuditType());
+            tradeOrderAuditDO.setRemark(auditAdvice);
             LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
             if (loginUser != null) {
                 tradeOrderAuditDO.setAuditUser(loginUser.getId());
@@ -552,7 +556,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 }
 
                 Map<String, Object> extMap = new HashMap<>();
-                extMap.put("result", "审核不通过");
+                extMap.put("result", "审核不通过，审核意见:"+auditAdvice);
                 TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), lastTradeOrder.getOrderStatus(), extMap);
 
             }else{
@@ -569,7 +573,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         .eq(TradeOrderDO::getId, orderId)
                 );
                 Map<String, Object> extMap = new HashMap<>();
-                extMap.put("result", "审核不通过");
+                extMap.put("result", "审核不通过，审核意见:"+auditAdvice);
                 TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.YD.getStatus(), extMap);
             }
         }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/pay/impl/TradeOrderPayServiceImpl.java

@@ -816,7 +816,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
             tradeOrderLogDO.setOperateType(TradeOrderOperateTypeEnum.ORDER_PAY.getType());
             tradeOrderLogDO.setBeforeStatus(orderStatus);
             tradeOrderLogDO.setAfterStatus(tradeOrderDO.getOrderStatus());
-            tradeOrderLogDO.setContent(TradeOrderOperateTypeEnum.ORDER_PAY.getContent().replaceAll("payType", PayTypeEnum.valueOf(tradeOrderPayDO.getPaymentType()).getName()).replaceAll("payAmount", tradeOrderPayDO.getPayAmount().toString()));
+            tradeOrderLogDO.setContent(TradeOrderOperateTypeEnum.ORDER_PAY.getContent().replaceAll("{payType}", PayTypeEnum.valueOf(tradeOrderPayDO.getPaymentType()).getName()).replaceAll("{payAmount}", tradeOrderPayDO.getPayAmount().toString()));
             tradeOrderLogMapper.insert(tradeOrderLogDO);
         } catch (Exception e) {
             log.error("保存订单日志异常orderId:{}", tradeOrderDO.getId(), e);