update

order-application-service/src/main/java/cn/freemud/adapter/OrderInvoiceAdapter.java

@@ -134,7 +134,7 @@ public class OrderInvoiceAdapter {
         request.setInvoiceTypeCode(InvoiceTypeCodeEnum.getBwType(orderInvoiceConfig.getInvoiceType()));
         request.setInvoiceNo(UUID.randomUUID().toString().replaceAll("-", ""));
         request.setDrawer(createRequest.getDrawer());
-        request.setPriceTaxMark(CommonsConstant.CONSTANTS_ZERO_STRING); //含税标记
+        request.setPriceTaxMark(CommonsConstant.CONSTANTS_ZERO_STRING); //含税标记，不含税
 
         // 订单商品明细
         List<InvoiceProductDetailRequest> productDetailList = new ArrayList<>();
@@ -154,14 +154,18 @@ public class OrderInvoiceAdapter {
         invoiceDetailRequest.setProductSpecification("");
         invoiceDetailRequest.setGoodsUnit("");
         invoiceDetailRequest.setGoodsQuantity(CommonsConstant.CONSTANTS_ONE_INTEGER);
-        invoiceDetailRequest.setGoodsPrice(actualPayAmount2yuan);
-        // 商品总价
-        invoiceDetailRequest.setGoodsTotalPrice(actualPayAmount2yuan);
         invoiceDetailRequest.setGoodsTaxRate(new BigDecimal(orderInvoiceConfig.getTaxRate()).setScale(2, BigDecimal.ROUND_HALF_UP));
+        // 税额 = 商品金额(不含税) * 税率 / (1+税率)
         BigDecimal goodsTotalTax = actualPayAmount2yuan
-                .multiply(invoiceDetailRequest.getGoodsTaxRate()).setScale(2, BigDecimal.ROUND_HALF_UP);
-        // 税额
+                .multiply(invoiceDetailRequest.getGoodsTaxRate())
+                .divide(new BigDecimal(1).add(invoiceDetailRequest.getGoodsTaxRate()))
+                .setScale(2, BigDecimal.ROUND_HALF_UP);
         invoiceDetailRequest.setGoodsTotalTax(goodsTotalTax);
+        // 商品金额(不含税) = 商品金额(含税) - 税额
+        BigDecimal excludedTaxPayAmount2yuan = actualPayAmount2yuan.subtract(goodsTotalTax);
+        invoiceDetailRequest.setGoodsPrice(excludedTaxPayAmount2yuan);
+        // 商品总价
+        invoiceDetailRequest.setGoodsTotalPrice(excludedTaxPayAmount2yuan);
         productDetailList.add(invoiceDetailRequest);
         request.setProductDetailList(productDetailList);
         // fisherman 新增缺少字段