Merge remote-tracking branch 'remotes/origin/feature/20211120_订单发票金额bug修复_chenbin' into qa

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_ONE_STRING); //含税标记
+        request.setPriceTaxMark(CommonsConstant.CONSTANTS_ZERO_STRING); //含税标记
 
         // 订单商品明细
         List<InvoiceProductDetailRequest> productDetailList = new ArrayList<>();
@@ -155,11 +155,14 @@ public class OrderInvoiceAdapter {
         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));
-        BigDecimal goodsTotalTax = invoiceDetailRequest.getGoodsTotalPrice()
+        BigDecimal goodsTotalTax = actualPayAmount2yuan
                 .multiply(invoiceDetailRequest.getGoodsTaxRate()).setScale(2, BigDecimal.ROUND_HALF_UP);
+        // 税额
         invoiceDetailRequest.setGoodsTotalTax(goodsTotalTax);
+        BigDecimal goodsTotalPrice = actualPayAmount2yuan.subtract(goodsTotalTax);
+        // 商品总价
+        invoiceDetailRequest.setGoodsTotalPrice(goodsTotalPrice);
         productDetailList.add(invoiceDetailRequest);
         request.setProductDetailList(productDetailList);
         // fisherman 新增缺少字段

order-application-service/src/main/java/cn/freemud/constant/CommonsConstant.java

@@ -29,6 +29,8 @@ public class CommonsConstant {
 
     public static final String CONSTANTS_ONE_STRING = "1";
 
+    public static final String CONSTANTS_ZERO_STRING = "0";
+
     public static final String CONSTANTS_TWO_STRING = "2";
 
     public static final Integer CONSTANTS_TWO_INTEGER = 2;