From 981aacc8d5de2638a0f5b3eb2585e64cfaf2807d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 七月 2025 18:01:19 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 11 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 f3a8f1d..3a53671 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,19 +1,17 @@
package com.ruoyi.order.controller.concole;
+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.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.vo.AppOrderTotalVo;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.system.api.domain.vo.*;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -35,6 +33,9 @@
@Resource
private ConsumerGoodsService consumerGoodsService;
+
+ @Resource
+ private UserServiceRecordService userServiceRecordService;
@PostMapping("/getAppOrderTotal")
@@ -59,12 +60,13 @@
* @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());
+ mgtBulletinBoardVo.setActivityUserTotal(mgtBulletinBoardVoOrder.getActivityUserTotal());
return R.ok(mgtBulletinBoardVo);
}
@@ -116,7 +118,101 @@
*/
@PostMapping("/autoCancelOrder")
public R autoCancelOrder(@RequestBody String orderId){
- orderService.autoCancelOrder(orderId);
+ orderService.autoCancelOrder(orderId, 1);
return R.ok();
}
+
+ /**
+ * @description 销量排行
+ * @author jqs
+ * @date 2023/8/24 18:24
+ * @param shopIdList
+ * @return R<List<MgtMapBigTotalVo>>
+ */
+ @PostMapping("/shopSalesRank")
+ public R<List<MgtMapBigTotalVo>> shopSalesRank(@RequestBody List<Long> shopIdList){
+ List<MgtMapBigTotalVo> mapIntTotalVoList= orderService.shopSalesRank(shopIdList);
+ return R.ok(mapIntTotalVoList);
+ }
+
+ /**
+ * @description 获取商户服务统计
+ * @author jqs
+ * @date 2023/8/24 18:29
+ * @param shopId
+ * @return R<MerHomeShopTotalVo>
+ */
+ @PostMapping("/getShopServiceTotal")
+ public R<MerHomeShopTotalVo> getShopServiceTotal(@RequestBody Long shopId){
+ MerHomeShopTotalVo homeShopTotalVo= orderService.getShopServiceTotal(shopId);
+ return R.ok(homeShopTotalVo);
+ }
+
+ /**
+ * @description 获取区域统计
+ * @author jqs
+ * @date 2023/8/25 11:52
+ * @param shopIdList
+ * @return R<AgencyTotalVo>
+ */
+ @PostMapping("/getAgencyTotalVo")
+ public R<AgencyTotalVo> getAgencyTotalVo(@RequestBody List<Long> shopIdList){
+ AgencyTotalVo agencyTotalVo= orderService.getAgencyTotalVo(shopIdList);
+ return R.ok(agencyTotalVo);
+ }
+
+ /**
+ * @description 获取用户统计
+ * @author jqs
+ * @date 2023/8/29 17:38
+ * @param merBaseDto
+ * @return R<MerMemberSimpleTotalVo>
+ */
+ @PostMapping("/getMerMemberSimpleTotalVo")
+ public R<MerMemberSimpleTotalVo> getMerMemberSimpleTotalVo(@RequestBody MerBaseDto merBaseDto){
+ MerMemberSimpleTotalVo memberSimpleTotalVo= orderService.getMerMemberSimpleTotalVo(merBaseDto);
+ return R.ok(memberSimpleTotalVo);
+ }
+
+
+ @GetMapping("/queryBill")
+ public R<ProfitSharingResult> queryBill(String orderId) throws WxPayException {
+ 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);
+ }
}
--
Gitblit v1.7.1