1.更新销售合同回款明细

src/main/java/com/galaxis/manatee/dao/ChuanyunClientDao.java

@@ -11,5 +11,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface ChuanyunClientDao extends GalaxisRepository<ChuanyunClientDO,String> {
-    ChuanyunClientDO findByName(String name);
+    ChuanyunClientDO findByClientCode(String clientcode);
 }

src/main/java/com/galaxis/manatee/task/U9InfoTask.java

@@ -39,25 +39,27 @@ public class U9InfoTask {
     private final ChuanyunBudgetStatisticsDao chuanyunBudgetStatisticsDao;
     private final ChuanyunCompanyDao chuanyunCompanyDao;
     private final ChuanyunClientDao chuanyunClientDao;
+    private final ChuanyunUserDao chuanyunUserDao;
 
 
-    public U9InfoTask(ChuanYunManager chuanYunManager, ClawFeign clawFeign, ChuanyunBudgetStatisticsDao chuanyunBudgetStatisticsDao, ChuanyunCompanyDao chuanyunCompanyDao, ChuanyunClientDao chuanyunClientDao) {
+    public U9InfoTask(ChuanYunManager chuanYunManager, ClawFeign clawFeign, ChuanyunBudgetStatisticsDao chuanyunBudgetStatisticsDao, ChuanyunCompanyDao chuanyunCompanyDao, ChuanyunClientDao chuanyunClientDao, ChuanyunUserDao chuanyunUserDao) {
         this.chuanYunManager = chuanYunManager;
         this.clawFeign = clawFeign;
         this.chuanyunBudgetStatisticsDao = chuanyunBudgetStatisticsDao;
         this.chuanyunCompanyDao = chuanyunCompanyDao;
         this.chuanyunClientDao = chuanyunClientDao;
+        this.chuanyunUserDao = chuanyunUserDao;
     }
 
     @Scheduled(fixedDelay = 3600000L)
     private void getDataFromU9() {
-        saveSalesCollection();
-        saveSalesContract();
         savePurCost();
         saveCashFlow();
         saveSupplier();
         saveLaborCost();
         saveBudgetStatistics();
+        saveSalesCollection();
+        saveSalesContract();
     }
 
     /**
@@ -139,10 +141,14 @@ public class U9InfoTask {
                     if (!StringUtils.isEmpty(chuanyunSalesContractDTO.getOrgname())){
                         chuanyunSalesContractDTO.setOrgname(chuanyunCompanyDao.findByCompanyName(chuanyunSalesContractDTO.getOrgname()).getObjectId());
                     }
-                    if (StringUtils.isEmpty(chuanyunSalesContractDTO.getCustname())){
-                        chuanyunSalesContractDTO.setCustname(chuanyunClientDao.findByName(chuanyunSalesContractDTO.getCustname()).getObjectId());
+                    if (chuanyunClientDao.findByClientCode(chuanyunSalesContractDTO.getCustname())!=null){
+                        chuanyunSalesContractDTO.setCustname(chuanyunClientDao.findByClientCode(chuanyunSalesContractDTO.getCustname()).getObjectId());
+                    }
+                    if (!StringUtils.isEmpty(chuanyunSalesContractDTO.getCreatedby())){
+                        chuanyunSalesContractDTO.setCreatedby(chuanyunUserDao.findByName(chuanyunSalesContractDTO.getCreatedby()).getObjectId());
                     }
                     SalesContractDTO salesContractDTO = new SalesContractDTO(chuanyunSalesContractDTO);
+                    salesContractDTO.setContractStatus("已完结");
                     DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
                     String newDate = dateTimeFormatter.format(chuanyunSalesContractDTO.getBusinessdate());
                     LocalDateTime dt = LocalDateTime.parse(newDate,dateTimeFormatter);
@@ -222,6 +228,13 @@ public class U9InfoTask {
                             SalesCollectionDTO salesCollectionDTO = new SalesCollectionDTO();
                             //销售合同id
                             salesCollectionDTO.setSaleContractId(chuanyunSaleContractDO.getObjectId());
+                            //剩余回款金额
+                            salesCollectionDTO.setSurplusAmount(chuanyunSaleContractDO.getTotalAmount());
+                            //累计回款金额
+                            BigDecimal amount = new BigDecimal(0);
+                            salesCollectionDTO.setCumulativeAmount(amount);
+                            //合同编号
+                            salesCollectionDTO.setContractCode(chuanyunSaleContractDO.getContractCode());
                             //回款计划
                             Set<ReceivePlanDTO> receivePlanDTOS = new HashSet<>();
                             collectionDetailDTOList.forEach(chuanyunSalesCollectionDetailDTO -> {
@@ -673,6 +686,9 @@ public class U9InfoTask {
         @JsonProperty("F0000072")
         private String contractCreator;
 
+        @JsonProperty("F0000076")
+        private String contractStatus;
+
         @JsonProperty("F0000062")
         private String salesManagerDepartment;
 
@@ -841,6 +857,15 @@ public class U9InfoTask {
         @JsonProperty("F0000001")
         private String saleContractId;
 
+        @JsonProperty("F0000002")
+        private String contractCode;
+
+        @JsonProperty("F0000027")
+        private BigDecimal surplusAmount;
+
+        @JsonProperty("F0000012")
+        private BigDecimal cumulativeAmount;
+
         @JsonProperty("D001789F2a010fe1818a4020b1ff5a33533f9e44")
         @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,fetch = FetchType.EAGER)
         private Set<ReceivePlanDTO> planList;