Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -2735,7 +2735,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             orderItem.setRealAmount(orderItemResp.getSalePrice().multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue()+"");
             String taxId = "10";
             orderItem.setTaxId(taxId);
-            Integer taxRate = Double.valueOf(orderProductAddInfoDto.getTax()*100).intValue();
+            Integer taxRate = 6;
             orderItem.setTaxRate(String.valueOf(taxRate));
             orderItem.setTaxAmount(String.valueOf(new BigDecimal(taxRate).multiply(orderItemResp.getSalePrice())
                     .multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue()/100));
@@ -2747,7 +2747,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             taxItem.setTaxAmount(new BigDecimal(taxRate).multiply(orderItemResp.getSalePrice())
                     .multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue()/100);
             taxItem.setTaxId(taxId);
-            taxItem.setTaxRate(getTaxRateByTaxId(taxId).toString());
+            taxItem.setTaxRate(taxRate+"");
             taxAmountDetail.setTaxItems(Arrays.asList(taxItem));
             orderItem.setTaxAmountDetail(Arrays.asList(taxAmountDetail));
             if(StringUtils.isBlank(orderItemResp.getParentProductId()) && "0".equals(orderItemResp.getParentProductId())) {
@@ -2890,12 +2890,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         }
     }
 
-    private Integer getTaxRateByTaxId(String taxId) {
-        switch (taxId) {
-            default:return 6;
-        }
-    }
-
     public static void main(String[] args) {
         System.out.println(DateUtil.convert2String(new Date(1631519403066l), "yyyy-MM-dd HH:mm:ss"));
     }