价格修复

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

@@ -174,6 +174,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     private String mcCafePartnerId;
     @Value("${mccafe.push.order.url}")
     private String mccafePushOrderUrl;
+    @Value("${mccafe.push.order.gateway.url}")
+    private String mccafePushOrderGatewayUrl;
     @Value("${mccafe.pushorder.MerchantId}")
     private String mccafePushOrderMerchantId;
     @Value("${mccafe.pushorder.AppId}")
@@ -2772,27 +2774,23 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             orderItem.setProductLongNameEn(orderItemResp.getProductForeignName());
             orderItem.setQuantity(orderItemResp.getProductQuantity().toString());
             orderItem.setReal_quantity(orderItemResp.getProductQuantity().toString());
-            orderItem.setOriginal_price(String.valueOf(orderItemResp.getSalePrice().intValue()+materialPrice));
-            orderItem.setPrice(String.valueOf(orderItemResp.getProductPrice().intValue()+materialPrice));
+            orderItem.setOriginal_price(String.valueOf(orderItemResp.getSalePrice().intValue()));
+            orderItem.setPrice(String.valueOf(orderItemResp.getSalePrice().intValue()+materialPrice));
             orderItem.setSubtotal(new BigDecimal(orderItem.getPrice()).multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue()+"");
-            if(orderItemResp.getProductPrice().intValue() > orderItemResp.getSalePrice().intValue()) {
-                orderItem.setDiscountAmount((orderItemResp.getProductPrice().subtract(orderItemResp.getSalePrice())).multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue()+"");
-            } else {
-                orderItem.setDiscountAmount(0+"");
-            }
-            orderItem.setRealAmount(new BigDecimal(orderItem.getOriginal_price()).multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue()+"");
+            orderItem.setDiscountAmount(0+"");
+            orderItem.setRealAmount(new BigDecimal(orderItem.getPrice()).multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue()+"");
             String taxId = "10";
             orderItem.setTaxId(taxId);
             Integer taxRate = 6;
             orderItem.setTaxRate(String.valueOf(taxRate));
-            orderItem.setTaxAmount(String.valueOf(new BigDecimal(taxRate).multiply(new BigDecimal(orderItem.getOriginal_price()))
+            orderItem.setTaxAmount(String.valueOf(new BigDecimal(taxRate).multiply(new BigDecimal(orderItem.getPrice()))
                     .multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue()/100));
             taxTotalAmount += Integer.parseInt(orderItem.getTaxAmount());
             McCafePushOrderDto.TaxAmountDetail taxAmountDetail = new McCafePushOrderDto.TaxAmountDetail();
             taxAmountDetail.setUniqueCode(orderItemResp.getProductCode());
             McCafePushOrderDto.TaxItem taxItem = new McCafePushOrderDto.TaxItem();
-            taxItem.setRealAmount(new BigDecimal(orderItem.getOriginal_price()).multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue());
-            taxItem.setTaxAmount(new BigDecimal(taxRate).multiply(new BigDecimal(orderItem.getOriginal_price()))
+            taxItem.setRealAmount(new BigDecimal(orderItem.getPrice()).multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue());
+            taxItem.setTaxAmount(new BigDecimal(taxRate).multiply(new BigDecimal(orderItem.getPrice()))
                     .multiply(new BigDecimal(orderItemResp.getProductQuantity())).intValue()/100);
             taxItem.setTaxId(taxId);
             taxItem.setTaxRate(taxRate+"");