用户删除订单修复、采购订单凭证审批修复

src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java

 package com.mmc.oms.service.uav.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.mmc.oms.client.PmsClient;
 import com.mmc.oms.common.BizException;
 import com.mmc.oms.common.ResultEnum;
@@ -278,6 +279,9 @@ public class UavOrderServiceImpl implements UavOrderService {
     @Override
     public ResultBody close(Integer id, String token) {
         UavOrderDO uavOrderDO = uavOrderDao.detail(id);
+        if (uavOrderDO.getStatusCode().compareTo(UavOrderStatus.PAYING.getCode()) > 0) {
+            return ResultBody.error("请联系客服");
+        }
         // 退云享金、佣金
         if (uavOrderDO.getShareAmount().compareTo(BigDecimal.ZERO) > 0 || uavOrderDO.getSalaryAmount().compareTo(BigDecimal.ZERO) > 0) {
             PayUavWalletVO payUavWalletVO = new PayUavWalletVO();
@@ -636,8 +640,8 @@ public class UavOrderServiceImpl implements UavOrderService {
     @Override
     public ResultBody removeUavOrder(Integer id) {
         UavOrderDO uavOrderDO = uavOrderDao.detail(id);
-        if (!uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.FINISH.getCode().toString()) ||
-                !uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.CLOSE.getCode().toString())) {
+        log.info("uavOrderDO:{}", JSONObject.toJSONString(uavOrderDO));
+        if (uavOrderDO.getStatusCode().compareTo(UavOrderStatus.FINISH.getCode()) < 0) {
             return ResultBody.error("不可删除！");
         }
         uavOrderDao.closeShowUavOrder(id);

src/main/java/com/mmc/oms/service/uav/impl/UavPOServiceImpl.java

@@ -172,7 +172,8 @@ public class UavPOServiceImpl implements UavPOService {
     public ResultBody checkPay(UavOrderPayVO uavOrderPayVO) {
         UavPurchaseOrderPayDO uavPurchaseOrderPayDO = uavPODao.getUavPOrderPayById(uavOrderPayVO.getId());
         UavPurchaseOrderDO uavPOrder = uavPODao.getUavPOrder(uavPurchaseOrderPayDO.getUavPOrderId());
-        if (uavOrderPayVO.getCheckStatus().equals(1) && uavPOrder.getStatusCode().equals(UavOrderStatus.FINISH_PAYING.getCode())) {
+        if (uavOrderPayVO.getCheckStatus().equals(1) &&
+                uavPOrder.getStatusCode().equals(UavOrderStatus.FINISH_PAYING.getCode())) {
             // 只有待付款凭证需要修改状态
             this.updateUavPOrderStatus(uavPOrder.getId(), UavOrderStatus.FINISH_PAYING);
         }

src/main/resources/mapper/uav/UavPODao.xml

@@ -29,7 +29,7 @@
     </sql>
 
     <sql id="uav_purchase_order_pay_column">
-        id, uav_purchase_order_id, pay_img_list, check_status, pay_remark, refuse_reason, create_time, check_time
+        id, uav_purchase_order_id as uavPOrderId, pay_img_list, check_status, pay_remark, refuse_reason, create_time, check_time
     </sql>
     
     <insert id="addPurchaseOrder" parameterType="com.mmc.oms.entity.uav.UavPurchaseOrderDO" keyProperty="id"