取消订单退款

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

@@ -1308,7 +1308,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 extMap.put("result", result);
                 tradeRefundService.refundByOrderId(orderId, supplementAmount);
 
-                TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
+                TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.CANCELED.getStatus(), extMap);
             } else {
                 AuditUserDO auditUserDO = auditUserMapper.selectOne(new QueryWrapper<AuditUserDO>().eq("type", tradeOrderDO.getAuditType()).eq("audit_status", tradeOrderDO.getAuditStatus() + 1).last("limit 1"));
                 tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
@@ -1344,10 +1344,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
             int oldorderStatus =  TradeOrderStatusEnum.YD.getStatus();
             if(tradeOrderDO.getConfirmDate()!=null){
-                oldorderStatus = TradeOrderStatusEnum.UNPAID.getStatus();
+                oldorderStatus = TradeOrderStatusEnum.CANCELED.getStatus();
             }
             if(tradeOrderDO.getPayStatus()!=null && tradeOrderDO.getPayStatus()==1){
-                oldorderStatus = TradeOrderStatusEnum.UNUSED.getStatus();
+                oldorderStatus = TradeOrderStatusEnum.CANCELED.getStatus();
             }
             tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("order_status",oldorderStatus).set("audit_status", 5).set("damaged_status",3).eq("id", orderId));