From da124bc60214876ec2b00d00d865b14cf9bb9535 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 12 二月 2025 09:48:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 88fdae2..f6058a5 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,13 +1,18 @@
package com.ruoyi.web.controller.api;
+import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.common.constant.AmountConstant;
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.model.TBillConfirm;
+import com.ruoyi.system.service.TBillConfirmService;
import com.ruoyi.system.service.TBillService;
import com.ruoyi.system.service.TPayOrderService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,8 +22,12 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Collections;
import java.util.List;
+@Api(value = "支付订单")
@RestController
@RequestMapping("/t-pay")
public class PayController {
@@ -30,6 +39,10 @@
@Autowired
TBillService tBillService;
+
+ @Autowired
+ TBillConfirmService tBillConfirmService;
+
@ApiOperation(value = "创建支付订单")
@PostMapping("makeOrder")
public R<MakeOrderResp> makeOrder(@Validated @RequestBody MakeOrderDto dto){
@@ -37,7 +50,7 @@
return R.ok(resp);
}
-
+ @ApiOperation(value = "线下支付")
@PostMapping("offlinePay")
public R offlinePay(@Validated @RequestBody OfflinePayDto dto){
List<TBill> tBills = tBillService.listByIds(dto.getBillIds());
@@ -47,8 +60,13 @@
save.setPayFeesType(2);
save.setVoucher(dto.getVoucher());
save.setPayFeesStatus("2");
- tBillService.checkAndUpdate(save);
+ tBillService.lockAndUpdateInfo(save);
}
+ TBillConfirm confirm = new TBillConfirm();
+ confirm.setBillId(CollectionUtil.join(dto.getBillIds(),","));
+ confirm.setVoucher(dto.getVoucher());
+ confirm.setPayFeesMoney(new BigDecimal(dto.getAmount()).divide(AmountConstant.b100).setScale(2, RoundingMode.HALF_DOWN).doubleValue());
+ tBillConfirmService.save(confirm);
return R.ok();
}
--
Gitblit v1.7.1