From 34c7d903efa4dc06a0f7b38bc5d2d721f80b220d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 09 七月 2025 09:04:52 +0800
Subject: [PATCH] 7.8冒烟修改问题
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/OrderController.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/OrderController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/OrderController.java
index 4b98514..59b45f7 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/OrderController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/OrderController.java
@@ -23,6 +23,8 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Date;
+import java.util.HashMap;
@Slf4j
@RestController
@@ -55,14 +57,20 @@
@Autowired
private TbUserService userService;
+ @Autowired
+ private TbAgreementService agreementService;
- @ApiOperation(value = "获取我的订单", tags = {"订单模块"})
+
+ @ApiOperation(value = "获取我的订单", tags = {"订单模块"},response =MyPushCompanyListVo.class )
@GetMapping("/getMyOrderList")
- public R<Page<MyPushCompanyListVo>> getMyOrderList(MyOrderListQuery query) {
+ public R<HashMap<String, Object>> getMyOrderList(MyOrderListQuery query) {
LoginUser loginUser = tokenService.getLoginUser();
Long userId = loginUser.getUserId();
Page<MyPushCompanyListVo> page = orderService.getMyOrderList(query, userId);
- return R.ok(page);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("data",page);
+ map = orderService.getMyOrderListNum(userId,map);
+ return R.ok(map);
}
@@ -73,7 +81,7 @@
*/
@ApiOperation(value = "立即支付前填写信息", tags = {"订单模块"})
@PostMapping("/lastPayOrderData")
- public R<?> lastPayOrderData(@RequestBody @Valid AddBuyerCompanyInfoDto dto) {
+ public synchronized R<WxPayMpOrderResult> lastPayOrderData(@RequestBody @Valid AddBuyerCompanyInfoDto dto) {
LoginUser loginUser = tokenService.getLoginUser();
Long userId = loginUser.getUserId();
TbOrder tbOrder = orderService.getById(dto.getOrderId());
@@ -95,12 +103,10 @@
if (company == null || company.getStatus() == 2 || company.getIsDelete() == 1) {
return R.fail("该公司已下架或者删除");
}
- long count = buyerCompanyInfoService.count(new LambdaQueryWrapper<TbBuyerCompanyInfo>().eq(TbBuyerCompanyInfo::getOrderId, dto.getOrderId()));
- if (count > 0) {
- return R.fail("请勿重复填写");
- }
- orderService.lastPayOrderData(tbOrder, dto, userId, company);
- return R.ok();
+ TbBuyerCompanyInfo one = buyerCompanyInfoService.getOne(new LambdaQueryWrapper<TbBuyerCompanyInfo>().eq(TbBuyerCompanyInfo::getOrderId, dto.getOrderId()));
+ orderService.lastPayOrderData(tbOrder, dto, userId, company,one);
+ R<WxPayMpOrderResult> wxPayMpOrderResultR = payOrder(dto.getOrderId());
+ return wxPayMpOrderResultR;
}
@@ -143,7 +149,7 @@
@PostMapping("/placeOrder")
public synchronized R<?> placeOrder(String companyId) {
if (StringUtils.isEmpty(companyId)) {
- R.fail("id不能为空");
+ return R.fail("id不能为空");
}
LoginUser loginUser = tokenService.getLoginUser();
Long userId = loginUser.getUserId();
@@ -173,6 +179,21 @@
return R.ok();
}
+ @ApiOperation(value = "下单预定-获取信息", tags = {"订单模块"})
+ @GetMapping("/placeOrderInfo")
+ public R<?> placeOrderInfo(String companyId) {
+ if (StringUtils.isEmpty(companyId)) {
+ R.fail("id不能为空");
+ }
+ TbCompany company = companyService.getById(companyId);
+ String information = company.getInformation();
+ HashMap<String, String> map = new HashMap<>();
+ map.put("information", information);
+ TbAgreement one = agreementService.getOne(new LambdaQueryWrapper<TbAgreement>().eq(TbAgreement::getType, 3));
+ map.put("agreement", one.getContent());
+ return R.ok(map);
+ }
+
@ApiOperation(value = "买家完成订单", tags = {"订单模块"})
@PostMapping("/buyerSuccessOrder")
@@ -196,6 +217,7 @@
// 订单完成 商品已售卖
order.setStatus(6);
order.updateById();
+ order.setFinishTime( new Date());
company.setStatus(3);
// 分佣
--
Gitblit v1.7.1