From f0641b56a3b46d0e9be91983944fa1c7eba3ae33 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Wed, 18 Aug 2021 00:04:40 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hai-cweb/src/main/java/com/cweb/config/AuthConfig.java      | 1 +
 .../com/cweb/controller/OutRechargeOrderController.java     | 6 +++---
 .../main/java/com/cweb/controller/pay/OrderController.java  | 4 ++--
 .../main/java/com/hai/service/impl/HighUserServiceImpl.java | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java b/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java
index 47ccbee5..9f9be337 100644
--- a/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java
+++ b/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java
@@ -111,6 +111,7 @@ public class AuthConfig implements WebMvcConfigurer {
 	      .excludePathPatterns("/test/*")
 	      .excludePathPatterns("/cmsContent/*")
 		  .excludePathPatterns("/highGas/*")
+		  .excludePathPatterns("/outRechargeOrder/*")
 	      .excludePathPatterns("/wechat/*")
 	      .excludePathPatterns("/tuanyou/*")
 	      .excludePathPatterns("/highGas/*")
diff --git a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
index 7afd2181..e3880f5d 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
@@ -412,8 +412,8 @@ public class OutRechargeOrderController {
             param.put("mch_id", "1289663601");
             param.put("sub_mch_id" , "1609882817"); // 个体户黎杨珍
             param.put("nonce_str" , WxUtils.makeNonStr());
-            param.put("transaction_id" , "4200001148202106176001512773");
-            param.put("out_order_no" , "HF2021061710360517203");
+            param.put("transaction_id" , "4200001158202108094442626740");
+            param.put("out_order_no" , "30000408682021080916082519929");
             param.put("description" , "系统自动完结分账");
             String signStr = WxUtils.generateSignature(param, "Skufk5oi85wDFGl888i6wsRSTkdd5df5" , WXPayConstants.SignType.HMACSHA256);
             param.put("sign" , signStr);
@@ -437,7 +437,7 @@ public class OutRechargeOrderController {
             Map<String,String> param = new LinkedHashMap<>();
             param.put("mch_id", "1289663601");
             //param.put("sub_mch_id" , "1609882817"); // 个体户黎杨珍
-            param.put("transaction_id" , "4200001152202106114622919776");
+            param.put("transaction_id" , "4200001175202108102870717911");
             ///param.put("out_order_no" , String.valueOf(new Date().getTime()));
             param.put("nonce_str" , WxUtils.makeNonStr());
             String signStr = WxUtils.generateSignature(param, "Skufk5oi85wDFGl888i6wsRSTkdd5df5" , WXPayConstants.SignType.HMACSHA256);
diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java
index e00c9718..9199c72e 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java
@@ -262,8 +262,8 @@ public class OrderController {
                     HighCoupon coupon = highCouponService.getCouponById(childOrder.getGoodsId());
                     // 支付类型：1.微信支付 2.金币支付
                     if (coupon.getPayType() != 2) {
-                        log.error("OrderController --> orderToPay() ERROR", "只支持金币支持");
-                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, coupon.getCouponName() + ",只支持金币支付");
+                        log.error("OrderController --> orderToPay() ERROR", "只支持积分支付");
+                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, coupon.getCouponName() + ",只支持积分支付");
                     }
                 }
             }
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
index 046f599e..8d72c073 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
@@ -163,12 +163,12 @@ public class HighUserServiceImpl implements HighUserService {
 
         } else  if (goldType == 2) {
             if (goldNum > user.getGold()) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "金币数量不足");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "积分数量不足");
             }
             user.setGold(user.getGold() - goldNum);
 
         } else {
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "用户金币处理异常");
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "用户积分处理异常");
         }
         highUserMapper.updateByPrimaryKey(user);