# update

cost-service/src/main/java/com/blt/other/database/model/CostPlanDomain.java

@@ -30,7 +30,6 @@ public class CostPlanDomain implements Serializable {
     private Integer id;
     @ApiModelProperty("费用计划编号")
     private String costPlanNo;
-
     @ApiModelProperty("0 不抵扣个税  1 抵扣个税")
     private Integer isTax;
 
@@ -51,9 +50,8 @@ public class CostPlanDomain implements Serializable {
     @ApiModelProperty("类型标题")
     private String typeName;
 
-//    @TableField(exist = false)
-//    private CostTypeDomain costType;
 
+    @TableField(exist = false)
     private Integer accountingSubjectId;
     @TableField(exist = false)
     @ApiModelProperty("会计一级科目")
@@ -62,9 +60,6 @@ public class CostPlanDomain implements Serializable {
     @ApiModelProperty("会计一级科目")
     private String accountingSubjectName;
 
-//    @TableField(exist = false)
-//    private AccountingSubject accountingSubject;
-
 
     @ApiModelProperty("创建人id")
     private Integer createUserid;
@@ -100,7 +95,7 @@ public class CostPlanDomain implements Serializable {
     @ApiModelProperty("一级物流供应商ID")
     private Integer logisticsSupplierId;
 
-    @ApiModelProperty("收款银行（平台）")
+    @ApiModelProperty("收款银行（平台")
     private String bankName;
     @ApiModelProperty("收款账户")
     private String bankCard;

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

@@ -146,6 +146,9 @@ public abstract class AbstractCostService implements CostService {
     @Override
     public CostDomain getCostByCostNo(String costNo) {
         CostDomain costDomain = costDao.selectByCostNo(costNo);
+        if (costDomain == null) {
+            return null;
+        }
         costDomain.setCostTemplate(costTemplateService.queryDetail(costDomain.getCostTemplateId()));
 
         Integer currentUserId = SessionUtils.getCurrentUserId();

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

@@ -116,7 +116,7 @@ public abstract class AbstractCostPlanService implements CostPlanService {
             });
         }
 
-        CostTypeDomain costTypeDomain = costTypeDao.selectById(costPlanDomain.getId());
+        CostTypeDomain costTypeDomain = costTypeDao.selectByNo(costPlanDomain.getTypeNo());
         costPlanDomain.setAccountingSubjectId(costTypeDomain.getAccountingSubjectId());
 
     }

cost-service/src/test/java/com/blt/other/cost.http

+GET http://api.fee.bailuntec.com//purchase/other/cost/api/manageCostList?startDate=2020-09-01%2000:00:00&endDate=2020-10-01%2000:00:00
+Accept: application/json
+
+
+###
+POST http://api.fee.bailuntec.com/purchase/other/cost/check/CashierCallbackUrl
+Content-Type: application/json
+
+{
+  "data": {
+    "Success": true,
+    "Message": "FC2008280369出纳单(金额：27825.79)被通过",
+    "Data": "{\"payid\":216603,\"payno\":\"FC2008280369\",\"payamount\":27825.79,\"payuserid\":0,\"payusername\":\"陈泽凯\",\"paynote\":\"\",\"paydetail\":{\"cashier_bankaccountid\":252,\"cashier_bankname\":\"富友支付\",\"cashier_bankcard\":\"chengwenai@bailuntec.com\",\"cashier_bankcardname\":\"香港百伦科技有限公司\",\"cashier_unitcode\":\"CNY\",\"cashier_unitname\":\"人民币\",\"cashier_rate\":1.0000,\"cashier_paymoney\":27825.79,\"cashier_paymoneyrmb\":27825.79,\"cashier_servicemoneyrmb\":1.00,\"otherordercode\":\"\",\"cashier_annex\":\"http://finansys.oa.com//uploadfile/buyfile/2020/8/28/20200828180734-F025271.png\",\"cashier_bankcardtype\":0,\"cashier_mothercard\":\"\"}}"
+  },
+  "id": "F025271"
+}
+
+###
+
+
+
+
+POST http://api.fee.bailuntec.com/purchase/other/cost/check/CashierCallbackUrl
+Content-Type: application/json
+
+{
+  "data": {
+    "Success": true,
+    "Message": "FC2008280369出纳单(金额：27825.79)被通过",
+    "Data": {
+      "payid": 216603,
+      "payno": "FC2008280369",
+      "payamount": 27825.79,
+      "payuserid": 0,
+      "payusername": "陈泽凯",
+      "paynote": "",
+      "paydetail": {
+        "cashier_bankaccountid": 252,
+        "cashier_bankname": "富友支付",
+        "cashier_bankcard": "chengwenai@bailuntec.com",
+        "cashier_bankcardname": "香港百伦科技有限公司",
+        "cashier_unitcode": "CNY",
+        "cashier_unitname": "人民币",
+        "cashier_rate": 1.0000,
+        "cashier_paymoney": 27825.79,
+        "cashier_paymoneyrmb": 27825.79,
+        "cashier_servicemoneyrmb": 1.00,
+        "otherordercode": "",
+        "cashier_annex": "http://finansys.oa.com//uploadfile/buyfile/2020/8/28/20200828180734-F025271.png",
+        "cashier_bankcardtype": 0,
+        "cashier_mothercard": ""
+      }
+    }
+  },
+  "id": "F025271"
+}
+
+###
+POST http://api.fee.bailuntec.com/purchase/other/cost/check/CashierCallbackUrl