Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -160,7 +160,7 @@ public class StudentOrderController extends BaseController {
 //        }
 
         String openid = "";
-        if (payChannel == "wx_pub") {
+        if (payChannel.equals("wx_pub")) {
             if (code == null || code.isEmpty()) {
                 return failed("微信支付请先授权");
             }
@@ -207,8 +207,8 @@ public class StudentOrderController extends BaseController {
 
     @GetMapping("/authorize")
     public String authorize(@RequestParam("returnUrl") String returnUrl) {
-        String appId = "wxcf8e8b33a9477845";
-        String url = URLEncoder.encode("http://wxwechat.utools.club/studentOrder/userInfo");
+        String appId = "wx80f175c0eb6836e9";
+        String url = URLEncoder.encode("http://mstudev.dayaedu.com/studentOrder/userInfo");
 
         String redirectURL = String.format("https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_base&state=1&connect_redirect=1#wechat_redirect",
                 appId, url);
@@ -219,8 +219,8 @@ public class StudentOrderController extends BaseController {
     @GetMapping("/userInfo")
     public Object userInfo(@RequestParam("code") String code,
                            @RequestParam("state") String returnUrl) throws Exception {
-        String appId = "wxcf8e8b33a9477845";
-        String appSecret = "1286452b9c68b13325dece7cdf892645";
+        String appId = "wx80f175c0eb6836e9";
+        String appSecret = "f817dc79e4149aaa4fafd6f8279b3593";
 
         String wxMpOAuth2AccessTokenUrl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code";
 

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Pay.java

@@ -135,7 +135,9 @@ public class Pay {
 
         if (openid != null && !openid.isEmpty()) {
             PaymentExpend expend = new PaymentExpend();
+            expend.setWxAppId("wx80f175c0eb6836e9");
             expend.setOpenId(openid);
+            expend.setIsRaw("0");
             paymentParams.put("expend", expend);
         }