提交代码

hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java

@@ -320,20 +320,38 @@ public class HighOrderController {
 
                     // 计算价格
                     GasPayPriceModel priceModel = gasDiscountOilPriceService.oilPriceDiscountCompute(childOrder.getGoodsPrice(), childOrder.getGoodsId(), childOrder.getGasOilNo(), highOrder.getIsTyAgent());
-                    // 支付价格
+
-                    childOrder.setGoodsActualPrice(priceModel.getPayPrice());
+                    // 使用了优惠价
-
+                    if (highDiscountUserRel != null) {
-                    // 油价信息
+                        // 支付价格
-                    childOrder.setGasPriceGun(priceModel.getPriceGun());
+                        childOrder.setGoodsActualPrice(childOrder.getGoodsPrice());
-                    childOrder.setGasPriceVip(priceModel.getPriceVip());
+                        // 油价信息
-                    childOrder.setGasPriceOfficial(priceModel.getPriceOfficial());
+                        childOrder.setGasPriceGun(priceModel.getPriceGun());
-                    childOrder.setGasPricePlatform(priceModel.getPricePlatform());
+                        childOrder.setGasPriceVip(priceModel.getPriceVip());
-                    childOrder.setGasOilLiters(priceModel.getOilLiters());
+                        childOrder.setGasPriceOfficial(priceModel.getPriceOfficial());
-                    childOrder.setGasDiscount(priceModel.getDiscount());
+                        childOrder.setGasPricePlatform(priceModel.getPriceVip());
-                    childOrder.setExt1(priceModel.getPricePlatform().toString());
+                        childOrder.setGasOilLiters(priceModel.getOilLiters());
-                    childOrder.setGasOilSubsidy(priceModel.getPreferentialMargin());
+                        childOrder.setGasDiscount(new BigDecimal("0"));
-                    childOrder.setGasLitersPreferences(priceModel.getLitersPreferences());
+                        childOrder.setExt1(childOrder.getGasPricePlatform().toString());
-                    childOrder.setGasPricePreferences(priceModel.getPricePreferences());
+                        childOrder.setGasOilSubsidy(new BigDecimal("0"));
+                        childOrder.setGasLitersPreferences(new BigDecimal("0"));
+                        childOrder.setGasPricePreferences(priceModel.getPriceVip());
+                    } else {
+                        // 支付价格
+                        childOrder.setGoodsActualPrice(priceModel.getPayPrice());
+                        // 油价信息
+                        childOrder.setGasPriceGun(priceModel.getPriceGun());
+                        childOrder.setGasPriceVip(priceModel.getPriceVip());
+                        childOrder.setGasPriceOfficial(priceModel.getPriceOfficial());
+                        childOrder.setGasPricePlatform(priceModel.getPricePlatform());
+                        childOrder.setGasOilLiters(priceModel.getOilLiters());
+                        childOrder.setGasDiscount(priceModel.getDiscount());
+                        childOrder.setExt1(priceModel.getPricePlatform().toString());
+                        childOrder.setGasOilSubsidy(priceModel.getPreferentialMargin());
+                        childOrder.setGasLitersPreferences(priceModel.getLitersPreferences());
+                        childOrder.setGasPricePreferences(priceModel.getPricePreferences());
+                    }
+
 
                     // 来源类型  1：平台自建   2：团油
                     if (store.getSourceType().equals(1)) {
@@ -414,7 +432,7 @@ public class HighOrderController {
             BigDecimal integralDeductionPrice = new BigDecimal(0);
             if (buyPoints && highOrder.getPayGold() != null) {
 
-                integralDeductionPrice = new BigDecimal(highOrder.getPayGold()).divide(new BigDecimal(100));
+                integralDeductionPrice = new BigDecimal(highOrder.getPayGold().toString()).divide(new BigDecimal(100));
                 highUserService.goldHandle(userInfoModel.getHighUser().getId(), highOrder.getPayGold(), 2, 2, highOrder.getId());
 
                 BigDecimal payGold = new BigDecimal(highOrder.getPayGold());
@@ -425,7 +443,6 @@ public class HighOrderController {
                 }
             }
 
-
             highOrder.setMerchId(request.getHeader("mchId"));
             highOrder.setTotalPrice(totalPrice);
 

hai-service/src/main/resources/dev/commonConfig.properties

@@ -15,7 +15,7 @@ shellPlatMerchantId=S0302206141001919666
 shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
 
 # JinZhu configuration parameters
-jzAppId=app_xiaohan_test_01
+jzAppId=app_huidui_prod_01
 jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
 jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key
 

hai-service/src/main/resources/prod-9401/commonConfig.properties

@@ -18,7 +18,7 @@ shellPlatMerchantId=S0302206141001919666
 shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
 
 # JinZhu configuration parameters
-jzAppId=app_xiaohan_test_01
+jzAppId=app_huidui_prod_01
 jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
 jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key
 

hai-service/src/main/resources/prod/commonConfig.properties

@@ -18,7 +18,7 @@ shellPlatMerchantId=S0302206141001919666
 shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
 
 # JinZhu configuration parameters
-jzAppId=app_xiaohan_test_01
+jzAppId=app_huidui_prod_01
 jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
 jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key