Merge branch 'test' into dev

hx-account/src/main/java/com/fjhx/account/service/write/impl/WriteOffRecordsServiceImpl.java

@@ -24,6 +24,7 @@ import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -77,6 +78,8 @@ public class WriteOffRecordsServiceImpl extends ServiceImpl<WriteOffRecordsMappe
         Assert.notEmpty(accountPayment, "查询不到打款信息");
         //修改打款状态为未打款
         accountPayment.setStatus("20");
+        //清空已打款金额
+        accountPayment.setAmount(BigDecimal.ZERO);
         accountPaymentService.updateById(accountPayment);
 
         //赋值最后一次打款时间

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

@@ -45,6 +45,11 @@ public class ContractSelectDto extends BaseSelectDto {
     private String refundStatusNew;
 
     /**
+     * 到款状态
+     */
+    private String isClaim;
+
+    /**
      * 合同类型
      */
     private String contractType;

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -93,7 +93,8 @@ public class ContractUpdateFlow extends FlowDelegate {
 
         contract.setIssue("1");//默认直接下发到交接单
 
-        contract.setFlowId(flowId);
+        contract.setFlowId(flowId);//赋值新合同流程ID
+
 
         // 原合同id不能为空
         Long oldContractId = contract.getOldContractId();
@@ -107,6 +108,7 @@ public class ContractUpdateFlow extends FlowDelegate {
         }
         //更新原样品单状态为变更中
         oldContract.setStatus(FlowStatusEnum1.UPDATE_LOADING.getKey());
+
         contractService.updateById(oldContract);
         //查询旧合同的订单产品
         List<ContractProduct> oldContractProductList = contractProductService.list(q -> q.eq(ContractProduct::getContractId, oldContractId));

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

@@ -322,6 +322,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (StringUtils.isNotEmpty(dto.getSellCorporationId())) {
             wrapper.eq("t1", Contract::getSellCorporationId, dto.getSellCorporationId());
         }
+        if(StringUtils.isNotEmpty(dto.getIsClaim())){
+            wrapper.ne("t1.refundStatusNew",20);
+        }
         if (StringUtils.isNotEmpty(dto.getRefundStatusNew())) {
             wrapper.in("t1.refundStatusNew", Arrays.asList(dto.getRefundStatusNew().split(",")));
         }