Merge branch 'master' into dev

# Conflicts:
#	hx-sale/src/main/java/com/fjhx/sale/entity/sale/po/SaleQuotation.java

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

@@ -131,7 +131,7 @@ public class SaleQuotation extends BasePo {
     private String currency;
 
     /**
-     * 客户标签
+     * 币种（字典account_currency）
      */
     private String tag;
 

hx-sale/src/main/java/com/fjhx/sale/entity/sale/vo/SaleQuotationVo.java

@@ -99,5 +99,8 @@ public class SaleQuotationVo extends SaleQuotation {
      */
     private Long flowId;
 
-
+    /**
+     * 客户标签
+     */
+    private String tag;
 }

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

@@ -3,6 +3,8 @@ package com.fjhx.sale.flow;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.*;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.utils.Assert;
@@ -58,6 +60,9 @@ public class ContractUpdateFlow extends FlowDelegate {
     private ClaimContractService claimContractService;
 
     @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
+
+    @Autowired
     private ClaimService claimService;
 
     @Autowired
@@ -284,6 +289,23 @@ public class ContractUpdateFlow extends FlowDelegate {
         List<ClaimContract> claimContractList = claimContractService.list(Wrappers.<ClaimContract>query().lambda().eq(ClaimContract::getContractId,oldContractId));
         List<Long> claimIds = claimContractList.stream().map(ClaimContract::getClaimId).collect(Collectors.toList());
         List<Long> claimContractIds = claimContractList.stream().map(ClaimContract::getId).collect(Collectors.toList());
+        //取出到账认领数据
+        List<Claim> claims = claimService.list(q -> q.in(Claim::getId, claimIds));
+        for(Claim c : claims){
+            //查询流水数据
+            AccountRunningWater accountRunningWater = accountRunningWaterService.getById(c.getBusinessId());
+            BigDecimal sumClaimMoney = accountRunningWater.getClaimAmount().add(c.getAmount());
+            //更新流水数据为认领状态---已认领金额还原
+            AccountRunningWater water = new AccountRunningWater();
+            if(accountRunningWater.getAmount().compareTo(sumClaimMoney)>0){
+                water.setIsClaim(2);//部分认领
+            }else{
+                water.setIsClaim(0);//未认领
+            }
+            water.setId(c.getBusinessId());
+            water.setClaimAmount(sumClaimMoney);
+            accountRunningWaterService.updateById(water);
+        }
         //删除到账认领数据
         claimContractService.remove(q -> q.in(ClaimContract::getId, claimContractIds));
         //删除到账认领数据

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

@@ -114,6 +114,7 @@ import java.util.stream.Collectors;
 public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         implements ContractService, GetDocumentaryBusinessTemplate {
 
+    public static final int VALUE = 20;
     private static final SimpleDateFormat sdf = new SimpleDateFormat("dd/MMM/yyyy", Locale.ENGLISH);
 
     @Qualifier(ThreadPoolConfig.threadPoolTaskExecutor)
@@ -220,9 +221,14 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         }
         if(StringUtils.isNotEmpty(dto.getIsArrival())){
             if(StringUtils.equals(dto.getIsArrival(),"1")){//已到账----//预付比例等于0||到账认领金额 >= 合同金额 * 预付比例%
-                wrapper.eq("t1",Contract::getAdvanceRatio,"0").or().eq("t1.refundStatusNew",20);
+                wrapper.and(c -> {
+                    c.eq(Contract::getAdvanceRatio, "0").or();
+                    c.eq("t1.refundStatusNew", 20);
+                });
+
             }else{
-                wrapper.ne("t1",Contract::getAdvanceRatio,"0").ne("t1.refundStatusNew",20);
+                wrapper.ne("t1",Contract::getAdvanceRatio,"0");
+                wrapper.ne("t1.refundStatusNew",20);
             }
         }
         Page<ContractVo> page = baseMapper.getProfitSettlement(dto.getPage(),wrapper);

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsPdfServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.service.documents.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.sale.entity.documents.po.DocumentsPdf;
 import com.fjhx.sale.mapper.documents.DocumentsPdfMapper;
 import com.fjhx.sale.service.documents.DocumentsPdfService;
@@ -32,10 +33,15 @@ public class DocumentsPdfServiceImpl extends ServiceImpl<DocumentsPdfMapper, Doc
         return page;
     }
 
+    /**
+     * 查询详情
+     * @param id 单证ID
+     * @return
+     */
     @Override
     public DocumentsPdfVo detail(Long id) {
-        DocumentsPdf DocumentsPdf = this.getById(id);
-        DocumentsPdfVo result = BeanUtil.toBean(DocumentsPdf, DocumentsPdfVo.class);
+        DocumentsPdf documentsPdf = this.getOne(Wrappers.<DocumentsPdf>query().lambda().eq(DocumentsPdf::getDocumentId,id).eq(DocumentsPdf::getDataType,1));
+        DocumentsPdfVo result = BeanUtil.toBean(documentsPdf, DocumentsPdfVo.class);
         return result;
     }