# fee

cost-service/src/main/java/com/blt/other/module/cost/model/CostDetailDomain.java

@@ -20,10 +20,15 @@ public class CostDetailDomain {
     private String costNo;
 
 
+    @ApiModelProperty("类型id")
+    private Integer typeId;
     @ApiModelProperty("类型编号")
     private String typeNo;
     @ApiModelProperty("类型标题")
     private String typeName;
+
+    @ApiModelProperty("会计科目id")
+    private Integer accountingSubjectId;
     @ApiModelProperty("会计一级科目")
     private String accountingSubjectNo;
     @ApiModelProperty("会计一级科目")

cost-service/src/main/java/com/blt/other/module/cost/model/CostDomain.java

@@ -68,10 +68,16 @@ public class CostDomain implements Serializable {
     @ApiModelProperty("主体名称")
     private String companyName;
 
+    @ApiModelProperty("类型id")
+    private Integer typeId;
     @ApiModelProperty("类型编号")
     private String typeNo;
     @ApiModelProperty("类型标题")
     private String typeName;
+
+
+    @ApiModelProperty("会计科目id")
+    private Integer accountingSubjectId;
     @ApiModelProperty("会计一级科目")
     private String accountingSubjectNo;
     @ApiModelProperty("会计一级科目")

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

@@ -60,15 +60,15 @@ public class CostApiServiceImpl implements CostApiService {
         CostDomain costDomain = new CostDomain();
         String costNo = CostUtils.getIdNum();
         costDomain.setCostNo(costNo);
-        costDomain.setCostForm(costForm); // 付款费用单 1付款  2收款  3借支/借还
-        costDomain.setCostStatus(0); //  0 待提交 1待审核 2待出纳付款 3被驳回 4已支付 5已作废
+        // 付款费用单 1付款  2收款  3借支/借还
+        costDomain.setCostForm(costForm);
+        //  0 待提交 1待审核 2待出纳付款 3被驳回 4已支付 5已作废
+        costDomain.setCostStatus(0);
         costDomain.setCostRemark(logisticsCostDto.getCostRemark() + "【WMS系统推送】");
         costDomain.setCostReason(logisticsCostDto.getCostReason());
         costDomain.setTypeNo("CTN1809180519188");
         costDomain.setTypeName("销售费用/物流费");
-//        costDomain.setKindNo("CTK1809181719182");
-//        costDomain.setKindName("物流费");
-//        costDomain.setSubjectCode("660104");
+
         costDomain.setCompanyName("香港百伦科技有限公司");
         costDomain.setCompanyNo("COM1806191800013");
         costDomain.setAmount(logisticsCostDto.getAmount());
@@ -180,6 +180,7 @@ public class CostApiServiceImpl implements CostApiService {
         //类型信息
         CostTypeDomain costTypeDomain = costTypeDao.selectByNameAndType("工资", CostTypeDomain.feeType);
         AccountingSubject accountingSubject = accountingSubjectMapper.selectByNo(costTypeDomain.getAccountingSubjectNo());
+
         costDomain.setTypeNo(costTypeDomain.getTypeName());
         costDomain.setTypeName(costTypeDomain.getTypeName());
         costDomain.setAccountingSubjectNo(accountingSubject.getSubjectNo());

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

@@ -224,8 +224,6 @@ public abstract class AbstractCostService implements CostService {
             CostDomain costDomain = costDao.selectByCostNo(costNo);
             costDomain.setAmount(amount);
 
-//            costDomain.setKindNo(costDetailDomains.get(0).getKindNo());
-//            costDomain.setKindName(costDetailDomains.get(0).getKindName());
             BigDecimal toRmbRate = CurUtils.getCur(costDomain.getDic(), "CNY");
             costDomain.setToRmbRate(toRmbRate);
             costDomain.setAmountRmb(costDomain.getAmount().multiply(toRmbRate).setScale(2, BigDecimal.ROUND_HALF_UP));

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

@@ -77,8 +77,8 @@ public abstract class AbstractCostPlanService implements CostPlanService {
      * </p>>
      */
     public void doSaveFinanceRecord(CostPlanDomain planDomain) {
-        UserCostFinansysDomain finansyRecordByCostDomain = userCostFinansysService.createFinanceRecordByCostPlanDomain(planDomain);
-        userCostFinansysService.saveFinancesRecord(finansyRecordByCostDomain);
+        UserCostFinansysDomain financeRecordByCostDomain = userCostFinansysService.createFinanceRecordByCostPlanDomain(planDomain);
+        userCostFinansysService.saveFinancesRecord(financeRecordByCostDomain);
     }
 
     @Resource
@@ -178,8 +178,6 @@ public abstract class AbstractCostPlanService implements CostPlanService {
         return result;
     }
 
-    @Resource
-    OaUserMapper oaUserMapper;
 
     protected CostDomain planToCost(String costPlanNo) {
         CostDomain costDomain = new CostDomain();

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

@@ -3,11 +3,11 @@ package com.blt.other.module.cost.service.impl.costplan;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.blt.other.common.exception.BizRuntimeException;
 import com.blt.other.common.util.CurUtils;
+import com.blt.other.database.model.CostPlanDomain;
+import com.blt.other.database.model.CostPlanTempDomain;
 import com.blt.other.database.model.CostTypeDomain;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.service.CostPlanService;
-import com.blt.other.database.model.CostPlanDomain;
-import com.blt.other.database.model.CostPlanTempDomain;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -29,6 +29,7 @@ import java.time.LocalDateTime;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class CostPlanNewLend2ServiceImpl extends AbstractCostPlanService implements CostPlanService {
+
     @Override
     public void save(CostPlanDomain planDomain) {
         this.doSaveFinanceRecord(planDomain);

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

@@ -104,6 +104,7 @@ public class CostPlanNewPayServiceImpl extends AbstractCostPlanService implement
             }
             costDomain.setCostNo(costNo);
             costDomain.setTypeNo(typeNo);
+            costDomain.setTypeId(costDetailDomains.get(0).getTypeId())
             costDomain.setTypeName(costDetailDomains.get(0).getTypeName());
             costDomain.setAccountingSubjectNo(costDetailDomains.get(0).getAccountingSubjectNo());
             costDomain.setAccountingSubjectName(costDetailDomains.get(0).getAccountingSubjectName());