From fa1c1ea203559ef7cbb93dc9097fc703c6a52d2e Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 11 二月 2025 11:31:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java
index cfd55df..88fdae2 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java
@@ -1,9 +1,23 @@
package com.ruoyi.web.controller.api;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.dto.MakeOrderDto;
+import com.ruoyi.system.dto.MakeOrderResp;
+import com.ruoyi.system.dto.OfflinePayDto;
+import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.service.TBillService;
+import com.ruoyi.system.service.TPayOrderService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
@RestController
@RequestMapping("/t-pay")
@@ -11,15 +25,31 @@
+ @Autowired
+ TPayOrderService tPayOrderService;
-
+ @Autowired
+ TBillService tBillService;
+ @ApiOperation(value = "创建支付订单")
@PostMapping("makeOrder")
- public AjaxResult makeOrder(){
-
- return null;
+ public R<MakeOrderResp> makeOrder(@Validated @RequestBody MakeOrderDto dto){
+ MakeOrderResp resp = tPayOrderService.makeOrder(dto);
+ return R.ok(resp);
}
-
+ @PostMapping("offlinePay")
+ public R offlinePay(@Validated @RequestBody OfflinePayDto dto){
+ List<TBill> tBills = tBillService.listByIds(dto.getBillIds());
+ for (TBill tBill : tBills) {
+ TBill save = new TBill();
+ save.setId(tBill.getId());
+ save.setPayFeesType(2);
+ save.setVoucher(dto.getVoucher());
+ save.setPayFeesStatus("2");
+ tBillService.checkAndUpdate(save);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1