Commit fefd1cc5f04fe01db84b86ff0c7154aeb43e8672
1 parent
046b3041
Exists in
dev
微信h5支付
Showing
4 changed files
with
8 additions
and
5 deletions
Show diff stats
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/PaymentController.java
| @@ -87,7 +87,7 @@ public class PaymentController { | @@ -87,7 +87,7 @@ public class PaymentController { | ||
| 87 | ddDto.setDdzt(DdztEnum.dzf.getInfo()); | 87 | ddDto.setDdzt(DdztEnum.dzf.getInfo()); |
| 88 | WDd order = wDdManager.addOrder(ddDto); | 88 | WDd order = wDdManager.addOrder(ddDto); |
| 89 | log.warn("创建订单2：{}", order); | 89 | log.warn("创建订单2：{}", order); |
| 90 | - HashMap<String,Object> resultData = paymentManage.wxPay(order); | 90 | + HashMap<String,Object> resultData = paymentManage.wxPay(order,ddDto.getOpenId()); |
| 91 | log.warn("创建订单3：{}", resultData); | 91 | log.warn("创建订单3：{}", resultData); |
| 92 | return CommonResult.ok().value(resultData); | 92 | return CommonResult.ok().value(resultData); |
| 93 | } | 93 | } |
backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/DdDto.java
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/PaymentManage.java
| @@ -11,6 +11,6 @@ public interface PaymentManage { | @@ -11,6 +11,6 @@ public interface PaymentManage { | ||
| 11 | 11 | ||
| 12 | String notifyOrder(String xmlData); | 12 | String notifyOrder(String xmlData); |
| 13 | 13 | ||
| 14 | - HashMap<String,Object> wxPay(WDd order); | 14 | + HashMap<String,Object> wxPay(WDd order,String openId); |
| 15 | 15 | ||
| 16 | } | 16 | } |
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/PaymentManageImpl.java
| @@ -156,7 +156,7 @@ public class PaymentManageImpl implements PaymentManage { | @@ -156,7 +156,7 @@ public class PaymentManageImpl implements PaymentManage { | ||
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | @Override | 158 | @Override |
| 159 | - public HashMap<String, Object> wxPay(WDd wDd) { | 159 | + public HashMap<String, Object> wxPay(WDd wDd,String openId) { |
| 160 | try { | 160 | try { |
| 161 | WCzzfpz wCzzfpz = czzfpzDao.selectOne(Wrappers.<WCzzfpz>lambdaQuery().eq(WCzzfpz::getFCzid, wDd.getFCzid()).eq(WCzzfpz::getFZflx, wDd.getFZffs())); | 161 | WCzzfpz wCzzfpz = czzfpzDao.selectOne(Wrappers.<WCzzfpz>lambdaQuery().eq(WCzzfpz::getFCzid, wDd.getFCzid()).eq(WCzzfpz::getFZflx, wDd.getFZffs())); |
| 162 | if (BeanUtils.isEmpty(wCzzfpz) || wCzzfpz == null) { | 162 | if (BeanUtils.isEmpty(wCzzfpz) || wCzzfpz == null) { |
| @@ -178,7 +178,7 @@ public class PaymentManageImpl implements PaymentManage { | @@ -178,7 +178,7 @@ public class PaymentManageImpl implements PaymentManage { | ||
| 178 | scene_info.put("id", "LPG"); | 178 | scene_info.put("id", "LPG"); |
| 179 | scene_info.put("name", "燃气"); | 179 | scene_info.put("name", "燃气"); |
| 180 | wxPayUnifiedOrderRequest.setSceneInfo(scene_info.toString()); | 180 | wxPayUnifiedOrderRequest.setSceneInfo(scene_info.toString()); |
| 181 | - wxPayUnifiedOrderRequest.setNotifyUrl("http://i42mtc.natappfree.cc/api/user/order/payment/notifyOrder"); // 支付回调地址，开放不用登录 | 181 | + wxPayUnifiedOrderRequest.setNotifyUrl("http://pmrsig.natappfree.cc/api/user/order/payment/notifyOrder"); // 支付回调地址，开放不用登录 |
| 182 | wxPayUnifiedOrderRequest.setSpbillCreateIp("127.0.0.1"); | 182 | wxPayUnifiedOrderRequest.setSpbillCreateIp("127.0.0.1"); |
| 183 | // trade_type=APP时 移动应用内的支付场景 | 183 | // trade_type=APP时 移动应用内的支付场景 |
| 184 | if ("APP".equals(wxPayUnifiedOrderRequest.getTradeType())) { | 184 | if ("APP".equals(wxPayUnifiedOrderRequest.getTradeType())) { |
| @@ -190,7 +190,7 @@ public class PaymentManageImpl implements PaymentManage { | @@ -190,7 +190,7 @@ public class PaymentManageImpl implements PaymentManage { | ||
| 190 | } | 190 | } |
| 191 | // 公众号内或者微信内的网页支付 | 191 | // 公众号内或者微信内的网页支付 |
| 192 | if ("JSAPI".equals(wxPayUnifiedOrderRequest.getTradeType())) { | 192 | if ("JSAPI".equals(wxPayUnifiedOrderRequest.getTradeType())) { |
| 193 | - wxPayUnifiedOrderRequest.setOpenid("oH7LG54_Y49mVunw2FLXzUCxHWlM"); | 193 | + wxPayUnifiedOrderRequest.setOpenid(openId); |
| 194 | } | 194 | } |
| 195 | // 手机浏览器中的支付场景 | 195 | // 手机浏览器中的支付场景 |
| 196 | if ("MWEB".equals(wxPayUnifiedOrderRequest.getTradeType())) { | 196 | if ("MWEB".equals(wxPayUnifiedOrderRequest.getTradeType())) { |