From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 70cdda4..bf1c494 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
@@ -12,9 +12,11 @@
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;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -26,6 +28,7 @@
import java.util.Collections;
import java.util.List;
+@Api(value = "支付订单")
@RestController
@RequestMapping("/t-pay")
public class PayController {
@@ -48,23 +51,27 @@
return R.ok(resp);
}
-
+ @ApiOperation(value = "线下支付")
@PostMapping("offlinePay")
+ @Transactional(rollbackFor = Exception.class)
public R offlinePay(@Validated @RequestBody OfflinePayDto dto){
List<TBill> tBills = tBillService.listByIds(dto.getBillIds());
+ 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());
+ confirm.setPayTime(dto.getPayTime());
+ tBillConfirmService.save(confirm);
for (TBill tBill : tBills) {
TBill save = new TBill();
save.setId(tBill.getId());
save.setPayFeesType(2);
save.setVoucher(dto.getVoucher());
save.setPayFeesStatus("2");
- tBillService.lockAndUpdateInfo(save);
+ save.setConfirmId(confirm.getId());
+ tBillService.lockAndUpdateInfo(save,1);
}
- 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