区域公司/服务中心结算申请接口整改

leromro-core/src/main/java/com/leromro/core/service/IMainOrderService.java

@@ -3,8 +3,9 @@ package com.leromro.core.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.leromro.common.core.domain.R;
 import com.leromro.core.domain.MainOrders;
-import com.leromro.core.domain.dto.SettlementOrderDTO;
 import com.leromro.core.domain.dto.OrderRequestDTO;
+import com.leromro.core.domain.dto.SettlementOrderApplyDTO;
+import com.leromro.core.domain.dto.SettlementOrderDTO;
 import com.leromro.core.domain.dto.SettlementOrderListDTO;
 import com.leromro.core.domain.vo.*;
 
@@ -33,12 +34,24 @@ public interface IMainOrderService extends IService<MainOrders> {
     List<SettlementOrderListVO> selectSettlementOrderList(SettlementOrderListDTO settlementOrderListDTO);
 
     /**
-     * 修改订单区域公司结算状态状态
+     * 修改订单区域公司结算状态
      * @param mainOrderIds
      * @param status
      */
     void updateAreaSettlementStatus(List<Long> mainOrderIds, Integer status);
 
+    /**
+     * 提交结算申请时修改订单区域公司结算信息
+     * @param settlementOrderApplyDTO
+     */
+    void updateAreaSettlementInfo(SettlementOrderApplyDTO settlementOrderApplyDTO);
+
+    /**
+     * 提交结算申请时修改订单服务中心结算信息
+     * @param settlementOrderApplyDTO
+     */
+    void updateServiceCentreSettlementInfo(SettlementOrderApplyDTO settlementOrderApplyDTO);
+
     /**
      * 修改订单服务中心结算状态
      * @param mainOrderIds

leromro-core/src/main/java/com/leromro/core/service/impl/MainOrderServiceImpl.java

@@ -15,6 +15,7 @@ import com.leromro.common.exception.ServiceException;
 import com.leromro.common.utils.SecurityUtils;
 import com.leromro.core.domain.*;
 import com.leromro.core.domain.dto.OrderRequestDTO;
+import com.leromro.core.domain.dto.SettlementOrderApplyDTO;
 import com.leromro.core.domain.dto.SettlementOrderDTO;
 import com.leromro.core.domain.dto.SettlementOrderListDTO;
 import com.leromro.core.domain.vo.*;
@@ -351,6 +352,31 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
                 .eq(MainOrders::getMainOrderId, mainOrderIds));
     }
 
+    @Override
+    @Transactional
+    public void updateAreaSettlementInfo(SettlementOrderApplyDTO settlementOrderApplyDTO) {
+        this.update(new LambdaUpdateWrapper<MainOrders>()
+                .set(MainOrders::getAreaSettlementStatus,  AreaSettlementStatusEnum.PENDING_AUDIT.getCode())
+                .set(MainOrders::getAreaPayeeMethod, settlementOrderApplyDTO.getPayeeMethod())
+                .set(MainOrders::getAreaPayeeAccount, settlementOrderApplyDTO.getPayeeAccount())
+                .set(MainOrders::getAreaPayeeBankName, settlementOrderApplyDTO.getPayeeBankName())
+                .set(MainOrders::getAreaPayeeName, settlementOrderApplyDTO.getPayeeName())
+                .in(MainOrders::getMainOrderId, settlementOrderApplyDTO.getMainOrderIds())
+        );
+    }
+
+    @Override
+    public void updateServiceCentreSettlementInfo(SettlementOrderApplyDTO settlementOrderApplyDTO) {
+        this.update(new LambdaUpdateWrapper<MainOrders>()
+                .set(MainOrders::getServiceCentreSettlementStatus,  ServiceCentreSettlementStatusEnum.PENDING_AUDIT.getCode())
+                .set(MainOrders::getServiceCentrePayeeMethod, settlementOrderApplyDTO.getPayeeMethod())
+                .set(MainOrders::getServiceCentrePayeeAccount, settlementOrderApplyDTO.getPayeeAccount())
+                .set(MainOrders::getServiceCentrePayeeBankName, settlementOrderApplyDTO.getPayeeBankName())
+                .set(MainOrders::getServiceCentrePayeeName, settlementOrderApplyDTO.getPayeeName())
+                .in(MainOrders::getMainOrderId, settlementOrderApplyDTO.getMainOrderIds())
+        );
+    }
+
     @Override
     @Transactional
     public void updateServiceCentreSettlementStatus(List<Long> mainOrderIds, Integer status) {

leromro-core/src/main/java/com/leromro/core/service/impl/OrderSettlementApplicationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.leromro.core.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -206,21 +207,27 @@ public class OrderSettlementApplicationServiceImpl extends ServiceImpl<OrderSett
                     .payeeName(settlementOrderApplyDTO.getPayeeName())
                     .payeeRemark(settlementOrderApplyDTO.getPayeeRemark())
                     .build();
+            orderSettlementApplicationList.add(orderSettlementApplication);
         }
         this.saveBatch(orderSettlementApplicationList);
 
         // 变更订单结算状态
         if("3".equals(areaType)){
-            iMainOrderService.updateAreaSettlementStatus(settlementOrderApplyDTO.getMainOrderIds(), AreaSettlementStatusEnum.PENDING_AUDIT.getCode());
-        }
-        if("4".equals(areaType)){
-            iMainOrderService.updateServiceCentreSettlementStatus(settlementOrderApplyDTO.getMainOrderIds(), ServiceCentreSettlementStatusEnum.PENDING_AUDIT.getCode());
+            iMainOrderService.updateAreaSettlementInfo(settlementOrderApplyDTO);
+        }else if("4".equals(areaType)){
+            iMainOrderService.updateServiceCentreSettlementInfo(settlementOrderApplyDTO);
         }
     }
 
     @Override
     @Transactional
     public void auditorOrderSettlement(SettlementOrderAuditorDTO settlementOrderAuditorDTO) {
+        // 如果审核不通过，则审核备注必须填写
+        if(AuditorStatusEnum.AUDIT_NOT_PASS.getCode().equals(settlementOrderAuditorDTO.getAuditorStatus())
+                && StrUtil.isBlank(settlementOrderAuditorDTO.getAuditorRemark())){
+            throw new ServiceException("审核不通过，审核备注必须填写");
+        }
+
         // 获取当前用户id
         Long userId = SecurityUtils.getUserId();
         // 获取用户信息