结算单状态变更

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementOwnerEnum.java

@@ -95,8 +95,8 @@ public enum SettlementOwnerEnum {
     @AllArgsConstructor
     public enum SettlementPeriodType {
 
-        IMMEDIATE(10, "拉运完成结算"),
-        MONTH(10, "月结"),
+        IMMEDIATE(1, "拉运完成结算"),
+        MONTH(2, "月结"),
 
         ;
 

performance-api/src/main/java/com/clx/performance/param/pc/owner/UpdateStatusParam.java

+package com.clx.performance.param.pc.owner;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UpdateStatusParam {
+
+    @ApiModelProperty(value = "订单编号", example = "JS415")
+    private String orderNo;
+
+    @ApiModelProperty(value = "结算类型：1拉运完成结 2月结", example = "收款人")
+    private Integer settlementPeriodType;
+
+    @ApiModelProperty(value = "当前状态", example = "收款人")
+    private Integer fromStatus;
+
+    @ApiModelProperty(value = "目标状态", example = "收款人")
+    private Integer toStatus;
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerController.java

 package com.clx.performance.controller.pc.carrier;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
-import com.clx.performance.param.pc.owner.SaveExpressParam;
-import com.clx.performance.param.pc.owner.SavePayeeParam;
-import com.clx.performance.param.pc.owner.UploadInvoiceImgParam;
+import com.clx.performance.param.pc.owner.*;
 import com.clx.performance.service.settle.SettlementOwnerService;
 import com.clx.performance.vo.pc.carrier.settle.*;
 import com.msl.common.base.PageData;
@@ -109,6 +106,13 @@ public class CarrierSettlementOwnerController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "编辑结算单状态",notes = "<br>By:姜文业")
+    @PostMapping("/updateStatusByOrderNo")
+    public Result updateStatusByOrderNo(@RequestBody @Validated UpdateStatusParam param) {
+        settlementOwnerService.updateStatusByOrderNo(param.getOrderNo(), param.getSettlementPeriodType(), param.getFromStatus(), param.getToStatus());
+        return Result.ok();
+    }
+
 
 
 }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -188,4 +188,15 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
                 .set(SettlementOwner::getPaymentAmount, paymentAmount)
         );
     }
+
+    @Override
+    public boolean updateStatusByOrderNo(String orderNo, Integer settlementPeriodType,Integer fromStatus,Integer toStatus){
+        return update(lUdWrapper()
+                .eq(Objects.nonNull(orderNo),SettlementOwner::getOrderNo, orderNo)
+                .eq(SettlementOwner::getSettlementPeriodType, settlementPeriodType)
+                .eq(SettlementOwner::getStatus, fromStatus)
+                .set(SettlementOwner::getStatus, toStatus)
+        );
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDao.java

@@ -51,4 +51,11 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
                         @Param("paymentAmount")String paymentAmount);
 
 
+    boolean updateStatusByOrderNo(@Param("orderNo")String orderNo,
+                                  @Param("settlementPeriodType")Integer settlementPeriodType,
+                                  @Param("fromStatus")Integer fromStatus,
+                                  @Param("toStatus")Integer toStatus);
+
+
+
 }

performance-web/src/main/java/com/clx/performance/job/SettlementOwnerMontnJob.java

+package com.clx.performance.job;
+
+import com.clx.performance.enums.settle.SettlementOwnerEnum;
+import com.clx.performance.service.settle.SettlementOwnerService;
+import com.msl.common.job.JobLog;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class SettlementOwnerMontnJob {
+
+    @Autowired
+    SettlementOwnerService settlementOwnerService;
+
+    /**
+     * 月结货主结算单状态变更为锁定
+     */
+    @XxlJob("settlementOwnerMontnInit")
+    public void settlementOwnerMontnInit() {
+        try {
+            //所有月结的待锁定的货主结算单修改状态为锁定
+            settlementOwnerService.updateStatusByOrderNo(null,
+                    SettlementOwnerEnum.SettlementPeriodType.MONTH.getCode(),
+                    SettlementOwnerEnum.Status.TO_BE_LOCKED.getCode(),
+                    SettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode());
+        } catch (Exception e) {
+            log.warn("月结货主结算单状态变更为锁定，异常原因:{}",e);
+            JobLog.error("月结货主结算单状态变更为锁定，异常原因=====================", e);
+        }
+    }
+
+
+
+
+}

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java

@@ -321,4 +321,10 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 ,SettlementOwnerEnum.Status.PLATFORM_TO_PAYMENT.getCode());
     }
 
+    @Override
+    public void updateStatusByOrderNo(String orderNo, Integer settlementPeriodType, Integer fromStatus, Integer toStatus){
+        settlementOwnerDao.updateStatusByOrderNo( orderNo,  settlementPeriodType,  fromStatus,  toStatus);
+    }
+
+
 }

performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerService.java

@@ -46,5 +46,7 @@ public interface SettlementOwnerService {
 
     void savePayee(SavePayeeParam param);
 
+    void updateStatusByOrderNo(String orderNo, Integer settlementPeriodType, Integer fromStatus, Integer toStatus);
+
 
 }