From 3660bfa60949ab823f6604b3e49067275c481b22 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 14:34:05 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 9 +++++----
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 12 ++++++------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index acb4460..cde7600 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -1555,7 +1555,7 @@
<if test="param.endDate!=null and param.endDate!=''">
AND Date(toc.create_time) <= #{param.endDate}
</if>
- GROUP BY tog.goods_name
+ GROUP BY mapValue
ORDER BY mapValue DESC LIMIT 15
</select>
@@ -1566,8 +1566,9 @@
WHEN 2 THEN "秒杀活动订单"
WHEN 3 THEN "线下创建订单"
END mapKey,
- IFNULL(SUM(toc.order_money),0) mapValue
+ IFNULL(SUM(tog.goods_receivable_money),0) mapValue
FROM t_order toc
+ INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
WHERE toc.del_flag = 0 AND toc.order_status = 3
<if test="param.goodsType != null and param.goodsType != ''">
AND tog.goods_type = #{param.goodsType}
@@ -1587,8 +1588,8 @@
<if test="param.endDate!=null and param.endDate!=''">
AND Date(toc.create_time) <= #{param.endDate}
</if>
- GROUP BY toc.order_from
- ORDER BY SUM(toc.order_money) DESC LIMIT 15
+ GROUP BY mapKey
+ ORDER BY mapValue DESC LIMIT 15
</select>
<select id="totalMerOrder" resultType="com.ruoyi.order.domain.vo.MerTotalOrderVo">
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index d5755f5..5ca75f3 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -243,7 +243,7 @@
shop.setCreateTime(new Date());
shop.setCreateUserId(mgtEditShopDto.getUserId());
shop.setFrozenFlag(0);
- shop.setCooperativeFlag(0);
+ shop.setCooperativeFlag(1);
shop.setAuthFlag(0);
newShop = true;
}
@@ -1330,16 +1330,16 @@
MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
merHomeShopTotalVo.setShopId(shopId);
// 通过远程订单服务获取商店总览信息
- MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
+ //MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
// 获取商店任务计数
Integer taskCount = memberTaskService.getMemberIngTotal(shopId);
// 设置员工商店信息对象的属性
staffShopInfoGetVo.setTodayReservation(0);
- staffShopInfoGetVo.setUnHandleOrder(orderVo.getUnHandleOrder());
+ //staffShopInfoGetVo.setUnHandleOrder(orderVo.getUnHandleOrder());
staffShopInfoGetVo.setShopTask(taskCount);
- staffShopInfoGetVo.setShopTurnover(orderVo.getShopTurnover());
- staffShopInfoGetVo.setCycleSurp(orderVo.getCycleSurp());
- staffShopInfoGetVo.setExplorationSurp(orderVo.getExplorationSurp());
+ //staffShopInfoGetVo.setShopTurnover(orderVo.getShopTurnover());
+ //staffShopInfoGetVo.setCycleSurp(orderVo.getCycleSurp());
+ //staffShopInfoGetVo.setExplorationSurp(orderVo.getExplorationSurp());
staffShopInfoGetVo.setShopId(shopId);
staffShopInfoGetVo.setShopName(shop.getShopName());
staffShopInfoGetVo.setShopType(shop.getShopType());
--
Gitblit v1.7.1