From 7876cd5977af240d28d59d18d7a06344d36d4d32 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 18:13:33 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 16 +---------------
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java | 2 +-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
index a84eb54..c8cd1eb 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
@@ -132,7 +132,7 @@
}
vo.setUseGoods(sb.substring(0, sb.length() - 1));
}
- vo.setLaveNum(coupon.getSendLimitFlag());
+ vo.setLimitFlag(coupon.getSendLimitFlag());
vo.setReceiveNum(coupon.getSendLimitNumber());
int count = memberCouponService.count(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("del_flag", 0));
vo.setLaveNum(coupon.getSendLimitNumber() - count);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index 7fb8691..5519d5d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -35,9 +35,6 @@
@Resource
private OrderService orderService;
- @Resource
- private RemoteGoodsService remoteGoodsService;
-
@RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
@ApiOperation(value = "核销code")
@@ -239,16 +236,5 @@
}
- /**
- * 抽奖的平台商品生成订单--待审核
- * @param orderVo
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
- public R addOrder(@RequestBody AddOrderVo orderVo){
- Goods goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
- orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsNum(), orderVo.getId(), 2);
- return R.ok();
- }
+
}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
index 3a53671..0d2d51b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
@@ -10,7 +10,10 @@
import com.ruoyi.system.api.domain.dto.BoardMemberTotalDto;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.vo.*;
+import com.ruoyi.system.api.model.AddOrderVo;
+import com.ruoyi.system.api.service.RemoteGoodsService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -36,6 +39,9 @@
@Resource
private UserServiceRecordService userServiceRecordService;
+
+ @Resource
+ private RemoteGoodsService remoteGoodsService;
@PostMapping("/getAppOrderTotal")
@@ -215,4 +221,18 @@
List<Integer> list = userServiceRecordService.countShopServicePerson(shopId);
return R.ok(list);
}
+
+
+ /**
+ * 抽奖的平台商品生成订单--待审核
+ * @param orderVo
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
+ public R addOrder(@RequestBody AddOrderVo orderVo){
+ Goods goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
+ orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsNum(), orderVo.getId(), 2);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1