Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -141,6 +141,7 @@ public class OrderPayController {
             // 微信支付
             String nonce_str = MD5Util.MD5Encode(String.valueOf(ThreadLocalRandom.current().nextInt(10000)), "UTF-8");
             int total_fee = order.getPayPrice().multiply(new BigDecimal("100")).intValue();
+            BigDecimal totalAmount = order.getPayPrice();
             WeChatPayReqInfo weChatPayReqInfo = new WeChatPayReqInfo();
             weChatPayReqInfo.setAppid(SysConst.getSysConfig().getWxPayMchAppId());                                // 公众号id
             weChatPayReqInfo.setMch_id(SysConst.getSysConfig().getWxPayMchId());                                  // 商户号
@@ -315,6 +316,7 @@ public class OrderPayController {
 
                     } else if (store.getSourceType().equals(MerchantStoreSourceType.type7.getNumber())) {
 
+                        totalAmount = order.getTotalPrice();
                         // 查询支付配置
                         HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type7);
                         if (gasChannelConfig == null) {
@@ -378,7 +380,7 @@ public class OrderPayController {
                 objectGas.put("outTradeNo" , order.getOrderNo());
                 objectGas.put("transType" , "JSAPI");
                 objectGas.put("payMode" , "WECHAT");
-                objectGas.put("totalAmount" , order.getTotalPrice());
+                objectGas.put("totalAmount" , totalAmount);
                 objectGas.put("profitSharing" , 0);
                 objectGas.put("notifyUrl" , SysConst.getSysConfig().getHuiPayNotify());
                 objectGas.put("subject" , orderTitle);