|
|
@@ -45,9 +45,7 @@ public class OrderPayController {
|
|
|
@RequestMapping(value = "/alipay_wx", method = RequestMethod.GET)
|
|
|
public String payOrderAlipayWx(Long id, Model model) throws BaseAdaPayException {
|
|
|
Order order = orderRepo.findById(id).orElseThrow(new BusinessException("订单不存在"));
|
|
|
- if (order.getStatus() == OrderStatus.FINISH || order.getStatus() == OrderStatus.PROCESSING) {
|
|
|
- return "redirect:/9th/orderDetail?id=" + id;
|
|
|
- } else if (order.getStatus() == OrderStatus.CANCELLED) {
|
|
|
+ if (order.getStatus() != OrderStatus.NOT_PAID) {
|
|
|
return "redirect:/9th/store";
|
|
|
}
|
|
|
String payUrl = (String) orderService.payAdapay(id, "alipay_wap", null);
|