Merge remote-tracking branch 'origin/master'

happy-job-module-hpvip/src/main/java/com/jeeplus/modules/api/ordermanager/OrderAliPayAPI.java

@@ -79,8 +79,8 @@ public class OrderAliPayAPI extends BaseAppController {
 
             AlipayBean alipayBean = new AlipayBean();
             alipayBean.setOut_trade_no(mpMemberOrder.getOrderNumber());
-            alipayBean.setBody("开心会员充值");
-            alipayBean.setSubject("充值业务");
+            alipayBean.setBody("开心支付");
+            alipayBean.setSubject("支付业务");
             alipayBean.setTimeout_express("30m");
             alipayBean.setTotal_amount(String.valueOf(money));
             alipayBean.setAlinotify_url(alinotify_url);

happy-job-module-hpvip/src/main/java/com/jeeplus/modules/api/ordermanager/OrderMinaPayAPI.java

@@ -68,7 +68,7 @@ public class OrderMinaPayAPI extends BaseAppController {
             // 通知地址(接收微信支付异步通知回调地址，通知url必须为直接可访问的url，不能携带参数。)
             String notifyUrl = null;
             // 商品描述
-            String body = "WeChatPay-orderPay";
+            String body = "开心支付";
             /**
              * 3、通知地址
              */

happy-job-module-hpvip/src/main/java/com/jeeplus/modules/api/ordermanager/OrderWeChatPayAPI.java

@@ -68,7 +68,7 @@ public class OrderWeChatPayAPI extends BaseAppController {
             // 通知地址(接收微信支付异步通知回调地址，通知url必须为直接可访问的url，不能携带参数。)
             String notifyUrl = null;
             // 商品描述
-            String body = "WeChatPay-orderPay";
+            String body = "开心支付";
             /**
              * 3、通知地址
              */