From 0b9e60f0bada4cc39187a9dd3c36bf37452f63de Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 七月 2025 18:58:10 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 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 25826b4..4b2ae44 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
@@ -1,20 +1,28 @@
package com.ruoyi.order.controller.concole;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
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;
import java.math.BigDecimal;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* @author jqs34
@@ -32,6 +40,12 @@
@Resource
private ConsumerGoodsService consumerGoodsService;
+
+ @Resource
+ private UserServiceRecordService userServiceRecordService;
+
+ @Resource
+ private RemoteGoodsService remoteGoodsService;
@PostMapping("/getAppOrderTotal")
@@ -114,7 +128,7 @@
*/
@PostMapping("/autoCancelOrder")
public R autoCancelOrder(@RequestBody String orderId){
- orderService.autoCancelOrder(orderId);
+ orderService.autoCancelOrder(orderId, 1);
return R.ok();
}
@@ -193,10 +207,53 @@
* @param goodsIdList
* @return
*/
- @PostMapping("/order/getGoodsSellStatic")
+ @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 = null;
+ if(null != orderVo.getGoodsId()){
+ goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
+ }
+ orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsName(), orderVo.getGoodsNum(), orderVo.getId(), 2);
+ return R.ok();
+ }
+
+
+ /**
+ * 获取剩余服务类型对应的用户id
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/getConsumerGoodsResidueUserId")
+ public R<Set<Long>> getConsumerGoodsResidueUserId(@RequestParam("shopId") Long shopId, @RequestParam("goodsType") Integer goodsType){
+ List<ConsumerGoods> list = consumerGoodsService.list(new QueryWrapper<ConsumerGoods>().eq("del_flag", 0)
+ .eq("service_status", 1).eq("shop_id", shopId).eq("cycle_num_flag", 1).eq("goods_type", goodsType));
+ Set<Long> collect = list.stream().map(ConsumerGoods::getUserId).collect(Collectors.toSet());
+ return R.ok(collect);
+ }
}
--
Gitblit v1.7.1