支付

src/main/java/com/izouma/dingdong/web/PayConsumptionController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.izouma.dingdong.domain.FeeRecord;
 import com.izouma.dingdong.domain.OrderInfo;
+import com.izouma.dingdong.enums.PayMethod;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.FeeRecordRepo;
 import com.izouma.dingdong.repo.OrderInfoRepo;
@@ -99,9 +100,9 @@ public class PayConsumptionController {
      * @param orderId
      */
     @GetMapping(value = "/payOrder")
-    public void payOrder(@RequestParam Long orderId) {
+    public String payOrder(@RequestParam Long orderId) {
         OrderInfo orderInfo = orderInfoRepo.findById(orderId).orElseThrow(new BusinessException("无订单"));
-        switch (orderInfo.getPayMethod()) {
+       /* switch (orderInfo.getPayMethod()) {
             case CASH_DELIVERY:
                 orderInfoService.toCompleted(orderId);
             case ALI_PAY:
@@ -111,7 +112,11 @@ public class PayConsumptionController {
             case CREDIT_CARD:
                 consumptionService.cardPay(orderInfo);
                 break;
+        }*/
+        if (!PayMethod.CASH_DELIVERY.equals(orderInfo.getPayMethod())) {
+            return consumptionService.cardPay(orderInfo);
         }
+        return null;
 
     }
 }