[微信支付服务商模式][修复]

mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java

@@ -19,5 +19,15 @@ public class PasswordHelper {
 		user.setPassword(newPassword);
 
 	}
+
+	public static void main(String[] args) {
+		MallUserInfo user = new MallUserInfo();
+		user.setUsername("sadmin");
+		user.setPassword("sadmin123");
+		PasswordHelper passwordHelper = new PasswordHelper();
+		passwordHelper.encryptPassword(user);
+		System.out.println(user);
+		System.out.println(user.getPassword());
+	}
 	
 }

mallinkService/src/main/java/com/simple/pay/WxPayOrderP.java

@@ -134,7 +134,7 @@ public class WxPayOrderP {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("WxPayOrder{");
+        final StringBuilder sb = new StringBuilder("WxPayOrderP{");
         sb.append("appid='").append(appid).append('\'');
         sb.append(", mch_id='").append(mch_id).append('\'');
         sb.append(", nonce_str='").append(nonce_str).append('\'');

mallinkService/src/main/java/com/simple/pay/WxPayOrderQ.java

@@ -53,7 +53,7 @@ public class WxPayOrderQ {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("WxPayOrder{");
+        final StringBuilder sb = new StringBuilder("WxPayOrderQ{");
         sb.append("appid='").append(appid).append('\'');
         sb.append(", mch_id='").append(mch_id).append('\'');
         sb.append(", nonce_str='").append(nonce_str).append('\'');

mallinkService/src/main/java/com/simple/pay/WxPayOrderSP.java

@@ -152,9 +152,9 @@ public class WxPayOrderSP {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("WxPayOrder{");
+        final StringBuilder sb = new StringBuilder("WxPayOrderSP{");
         sb.append("appid='").append(appid).append('\'');
-        sb.append("sub_appid='").append(sub_appid).append('\'');
+        sb.append(", sub_appid='").append(sub_appid).append('\'');
         sb.append(", mch_id='").append(mch_id).append('\'');
         sb.append(", sub_mch_id='").append(sub_mch_id).append('\'');
         sb.append(", nonce_str='").append(nonce_str).append('\'');

mallinkService/src/main/java/com/simple/pay/WxPayOrderSQ.java

@@ -71,9 +71,9 @@ public class WxPayOrderSQ {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("WxPayOrder{");
+        final StringBuilder sb = new StringBuilder("WxPayOrderSQ{");
         sb.append("appid='").append(appid).append('\'');
-        sb.append("sub_appid='").append(sub_appid).append('\'');
+        sb.append(", sub_appid='").append(sub_appid).append('\'');
         sb.append(", mch_id='").append(mch_id).append('\'');
         sb.append(", sub_mch_id='").append(sub_mch_id).append('\'');
         sb.append(", nonce_str='").append(nonce_str).append('\'');

mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java

@@ -205,6 +205,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
                     // 统一下单 // 服务商模式
                     String noncestr = Utility.generate32UUID();
                     WxPayOrderSP wxPayOrderSP = new WxPayOrderSP();
+                    wxPayOrderSP.setSub_openid(user.getOpenId());
                     wxPayOrderSP.setAppid(appInfo.getParentAppId());
                     wxPayOrderSP.setMch_id(payAccount.getMchId());
                     wxPayOrderSP.setSub_appid(user.getAppId());
@@ -245,7 +246,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
 
                         String timestamp = String.valueOf(Utility.getCurrentTimeStamp());
                         Map<String, String> sighMap = MapUtil.getOrderMap();
-                        sighMap.put("appId", returnMap.get("appid"));
+                        sighMap.put("appId", appInfo.getAppId());
                         sighMap.put("timeStamp", timestamp);
                         sighMap.put("nonceStr", noncestr);
                         sighMap.put("package", "prepay_id=" + prepay_id);