订单取消审核流程

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/TradeOrderOperateTypeEnum.java

@@ -42,6 +42,7 @@ public enum TradeOrderOperateTypeEnum {
     GUIDE_REFUND(28, "导游代退,退款金额{refundAmount},原订单支付金额{payAmount}，变更为{newPayAmount}"),
     ORDER_MODIFY(29, "修改订单，修改记录：{content}，结果：{result}"),
     ORDER_AUDIT(30, "订单审核，结果：{result}"),
+    CANCEL_AUDIT(32, "订单取消审核，结果：{result}"),
     ORDER_DEPOSI_PAY(31, "订单定金支付，支付方式：{payType},金额：{payAmount}"),
     ;
 

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/TradeOrderStatusEnum.java

@@ -44,7 +44,8 @@ public enum TradeOrderStatusEnum implements IntArrayValuable {
     EXPIRED(12, "已过期"),
     //订单修改审核
     TRANSFER(13, "审核中"),
-    YD(14, "留位");
+    YD(14, "留位"),
+    CANCEL_AUDIT(15, "取消审核中");
 
 
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderStatusEnum::getStatus).toArray();

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

@@ -203,6 +203,14 @@ public class OtcTradeOrderController {
         return otcTradeOrderService.queryOrderAudit(orderId);
     }
 
+    @GetMapping("/travl/queryCancelAudit")
+    @Operation(summary = "win-查询订单审核信息")
+    @OperateLog(type = API)
+    @PlatTenantEnv
+    public CommonResult<?> queryCancelAudit(@RequestParam Long orderId) {
+        return otcTradeOrderService.queryCancelAudit(orderId);
+    }
+
     @GetMapping("/travl/orderAudit")
     @Operation(summary = "win-订单审核")
     @OperateLog(type = API)
@@ -211,6 +219,14 @@ public class OtcTradeOrderController {
         return otcTradeOrderService.orderAudit(orderId, auditStatus);
     }
 
+    @GetMapping("/travl/cancelAudit")
+    @Operation(summary = "win-订单取消审核")
+    @OperateLog(type = API)
+    @PlatTenantEnv
+    public CommonResult<?> cancelAudit(@RequestParam Long orderId, @RequestParam Integer auditStatus) {
+        return otcTradeOrderService.cancelAudit(orderId, auditStatus);
+    }
+
     @GetMapping("/payOrderQuery")
     @Operation(summary = "支付反查，0待支付(轮询) 1已支付 2未支付 8888已支付等待结果(轮询) ")
     @OperateLog(type = TRADE)

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/tradeOrderaudit/vo/TradeOrderAuditRespVO.java

@@ -24,6 +24,10 @@ public class TradeOrderAuditRespVO {
     @ExcelProperty("审核类型 1、1级审核 2、2级审核 3、3级审核 4、4级审核")
     private Integer type;
 
+    @Schema(description = "审核类型 1、订单审核 2、订单退款审核 3、订单取消审核", example = "1")
+    @ExcelProperty("审核类型 1、订单审核 2、订单退款审核 3、订单取消审核")
+    private Integer auditType;
+
     @Schema(description = "审核人")
     @ExcelProperty("审核人")
     private Long auditUser;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/tradeOrderaudit/vo/TradeOrderAuditSaveReqVO.java

@@ -20,6 +20,9 @@ public class TradeOrderAuditSaveReqVO {
     @Schema(description = "审核类型 1、1级审核 2、2级审核 3、3级审核 4、4级审核", example = "2")
     private Integer type;
 
+    @Schema(description = "审核类型 1、订单审核 2、订单退款审核 3、订单取消审核", example = "2")
+    private Integer auditType;
+
     @Schema(description = "审核人")
     private Long auditUser;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/tradeOrderaudit/TradeOrderAuditDO.java

@@ -43,6 +43,11 @@ public class TradeOrderAuditDO extends TenantBaseDO {
      * 审核类型 1、1级审核 2、2级审核 3、3级审核 4、4级审核
      */
     private Integer type;
+
+    /**
+     * 审核类型 1、订单审核 2、订单退款审核 3、订单取消审核
+     */
+    private Integer auditType;
     /**
      * 审核人
      */

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/tradeOrderaudit/TradeOrderAuditMapper.java

@@ -37,9 +37,10 @@ public interface TradeOrderAuditMapper extends BaseMapperX<TradeOrderAuditDO> {
                 .last("LIMIT 1"));
     }
 
-    default List<TradeOrderAuditDO> selectNewAuditorByOrderId(Long orderId) {
+    default List<TradeOrderAuditDO> selectNewAuditorByOrderId(Long orderId, Integer auditType) {
         return selectList(new LambdaQueryWrapperX<TradeOrderAuditDO>()
                 .eq(TradeOrderAuditDO::getOrderId, orderId)
+                .eq(TradeOrderAuditDO::getAuditType, auditType)
                 .orderByDesc(TradeOrderAuditDO::getCreateTime));
     }
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/AdminTradeOrderServiceImpl.java

@@ -3,10 +3,13 @@ package com.yc.ship.module.trade.service.order.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.lang.Asserts;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.ObjectUtils;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.yc.ship.framework.security.core.LoginUser;
 import com.yc.ship.module.otc.api.agency.dto.AgencyUserLoginInfoRespDTO;
 import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
@@ -19,12 +22,17 @@ import com.yc.ship.module.trade.api.dto.TradeRefundCreateReqDTO;
 import com.yc.ship.module.trade.api.dto.TradeRefundRespDTO;
 import com.yc.ship.module.trade.controller.admin.order.vo.refund.*;
 import com.yc.ship.module.trade.convert.order.TradeRefundConvert;
+import com.yc.ship.module.trade.dal.dataobject.audituser.AuditUserDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeDetailDO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderBindDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderUserDO;
-import com.yc.ship.module.trade.dal.dataobject.refund.CancelAuditDO;
+import com.yc.ship.module.trade.dal.mysql.audituser.AuditUserMapper;
 import com.yc.ship.module.trade.dal.mysql.order.TradeDetailMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeOrderBindMapper;
+import com.yc.ship.module.trade.dal.mysql.order.TradeOrderMapper;
 import com.yc.ship.module.trade.dal.mysql.refund.CancelAuditMapper;
+import com.yc.ship.module.trade.dal.mysql.tradeOrderaudit.TradeOrderAuditMapper;
 import com.yc.ship.module.trade.enums.RefundChannelEnum;
 import com.yc.ship.module.trade.enums.TradeOrderStatusEnum;
 import com.yc.ship.module.trade.service.order.AdminTradeOrderService;
@@ -37,6 +45,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +54,7 @@ import java.util.stream.Collectors;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
+import static com.yc.ship.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 import static com.yc.ship.module.trade.enums.ApiConstants.*;
 import static com.yc.ship.module.trade.enums.ErrorCodeConstants.*;
 import static com.yc.ship.module.trade.utils.AgencyAuthUtils.AGENCY_LOGIN_INFO;
@@ -67,9 +77,12 @@ public class AdminTradeOrderServiceImpl implements AdminTradeOrderService {
     private TradeOrderPayService tradeOrderPayService;
     @Resource
     private TradeDetailMapper tradeDetailMapper;
-
     @Resource
-    private CancelAuditMapper cancelAuditMapper;
+    private AuditUserMapper auditUserMapper;
+    @Resource
+    private TradeOrderMapper tradeOrderMapper;
+    @Resource
+    private TradeOrderBindMapper tradeOrderBindMapper;
     @Resource
     private ContractApi contractApi;
     @Resource
@@ -320,10 +333,19 @@ public class AdminTradeOrderServiceImpl implements AdminTradeOrderService {
         Asserts.isTrue(tradeOrderDO != null, "订单不存在");
         if(Objects.equals(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus())){
             //需要审核
-            CancelAuditDO cancelAuditDO = new CancelAuditDO();
-            cancelAuditDO.setOrderId(orderId);
-            cancelAuditDO.setAuditStatus(TradeOrderStatusEnum.CANCELED.getStatus());
-            cancelAuditMapper.insert(cancelAuditDO);
+            TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
+            tradeOrderBindDO.setId(IdWorker.getId());
+            tradeOrderBindDO.setType(1);
+            tradeOrderBindDO.setBindId(orderId);
+            tradeOrderBindDO.setOrderId(orderId);
+            tradeOrderBindDO.setCustom("订单取消");
+            tradeOrderBindDO.setRemark("订单取消");
+            tradeOrderBindDO.setCreateTime(LocalDateTime.now());
+            tradeOrderBindDO.setCreator(getLoginUserId()+"");
+            tradeOrderBindMapper.insert(tradeOrderBindDO);
+
+            AuditUserDO auditUserDO = auditUserMapper.selectOne(new LambdaQueryWrapperX<AuditUserDO>().eq(AuditUserDO::getType, 3).eq(AuditUserDO::getDeleted, 0).orderByDesc(AuditUserDO::getCreateTime).last("limit 1"));
+            tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", 3).set("audit_user", auditUserDO == null ? "" : auditUserDO.getAuditUser()).set("order_status", TradeOrderStatusEnum.CANCEL_AUDIT.getStatus()).set("audit_status", 1).eq("id", tradeOrderDO.getId()));
             return CommonResult.success("订单取消审核中");
         }else{
             return tradeOrderPayService.cancelOrder(orderId);

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

@@ -41,6 +41,8 @@ public interface OtcTradeOrderService {
 
     CommonResult<?> queryOrderAudit(Long orderId);
 
+    CommonResult<?> queryCancelAudit(Long orderId);
+
     CommonResult<?> orderAudit(Long orderId, Integer auditStatus);
 
     /**
@@ -134,4 +136,6 @@ public interface OtcTradeOrderService {
     File createConfirmaction(Long id, Double totalMoney);
 
     CommonResult<?> orderRead(Long orderId);
+
+    CommonResult<?> cancelAudit(Long orderId, Integer auditStatus);
 }

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

@@ -99,7 +99,6 @@ import com.yc.ship.module.trade.framework.common.TradeOrderLogUtils;
 import com.yc.ship.module.trade.service.invoice.InvoiceService;
 import com.yc.ship.module.trade.service.order.TradeOrderRepositoryService;
 import com.yc.ship.module.trade.service.order.TradeOrderService;
-import com.yc.ship.module.trade.service.orderpolicy.OrderPolicyService;
 import com.yc.ship.module.trade.service.otc.OtcTradeOrderService;
 import com.yc.ship.module.trade.service.pay.TradeOrderPayService;
 import com.yc.ship.module.trade.service.refund.TradeRefundRepositoryService;
@@ -326,7 +325,24 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (tradeOrderDO != null) {
             TradeOrderBindDO bindByOrder = tradeOrderRepositoryService.getBindByOrder(orderId);
             tradeOrderDO.setBindOrder(bindByOrder);
-            List<TradeOrderAuditDO> tradeOrderAuditList = tradeOrderAuditMapper.selectNewAuditorByOrderId(orderId);
+            List<TradeOrderAuditDO> tradeOrderAuditList = tradeOrderAuditMapper.selectNewAuditorByOrderId(orderId,1);
+            tradeOrderAuditList.forEach(item -> {
+                AdminUserRespDTO user = adminUserApi.getUser(item.getAuditUser());
+                item.setAuditUserName(user != null ? user.getUsername() : "未知");
+            });
+            tradeOrderDO.setTradeOrderAuditList(tradeOrderAuditList);
+            return CommonResult.success(tradeOrderDO);
+        }
+        return CommonResult.error(ORDER_NOT_EXIST);
+    }
+
+    @Override
+    public CommonResult<?> queryCancelAudit(Long orderId) {
+        TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(orderId);
+        if (tradeOrderDO != null) {
+            TradeOrderBindDO bindByOrder = tradeOrderRepositoryService.getBindByOrder(orderId);
+            tradeOrderDO.setBindOrder(bindByOrder);
+            List<TradeOrderAuditDO> tradeOrderAuditList = tradeOrderAuditMapper.selectNewAuditorByOrderId(orderId,3);
             tradeOrderAuditList.forEach(item -> {
                 AdminUserRespDTO user = adminUserApi.getUser(item.getAuditUser());
                 item.setAuditUserName(user != null ? user.getUsername() : "未知");
@@ -358,6 +374,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             tradeOrderAuditDO.setAuditTime(LocalDateTime.now());
             //审核状态 1、通过 2、不通过
             tradeOrderAuditDO.setAuditStatus(1);
+            tradeOrderAuditDO.setAuditType(1);
             tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus());
             tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
             tradeOrderAuditDO.setOrderId(tradeOrderDO.getId());
@@ -397,6 +414,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             tradeOrderAuditDO.setAuditTime(LocalDateTime.now());
             //审核状态 1、通过 2、不通过
             tradeOrderAuditDO.setAuditStatus(2);
+            tradeOrderAuditDO.setAuditType(1);
             tradeOrderAuditDO.setTenantId(tradeOrderDO.getTenantId());
             tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus());
             tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
@@ -458,6 +476,83 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         return CommonResult.success("审核成功");
     }
 
+    @Override
+    @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.CANCEL_AUDIT)
+    @TenantIgnore
+    public CommonResult<?> cancelAudit(Long orderId, Integer auditStatus) {
+        TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(orderId);
+        if (tradeOrderDO == null) {
+            return CommonResult.error(ORDER_NOT_EXIST);
+        }
+
+        if (auditStatus != null && auditStatus == 1) {
+            TradeOrderAuditDO tradeOrderAuditDO = new TradeOrderAuditDO();
+            tradeOrderAuditDO.setId(IdWorker.getId());
+            tradeOrderAuditDO.setType(tradeOrderDO.getAuditType());
+            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            if (loginUser != null) {
+                tradeOrderAuditDO.setAuditUser(loginUser.getId());
+            }
+            tradeOrderAuditDO.setAuditTime(LocalDateTime.now());
+            //审核状态 1、通过 2、不通过
+            tradeOrderAuditDO.setAuditStatus(1);
+            tradeOrderAuditDO.setAuditType(3);
+            tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus());
+            tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
+            tradeOrderAuditDO.setOrderId(tradeOrderDO.getId());
+            tradeOrderAuditDO.setTenantId(tradeOrderDO.getTenantId());
+            tradeOrderAuditMapper.insert(tradeOrderAuditDO);
+
+            if (tradeOrderDO.getAuditStatus() + 1 > tradeOrderDO.getAuditType()) {
+                tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
+                        .set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
+                        .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
+                        .eq(TradeOrderDO::getId, orderId)
+                );
+                tradeOrderPayService.cancelOrder(orderId);
+                Map<String, Object> extMap = new HashMap<>();
+                extMap.put("result", "审核通过");
+                TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), extMap);
+            } else {
+                tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
+                        .set(TradeOrderDO::getAuditStatus, tradeOrderDO.getAuditStatus() + 1)
+                        .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
+                        .set(TradeOrderDO::getDeposiStatus, 0)
+                        .eq(TradeOrderDO::getId, orderId)
+                );
+                Map<String, Object> extMap = new HashMap<>();
+                extMap.put("result", "审核通过，等待下一级审核");
+                TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), tradeOrderDO.getOrderStatus(), extMap);
+            }
+        } else {
+            TradeOrderAuditDO tradeOrderAuditDO = new TradeOrderAuditDO();
+            tradeOrderAuditDO.setId(IdWorker.getId());
+            tradeOrderAuditDO.setType(tradeOrderDO.getAuditType());
+            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            if (loginUser != null) {
+                tradeOrderAuditDO.setAuditUser(loginUser.getId());
+            }
+            tradeOrderAuditDO.setAuditTime(LocalDateTime.now());
+            //审核状态 1、通过 2、不通过
+            tradeOrderAuditDO.setAuditStatus(2);
+            tradeOrderAuditDO.setAuditType(3);
+            tradeOrderAuditDO.setTenantId(tradeOrderDO.getTenantId());
+            tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus());
+                tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
+            tradeOrderAuditDO.setOrderId(tradeOrderDO.getId());
+            tradeOrderAuditMapper.insert(tradeOrderAuditDO);
+            //审核 不通过还原到修改前订单
+            tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("order_status", TradeOrderStatusEnum.UNPAID).set("audit_status", 5).eq("id", orderId));
+
+
+            Map<String, Object> extMap = new HashMap<>();
+            extMap.put("result", "审核不通过");
+            TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), tradeOrderDO.getOrderStatus(), extMap);
+
+        }
+        return CommonResult.success("审核成功");
+    }
+
 
     @Override
     @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.ORDER_AUDIT)

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

@@ -400,7 +400,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
                     return CommonResult.success(null);
                 }
                 Integer orderStatus = tradeOrderDO.getOrderStatus();
-                Asserts.isTrue(ObjectUtils.equalsAny(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), TradeOrderStatusEnum.INIT.getStatus(), TradeOrderStatusEnum.PAYING.getStatus(), TradeOrderStatusEnum.YD.getStatus()), 31000, "当前状态已变更不能取消订单{},状态{}", orderId, tradeOrderDO.getOrderStatus());
+                Asserts.isTrue(ObjectUtils.equalsAny(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus(), TradeOrderStatusEnum.INIT.getStatus(), TradeOrderStatusEnum.PAYING.getStatus(), TradeOrderStatusEnum.YD.getStatus(), TradeOrderStatusEnum.CANCEL_AUDIT.getStatus()), 31000, "当前状态已变更不能取消订单{},状态{}", orderId, tradeOrderDO.getOrderStatus());
                 //变更订单为取消
                 tradeOrderDO.setOrderStatus(TradeOrderStatusEnum.CANCELED.getStatus());
                 tradeOrderRepositoryService.cancelOrder(tradeOrderDO.getId());