Commit e6afc34d authored by renjie's avatar renjie

支付宝支付

parent 5e9f3d0b
...@@ -10,6 +10,7 @@ import org.springframework.context.annotation.Configuration; ...@@ -10,6 +10,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class MongoConfig { public class MongoConfig {
@Value("${spring.data.mongodb.uri}") @Value("${spring.data.mongodb.uri}")
String dbUri; String dbUri;
......
...@@ -266,13 +266,13 @@ public class AccountController { ...@@ -266,13 +266,13 @@ public class AccountController {
return paymentService.wechatPayCallback(tradno); return paymentService.wechatPayCallback(tradno);
} }
@RequestMapping(path = "/0xwxcheckorderstatus/{tradno}/{chargeType}", method = RequestMethod.GET) @RequestMapping(path = "/0xwxcheckorderstatus/{tradno}", method = RequestMethod.GET)
public UserPaymentDto wechatCheckOrderStatus(Principal principal, @PathVariable String tradno, @PathVariable int chargeType) { public UserPaymentDto wechatCheckOrderStatus(Principal principal, @PathVariable String tradno, @RequestParam("chargeType") int chargeType) {
return paymentService.wxCheckOrderStatus(tradno, chargeType); return paymentService.wxCheckOrderStatus(tradno, chargeType);
} }
@RequestMapping(path = "/wxpay/checkstatus/{tradno}/{chargeType}", method = RequestMethod.GET) @RequestMapping(path = "/wxpay/checkstatus/{tradno}", method = RequestMethod.GET)
public UserPaymentDto wechatPayCheckStatus(@PathVariable String tradno, @PathVariable int chargeType) { public UserPaymentDto wechatPayCheckStatus(@PathVariable String tradno, @RequestParam("chargeType") int chargeType) {
return paymentService.wxCheckOrderStatus(tradno, chargeType); return paymentService.wxCheckOrderStatus(tradno, chargeType);
} }
...@@ -281,8 +281,8 @@ public class AccountController { ...@@ -281,8 +281,8 @@ public class AccountController {
paymentService.alipaCallback(tradno); paymentService.alipaCallback(tradno);
} }
@RequestMapping(path = "/0xalicheckorderstatus/{tradno}/{chargeType}", method = RequestMethod.GET) @RequestMapping(path = "/0xalicheckorderstatus/{tradno}", method = RequestMethod.GET)
public UserPaymentDto alipayCheckOrderStatus(Principal principal, @PathVariable String tradno, @PathVariable int chargeType) { public UserPaymentDto alipayCheckOrderStatus(Principal principal, @PathVariable String tradno, @RequestParam("chargeType") int chargeType) {
return paymentService.aliCheckOrderStatus(tradno, chargeType); return paymentService.aliCheckOrderStatus(tradno, chargeType);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment