Merge branch '20211022-当天未过期券未返回修复-zhiwei.zha' 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_ZERO_STRING); //含税标记
+        request.setPriceTaxMark(CommonsConstant.CONSTANTS_ZERO_STRING); //含税标记，不含税
 
         // 订单商品明细
         List<InvoiceProductDetailRequest> productDetailList = new ArrayList<>();
@@ -154,15 +154,18 @@ public class OrderInvoiceAdapter {
         invoiceDetailRequest.setProductSpecification("");
         invoiceDetailRequest.setGoodsUnit("");
         invoiceDetailRequest.setGoodsQuantity(CommonsConstant.CONSTANTS_ONE_INTEGER);
-        invoiceDetailRequest.setGoodsPrice(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()),5,BigDecimal.ROUND_HALF_UP)
+                .setScale(2, BigDecimal.ROUND_HALF_UP);
         invoiceDetailRequest.setGoodsTotalTax(goodsTotalTax);
-        BigDecimal goodsTotalPrice = actualPayAmount2yuan.subtract(goodsTotalTax);
+        // 商品金额(不含税) = 商品金额(含税) - 税额
+        BigDecimal excludedTaxPayAmount2yuan = actualPayAmount2yuan.subtract(goodsTotalTax);
+        invoiceDetailRequest.setGoodsPrice(excludedTaxPayAmount2yuan);
         // 商品总价
-        invoiceDetailRequest.setGoodsTotalPrice(goodsTotalPrice);
+        invoiceDetailRequest.setGoodsTotalPrice(excludedTaxPayAmount2yuan);
         productDetailList.add(invoiceDetailRequest);
         request.setProductDetailList(productDetailList);
         // fisherman 新增缺少字段

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -75,7 +75,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
-import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import javafx.util.Pair;
 import ma.glasnost.orika.MapperFacade;
@@ -1361,7 +1360,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (StringUtils.isBlank(endTime)) {
             return true;
         }
-        Date date = DateUtil.convert2Date(endTime, DateUtil.FORMAT_yyyyMMdd_date);
+        Date date = DateUtil.convert2Date(endTime, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
         return now.before(date);
     }