还原团油改动代码

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

@@ -228,19 +228,16 @@ public class HighOrderController {
                     childOrder.setGoodsImg(store.getStoreLogo());
 
                     // 平台的价格
-                    // childOrder.setGasPriceGun(priceDetail.getBigDecimal("priceGun"));
-                    // childOrder.setGasPriceVip(priceDetail.getBigDecimal("priceVip"));
                     childOrder.setExt1(childOrder.getGasPriceVip().toString());
                     childOrder.setGoodsActualPrice(new BigDecimal(childOrder.getGoodsPrice().toString()).divide(childOrder.getGasPriceGun(),10,BigDecimal.ROUND_DOWN).multiply(childOrder.getGasPriceVip()).setScale(2,BigDecimal.ROUND_HALF_UP));
 
                     // 团油的价格
-                    // childOrder.setGasPriceGun(priceDetail.getBigDecimal("priceGun"));
+                    childOrder.setGasPriceGun(priceDetail.getBigDecimal("priceGun"));
-                    // childOrder.setGasPriceVip(priceDetail.getBigDecimal("priceVip"));
+                    childOrder.setGasPriceVip(priceDetail.getBigDecimal("priceVip"));
-                    // childOrder.setGoodsPrice(new BigDecimal(childOrder.getGoodsPrice().toString()).divide(childOrder.getGasPriceGun(),10,BigDecimal.ROUND_DOWN).multiply(childOrder.getGasPriceVip()).setScale(2,BigDecimal.ROUND_HALF_UP));
+                    childOrder.setGoodsPrice(new BigDecimal(childOrder.getGoodsPrice().toString()).divide(childOrder.getGasPriceGun(),10,BigDecimal.ROUND_DOWN).multiply(childOrder.getGasPriceVip()).setScale(2,BigDecimal.ROUND_HALF_UP));
 
                     childOrder.setGoodsSpecName("默认");
-                    // childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString())));
+                    childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount().toString())));
-                    childOrder.setTotalPrice(childOrder.getGoodsPrice());
                 }
 
                 if (childOrder.getGoodsType() == 7) {
@@ -272,6 +269,7 @@ public class HighOrderController {
                     childOrder.setGoodsActualPrice(discountPackage.getPrice());
                     childOrder.setGoodsSpecName("默认");
                 }
+
                 //  汇联通充值
                 if (childOrder.getGoodsType() == 8) {
                     if (childOrder.getGoodsPrice() == null) {

hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java

@@ -194,6 +194,10 @@ public class OrderController {
 
             if (order.getHighChildOrderList().get(0).getGoodsType() == 8) {
                 weChatPayReqInfo.setSub_mch_id(SysConst.getSysConfig().getWxGzSubMchId());//商户号
+
+            } else if (order.getHighChildOrderList().get(0).getGoodsType() == 3) {
+                weChatPayReqInfo.setSub_mch_id("1609882817");//商户号
+
             } else {
                 weChatPayReqInfo.setSub_mch_id(SysConst.getSysConfig().getWxSubMchId());
             }
@@ -465,7 +469,6 @@ public class OrderController {
         }
     }
 
-
     @RequestMapping(value="/unionStagingPay",method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "银联分期支付")

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

@@ -1,12 +1,12 @@
 tuanYouUrl=https://hcs.czb365.com
-# tuanYouAppKey=210091174083104
+tuanYouAppKey=210091174083104
-# tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45
+tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45
-# tuanYouDieselAccount=9hp52qgg4400
+tuanYouDieselAccount=9hp52qgg4400
-# tuanYouGasolineAccount=9hp52qf04400
+tuanYouGasolineAccount=9hp52qf04400
-tuanYouAppKey=232373843366592
+# tuanYouAppKey=232373843366592
-tuanYouAppSecret=b07cca748a3b83e27e4821d2a8423d91
+# tuanYouAppSecret=b07cca748a3b83e27e4821d2a8423d91
-tuanYouDieselAccount=c2qitcag4400
+# tuanYouDieselAccount=c2qitcag4400
-tuanYouGasolineAccount=c2qitc984400
+# tuanYouGasolineAccount=c2qitc984400
 
 qinzhuUrl=https://live.qianzhu8.com
 qinzhuHtmlUrl=https://qz.dctpay.com

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

@@ -1,12 +1,12 @@
 tuanYouUrl=https://hcs.czb365.com
-# tuanYouAppKey=210091174083104
+tuanYouAppKey=210091174083104
-# tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45
+tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45
-# tuanYouDieselAccount=9hp52qgg4400
+tuanYouDieselAccount=9hp52qgg4400
-# tuanYouGasolineAccount=9hp52qf04400
+tuanYouGasolineAccount=9hp52qf04400
-tuanYouAppKey=232373843366592
+# tuanYouAppKey=232373843366592
-tuanYouAppSecret=b07cca748a3b83e27e4821d2a8423d91
+# tuanYouAppSecret=b07cca748a3b83e27e4821d2a8423d91
-tuanYouDieselAccount=c2qitcag4400
+# tuanYouDieselAccount=c2qitcag4400
-tuanYouGasolineAccount=c2qitc984400
+# tuanYouGasolineAccount=c2qitc984400
 
 qinzhuUrl=https://live.qianzhu8.com
 qinzhuHtmlUrl=https://qz.dctpay.com