添加结清字段

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -303,14 +303,12 @@ public class ContractController {
         contractService.editContractRemark(contractVo);
     }
 
-
     /**
-     * 根据合同id获取合同的资金流水信息
+     * 合同结清
      */
-    @PostMapping("/111")
-    public void tt111(@RequestBody ContractDto dto) {
-        dto.setCreateUser(133333333333333L);
-        contractService.save(dto);
+    @PostMapping("/settle")
+    public void settle(@RequestBody ContractDto dto) {
+        contractService.settle(dto);
     }
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractSelectDto.java

@@ -78,4 +78,9 @@ public class ContractSelectDto extends BaseSelectDto {
      * 产品id过滤
      */
     private String productId;
+
+    /**
+     * 是否结清 1是0否
+     */
+    private Integer isSettled;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -406,4 +406,9 @@ public class Contract extends BasePo {
      */
     private Long flowId;
 
+    /**
+     * 是否结清 1是0否
+     */
+    private Integer isSettled;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

@@ -217,4 +217,9 @@ public interface ContractService extends BaseService<Contract> {
      * 添加备注
      */
     void editContractRemark(ContractVo contractVo);
+
+    /**
+     * 合同结清
+     */
+    void settle(ContractDto dto);
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -355,6 +355,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
         //产品id过滤
         wrapper.eq("t1.product_id", dto.getProductId());
+
+        //是否结清过滤
+        wrapper.eq("t1", Contract::getIsSettled, dto.getIsSettled());
     }
 
     /**
@@ -2324,4 +2327,17 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         System.out.println(d1);
     }
 
+    /**
+     * 合同结清
+     */
+    @Override
+    public void settle(ContractDto dto) {
+        contractService.update(q -> q
+                .eq(Contract::getId, dto.getId())
+                .set(Contract::getIsSettled, 1)
+                .set(Contract::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
 }