修改借支单业务

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

@@ -206,7 +206,7 @@ public abstract class AbstractCostService implements CostService {
                 CostDetailDomain detailDomain = new CostDetailDomain();
                 BeanUtils.copyProperties(costDomain, detailDomain);
                 BeanUtils.copyProperties(costDetailDomain, detailDomain);
-                detailDomain.setDetailNo(costDomain.getCostPlanNo() + "-" + i);
+                detailDomain.setDetailNo(costDomain.getCostNo() + "-" + (i + 1));
                 costDetailDao.insert(detailDomain);
             }
         }

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

@@ -5,7 +5,10 @@ import com.bailuntec.api.bailuntec.cw.request.PostApplyReq;
 import com.bailuntec.api.bailuntec.cw.response.CwResult;
 import com.bailuntec.common.BeanUtils;
 import com.bailuntec.common.JsonUtilByJackson;
+import com.blt.other.common.exception.BizRuntimeException;
 import com.blt.other.common.exception.RpcException;
+import com.blt.other.common.util.CurUtils;
+import com.blt.other.module.cost.model.CostDetailDomain;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.service.CostService;
 import com.blt.other.module.cost.vo.TofinanceVo;
@@ -13,8 +16,10 @@ import com.blt.other.database.model.CostTofinanceDomain;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -40,15 +45,33 @@ public class Lend1CostServiceImpl extends AbstractCostService implements CostSer
         req.setApplyType("" + 1);
 
         List<ApplyMoneyDetail> applyMoneyDetailList = new ArrayList<>();
+        if (cost.getCostDetailDomainList() != null && cost.getCostDetailDomainList().size() > 0){
+            for (CostDetailDomain costDetailDomain: cost.getCostDetailDomainList()) {
+                ApplyMoneyDetail applyMoneyDetail = new ApplyMoneyDetail();
+                applyMoneyDetail.setName("借支单付款");
+                applyMoneyDetail.setTypeName(costDetailDomain.getTypeName());
+                applyMoneyDetail.setCategoryName(costDetailDomain.getCategoryName());
+                applyMoneyDetail.setUnitCode(costDetailDomain.getDic());
+                applyMoneyDetail.setUnitName(costDetailDomain.getDic());
+                applyMoneyDetail.setMoney(costDetailDomain.getAmount());
+                BigDecimal toRmbRate = CurUtils.getCur(costDetailDomain.getDic(), "CNY");
+                if (BigDecimal.ZERO.compareTo(toRmbRate) == 0) {
+                    throw new BizRuntimeException("获取汇率异常,请重试!");
+                }
+                applyMoneyDetail.setMoneyRmb(costDetailDomain.getAmount().multiply(toRmbRate).setScale(2, BigDecimal.ROUND_HALF_UP));
+                applyMoneyDetail.setProject(costDetailDomain.getProject());
+                applyMoneyDetail.setProjectDate(costDetailDomain.getProjectDate());
+                applyMoneyDetail.setRemark("");
+                applyMoneyDetailList.add(applyMoneyDetail);
+            }
+        } else {
             ApplyMoneyDetail applyMoneyDetail = new ApplyMoneyDetail();
             applyMoneyDetail.setName("借支单付款");
             applyMoneyDetail.setMoney(cost.getAmount());
-
-        //todo
             applyMoneyDetail.setMoneyRmb(cost.getAmount());
             applyMoneyDetail.setRemark("");
-
             applyMoneyDetailList.add(applyMoneyDetail);
+        }
         // 出纳申请金额明细(MoneyDetail)不可为空；
         req.setMoneyDetail(applyMoneyDetailList);
 

cost-service/src/main/java/com/blt/other/module/cost/utils/CostUtils.java

@@ -15,9 +15,11 @@ public class CostUtils {
     public static String getIdNum() {
 
         String activeProfile = SpringContextUtil.getString("spring.profiles.active");
+        /*
         if (!activeProfile.equals("prod")) {
             return IdWorker.getIdStr();
         }
+        */
         NumberFormat nf = NumberFormat.getInstance();
         nf.setGroupingUsed(false);
         nf.setMaximumIntegerDigits(6);