diff --git a/src/main/java/com/yn/bftl/thirdparty/modules/business/service/impl/SubaccountServiceImpl.java b/src/main/java/com/yn/bftl/thirdparty/modules/business/service/impl/SubaccountServiceImpl.java index b0685fe..3f55239 100644 --- a/src/main/java/com/yn/bftl/thirdparty/modules/business/service/impl/SubaccountServiceImpl.java +++ b/src/main/java/com/yn/bftl/thirdparty/modules/business/service/impl/SubaccountServiceImpl.java @@ -136,7 +136,7 @@ @Override public void generateTemporaryStatement(Long orderId) { - log.error("开始生成临时结算单"); + log.info("开始生成临时结算单"); // 查询订单 Order order = orderRepository.findById(orderId).orElse(null); if (order == null) { @@ -174,15 +174,18 @@ // 总临时结算单数量 Integer totalNumber = 0; // 生成货款临时结算单 + log.info("======================order.getGoodsPayment():" + order.getGoodsPayment()); if (order.getGoodsPayment().compareTo(BigDecimal.ZERO) == 1) { temporaryStatementList.add(generateTemporaryStatementByType(SubaccountType.GOODS_COST, order, order.getSellerCompany())); totalNumber++; } + log.info("======================order.getBrandCost():" + order.getBrandCost()); // 生成品牌临时结算单 if (order.getBrandCost().compareTo(BigDecimal.ZERO) == 1) { temporaryStatementList.add(generateTemporaryStatementByType(SubaccountType.BRAND_FEE, order, order.getBrandCompany())); totalNumber++; } + log.info("======================order.getDeviseCost():" + order.getDeviseCost()); // 生成策划临时结算单 if (order.getDeviseCost().compareTo(BigDecimal.ZERO) == 1) { temporaryStatementList.add(generateTemporaryStatementByType(SubaccountType.DEVISE_FEE, order, order.getDeviseCompany())); @@ -191,9 +194,10 @@ if (totalNumber != temporaryStatementList.size()) { return; } + log.info("temporaryStatementList:" + JSON.toJSONString(temporaryStatementList)); temporaryStatementRepository.saveAll(temporaryStatementList); writeCommissionLog(String.format("[临时服务费][普通订单][%s],订单临时服务费单据已创建完成", order.getSn())); - log.error("生成临时结算单结束"); + log.info("生成临时结算单结束"); } /** @@ -244,12 +248,15 @@ temporaryStatement.setCompany(company); // 判断订单项结算金额和订单结算金额是否一致 if (subaccountType.equals(SubaccountType.GOODS_COST) && order.getGoodsPayment().compareTo(statementAmount) != 0) { + log.error(String.format("[临时服务费][普通订单][%s],订单的货款与订单行不一致", order.getSn())); writeCommissionLog(String.format("[临时服务费][普通订单][%s],订单的货款与订单行不一致", order.getSn())); return null; } else if (subaccountType.equals(SubaccountType.BRAND_FEE) && order.getBrandCost().compareTo(statementAmount) != 0) { + log.error(String.format("[临时服务费][普通订单][%s],订单的品牌费与订单行不一致", order.getSn())); writeCommissionLog(String.format("[临时服务费][普通订单][%s],订单的品牌费与订单行不一致", order.getSn())); return null; } else if (subaccountType.equals(SubaccountType.DEVISE_FEE) && order.getDeviseCost().compareTo(statementAmount) != 0) { + log.error(String.format("[临时服务费][普通订单][%s],订单的策划费与订单行不一致", order.getSn())); writeCommissionLog(String.format("[临时服务费][普通订单][%s],订单的策划费与订单行不一致", order.getSn())); return null; }