diff --git a/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java b/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java index 6e5b171e6..19fcae757 100644 --- a/mallinkAdmin/src/main/java/com/simple/shiro/PasswordHelper.java +++ b/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()); + } } diff --git a/mallinkService/src/main/java/com/simple/pay/WxPayOrderP.java b/mallinkService/src/main/java/com/simple/pay/WxPayOrderP.java index b2602bc0d..b0d3f0836 100644 --- a/mallinkService/src/main/java/com/simple/pay/WxPayOrderP.java +++ b/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('\''); diff --git a/mallinkService/src/main/java/com/simple/pay/WxPayOrderQ.java b/mallinkService/src/main/java/com/simple/pay/WxPayOrderQ.java index 114d15191..731037ab1 100644 --- a/mallinkService/src/main/java/com/simple/pay/WxPayOrderQ.java +++ b/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('\''); diff --git a/mallinkService/src/main/java/com/simple/pay/WxPayOrderSP.java b/mallinkService/src/main/java/com/simple/pay/WxPayOrderSP.java index 89e0b1037..bdbd1c1c2 100644 --- a/mallinkService/src/main/java/com/simple/pay/WxPayOrderSP.java +++ b/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('\''); diff --git a/mallinkService/src/main/java/com/simple/pay/WxPayOrderSQ.java b/mallinkService/src/main/java/com/simple/pay/WxPayOrderSQ.java index 6cfdbca53..2ad1bfc2f 100644 --- a/mallinkService/src/main/java/com/simple/pay/WxPayOrderSQ.java +++ b/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('\''); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index 2a6472d4d..cf730db93 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/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 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);