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/concole/OrderController.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
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 08929a3..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
@@ -5,10 +5,15 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderService;
+import com.ruoyi.order.service.order.UserServiceRecordService;
import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
+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;
@@ -31,6 +36,12 @@
@Resource
private ConsumerGoodsService consumerGoodsService;
+
+ @Resource
+ private UserServiceRecordService userServiceRecordService;
+
+ @Resource
+ private RemoteGoodsService remoteGoodsService;
@PostMapping("/getAppOrderTotal")
@@ -55,9 +66,9 @@
* @date 2023/6/18 17:30
*/
@PostMapping("/boardOrderTotal")
- public R<MgtBulletinBoardVo> boardOrderTotal(){
+ public R<MgtBulletinBoardVo> boardOrderTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto){
MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
- MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal();
+ MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal(boardMemberTotalDto.getUserIds());
mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
mgtBulletinBoardVo.setUnUseOrderTotal(mgtBulletinBoardVoOrder.getUnUseOrderTotal());
mgtBulletinBoardVo.setActivityOrderTotal(mgtBulletinBoardVoOrder.getActivityOrderTotal());
@@ -113,7 +124,7 @@
*/
@PostMapping("/autoCancelOrder")
public R autoCancelOrder(@RequestBody String orderId){
- orderService.autoCancelOrder(orderId);
+ orderService.autoCancelOrder(orderId, 1);
return R.ok();
}
@@ -175,4 +186,53 @@
ProfitSharingResult result = orderService.queryBill(orderId);
return R.ok(result);
}
+
+ /**
+ * 获取活动订单商品id
+ * @param activityId
+ * @return
+ */
+ @PostMapping("/getActivityOrderGoods")
+ public R<List<String>> getActivityOrderGoods(@RequestBody String activityId){
+ List<String> activityOrderGoods = orderService.getActivityOrderGoods(activityId);
+ return R.ok(activityOrderGoods);
+ }
+
+ /**
+ * 获取商品售卖统计
+ * @param goodsIdList
+ * @return
+ */
+ @PostMapping("/getGoodsSellStatic")
+ R<StaticsShopMgtGoodsVO> getGoodsSellStatic(@RequestBody List<String> goodsIdList){
+ StaticsShopMgtGoodsVO vo = orderService.getGoodsSellStatic(goodsIdList);
+ vo.setGoodsNum(goodsIdList.size());
+ return R.ok(vo);
+ }
+
+
+ /**
+ * 获取今日到店用户
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/countShopServicePerson")
+ public R<List<Integer>> countShopServicePerson(@RequestParam("shopId") Long shopId){
+ 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