|
@@ -78,7 +78,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
|
|
|
|
|
|
private final ReservationService reservationService;
|
|
private final ReservationService reservationService;
|
|
|
|
|
|
- private final ApplicationContext applicationContext;
|
|
|
|
|
|
+ private final WechatPaymentHandler wechatPaymentHandler;
|
|
|
|
|
|
// 定义字符池
|
|
// 定义字符池
|
|
private static final String LOWER_CASE = "abcdefghijklmnopqrstuvwxyz";
|
|
private static final String LOWER_CASE = "abcdefghijklmnopqrstuvwxyz";
|
|
@@ -301,8 +301,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
|
|
throw new ResourceUnavailableException("账号未绑定微信,请联系客服");
|
|
throw new ResourceUnavailableException("账号未绑定微信,请联系客服");
|
|
}
|
|
}
|
|
request.setOpenid(openid);
|
|
request.setOpenid(openid);
|
|
- WechatPaymentHandler wechatPaymentHandler = applicationContext.getBean(WechatPaymentHandler.class);
|
|
|
|
- WechatUnifiedOrder wechatUnifiedOrder = wechatPaymentHandler.unifiedorder("applet", request);
|
|
|
|
|
|
+ //WechatPaymentHandler wechatPaymentHandler = applicationContext.getBean(WechatPaymentHandler.class);
|
|
|
|
+ WechatUnifiedOrder wechatUnifiedOrder = this.wechatPaymentHandler.unifiedorder("applet", request);
|
|
Map<String, Object> result = new HashMap<>();
|
|
Map<String, Object> result = new HashMap<>();
|
|
result.put("mode", wechatUnifiedOrder.getMode().name());
|
|
result.put("mode", wechatUnifiedOrder.getMode().name());
|
|
result.put("appid", wechatUnifiedOrder.getAppid());
|
|
result.put("appid", wechatUnifiedOrder.getAppid());
|