WMS生成费用单接口调整付款主体逻辑

cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/LogisticsFinansysDto.java

@@ -10,6 +10,8 @@ public class LogisticsFinansysDto {
     private String bankname; // 银行名称
     private String bankcard; // 银行卡号
     private String bankuser; // 银行持卡人
+    private Integer paycompanyvalue; // 付款主体值
+    private String paycompanyname; // 付款主体名称
 
     public Integer getId() {
         return id;
@@ -59,6 +61,22 @@ public class LogisticsFinansysDto {
         this.bankuser = bankuser;
     }
 
+    public Integer getPaycompanyvalue() {
+        return paycompanyvalue;
+    }
+
+    public void setPaycompanyvalue(Integer paycompanyvalue) {
+        this.paycompanyvalue = paycompanyvalue;
+    }
+
+    public String getPaycompanyname() {
+        return paycompanyname;
+    }
+
+    public void setPaycompanyname(String paycompanyname) {
+        this.paycompanyname = paycompanyname;
+    }
+
     @Override
     public String toString() {
         return "LogisticsFinansysDto{" +
@@ -68,6 +86,8 @@ public class LogisticsFinansysDto {
                 ", bankname='" + bankname + '\'' +
                 ", bankcard='" + bankcard + '\'' +
                 ", bankuser='" + bankuser + '\'' +
+                ", paycompanyvalue='" + paycompanyvalue + '\'' +
+                ", paycompanyname='" + paycompanyname + '\'' +
                 '}';
     }
 }

cost-service/src/main/java/com/blt/other/module/cost/dao/CostCompanyDao.java

@@ -33,6 +33,14 @@ public interface CostCompanyDao extends BaseMapper<CostCompanyDomain> {
     List<CostCompanyDomain> selectByNameOrValue(CostCompanyDomain costCompanyDomain);
 
     /**
+     * 通过 companyValue 获取主体
+     *
+     * @param value
+     * @return
+     */
+    CostCompanyDomain selectByValue(Integer value);
+
+    /**
      * 通过 companyNo 获取主体
      *
      * @param no

cost-service/src/main/java/com/blt/other/module/cost/service/impl/CostApiServiceImpl.java

@@ -98,11 +98,7 @@ public class CostApiServiceImpl implements CostApiService {
                 // 没有二级，只有一级
                 for (LogisticsFinansysDto logistics : logisticsList) {
                     if (logistics.getId().intValue() == logisticsCostDto.getLogisticsSupplierId().intValue()) {
-                        costDomain.setLogisticsSupplierId(logistics.getId());
-                        costDomain.setBankCompany(logistics.getName());
-                        costDomain.setBankCardUser(logistics.getBankuser());
-                        costDomain.setBankCard(logistics.getBankcard());
-                        costDomain.setBankName(logistics.getBankname());
+                        this.setLogistics(costDomain, logistics);
                         break;
                     }
                 }
@@ -113,11 +109,7 @@ public class CostApiServiceImpl implements CostApiService {
                         costDomain.setSubLogisticsSupplierId(subLogistics.getId());
                         for (LogisticsFinansysDto logistics : logisticsList) {
                             if (logistics.getId().intValue() == subLogistics.getParentid().intValue()) {
-                                costDomain.setLogisticsSupplierId(logistics.getId());
-                                costDomain.setBankCompany(logistics.getName());
-                                costDomain.setBankCardUser(logistics.getBankuser());
-                                costDomain.setBankCard(logistics.getBankcard());
-                                costDomain.setBankName(logistics.getBankname());
+                                this.setLogistics(costDomain, logistics);
                                 break;
                             }
                         }
@@ -449,4 +441,22 @@ public class CostApiServiceImpl implements CostApiService {
                 })
                 .collect(Collectors.toList());
     }
+
+    private void setLogistics(CostDomain costDomain,LogisticsFinansysDto logistics) {
+        if (costDomain != null && logistics != null) {
+            costDomain.setLogisticsSupplierId(logistics.getId());
+            costDomain.setBankCompany(logistics.getName());
+            costDomain.setBankCardUser(logistics.getBankuser());
+            costDomain.setBankCard(logistics.getBankcard());
+            costDomain.setBankName(logistics.getBankname());
+            if (logistics.getPaycompanyvalue() != null) {
+                CostCompanyDomain costCompanyDomain = costCompanyDao.selectByValue(logistics.getPaycompanyvalue());
+                if (costCompanyDomain != null) {
+                    costDomain.setCompanyNo(costCompanyDomain.getCompanyNo());
+                    costDomain.setCompanyValue(costCompanyDomain.getValue());
+                    costDomain.setCompanyName(costCompanyDomain.getCompanyName());
+                }
+            }
+        }
+    }
 }

cost-service/src/main/resources/mapper/CostCompanyMapper.xml

@@ -9,7 +9,11 @@
              #{companyNo}, #{companyName}, #{value}
                 )
     </insert>
-
+    <select id="selectByValue" resultType="com.blt.other.database.model.CostCompanyDomain">
+        SELECT *
+        FROM cost_company
+        WHERE value = #{value}
+    </select>
     <select id="selectByNameOrValue" resultType="com.blt.other.database.model.CostCompanyDomain">
         SELECT *
         FROM cost_company