From 921f30c2112b68307d8b57b089dd582273df7ddb Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 20:16:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml | 30 +++++++-------
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 39 +++++++++++--------
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 5 --
3 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
index 903a8be..e6ff9d7 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
@@ -809,10 +809,10 @@
FROM (SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL SELECT 10) numbers
INNER JOIN t_member ON CHAR_LENGTH(member_nurse) - CHAR_LENGTH(REPLACE(member_nurse, ',', '')) >= numbers.n - 1
<if test="param.shopId != null and param.shopId != ''">
- AND relation_shop_id = #{param.shopId}
+ AND binding_flag = 1 AND relation_shop_id = #{param.shopId}
</if>
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
- AND relation_shop_id IN
+ AND binding_flag = 1 AND relation_shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@@ -833,10 +833,10 @@
FROM t_member
WHERE (level IS NOT NULL OR level != '')
<if test="param.shopId != null and param.shopId != ''">
- AND relation_shop_id = #{param.shopId}
+ AND binding_flag = 1 AND relation_shop_id = #{param.shopId}
</if>
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
- AND relation_shop_id IN
+ AND binding_flag = 1 AND relation_shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@@ -857,10 +857,10 @@
FROM (SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4) numbers
INNER JOIN t_member ON CHAR_LENGTH(goods_type) - CHAR_LENGTH(REPLACE(goods_type, ',', '')) >= numbers.n - 1
<if test="param.shopId != null and param.shopId != ''">
- AND relation_shop_id = #{param.shopId}
+ AND binding_flag = 1 AND relation_shop_id = #{param.shopId}
</if>
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
- AND relation_shop_id IN
+ AND binding_flag = 1 AND relation_shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@@ -883,10 +883,10 @@
LEFT JOIN t_member_total tmt ON tm.member_id = tmt.member_id
WHERE tm.del_Flag = 0
<if test="param.shopId != null and param.shopId != ''">
- AND tm.relation_shop_id = #{param.shopId}
+ AND binding_flag = 1 AND tm.relation_shop_id = #{param.shopId}
</if>
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
- AND tm.relation_shop_id IN
+ AND binding_flag = 1 AND tm.relation_shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@@ -907,10 +907,10 @@
INNER JOIN t_member_total tmt ON tm.member_id = tmt.member_id
WHERE tm.del_flag = 0
<if test="param.shopId != null and param.shopId != ''">
- AND tm.relation_shop_id = #{param.shopId}
+ AND binding_flag = 1 AND tm.relation_shop_id = #{param.shopId}
</if>
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
- AND tm.relation_shop_id IN
+ AND binding_flag = 1 AND tm.relation_shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@@ -921,7 +921,7 @@
<if test="param.endDate!=null and param.endDate!=''">
AND Date(tm.create_time) <= #{param.endDate}
</if>
- ORDER BY tmt.total_pay_count DESC LIMIT 15
+ ORDER BY tmt.total_pay_count DESC LIMIT 10
</select>
<select id="getMerMemberCustomerSourceRank" resultType="com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo">
@@ -930,10 +930,10 @@
COUNT(tm.user_id) mapValue
FROM t_member tm WHERE tm.del_flag = 0
<if test="param.shopId != null and param.shopId != ''">
- AND tm.relation_shop_id = #{param.shopId}
+ AND binding_flag = 1 AND tm.relation_shop_id = #{param.shopId}
</if>
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
- AND tm.relation_shop_id IN
+ AND binding_flag = 1 AND tm.relation_shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
@@ -955,10 +955,10 @@
COUNT(tm.user_id) mapValue
FROM t_member tm WHERE tm.del_flag = 0
<if test="param.shopId != null and param.shopId != ''">
- AND tm.relation_shop_id = #{param.shopId}
+ AND binding_flag = 1 AND tm.relation_shop_id = #{param.shopId}
</if>
<if test="param.shopIdList != null and param.shopIdList.size() > 0">
- AND tm.relation_shop_id IN
+ AND binding_flag = 1 AND tm.relation_shop_id IN
<foreach collection="param.shopIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 2360bd9..b72c487 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -3265,11 +3265,6 @@
merTotalDto.setShopIdList(shopIdList);
merTotalDto.setShopId(null);
}
- if (merTotalDto.getShopAllFlag() != null && merTotalDto.getShopAllFlag() == 1) {
- List<Long> shopIdList = remoteShopService.listShopIdByShopId(merTotalDto.getShopId()).getData();
- merTotalDto.setShopIdList(shopIdList);
- merTotalDto.setShopId(null);
- }
MerOrderTotalVo orderTotalVo = orderMapper.getMerOrderTotalOrderFrom(merTotalDto);
MerOrderTotalVo goodsTypeVo = orderMapper.getMerTotalOrderTotalGoodsType(merTotalDto);
orderTotalVo.setCycleTotal(goodsTypeVo.getCycleTotal());
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 b9e07b7..e03ea45 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
@@ -722,12 +722,12 @@
IFNULL(SUM(CASE WHEN tog.goods_type = 1 THEN 1 ELSE 0 END),0) cycleTotal,
IFNULL(SUM(CASE WHEN tog.goods_type = 3 THEN 1 ELSE 0 END),0) experienceTotal,
IFNULL(SUM(CASE WHEN tog.goods_type = 2 THEN 1 ELSE 0 END),0) serviceTotal,
- IFNULL(SUM(CASE WHEN tog.goods_type = 1 THEN tog.goods_total_money ELSE 0 END),0) cycleMoney,
- IFNULL(SUM(CASE WHEN tog.goods_type = 3 THEN tog.goods_total_money ELSE 0 END),0) experienceMoney,
- IFNULL(SUM(CASE WHEN tog.goods_type = 2 THEN tog.goods_total_money ELSE 0 END),0) serviceMoney
+ IFNULL(SUM(CASE WHEN tog.goods_type = 1 THEN tog.goods_receivable_money ELSE 0 END),0) cycleMoney,
+ IFNULL(SUM(CASE WHEN tog.goods_type = 3 THEN tog.goods_receivable_money ELSE 0 END),0) experienceMoney,
+ IFNULL(SUM(CASE WHEN tog.goods_type = 2 THEN tog.goods_receivable_money ELSE 0 END),0) serviceMoney
FROM t_order toc
INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
- WHERE toc.del_flag = 0
+ WHERE toc.del_flag = 0 AND order_status IN (2,3)
<if test="param.shopId != null and param.shopId != ''">
AND toc.shop_id = #{param.shopId}
</if>
@@ -1364,10 +1364,10 @@
IFNULL(SUM(CASE WHEN order_from = 3 THEN 1 ELSE 0 END),0) offlineTotal,
IFNULL(SUM(CASE WHEN order_from = 2 THEN 1 ELSE 0 END),0) activityTotal,
IFNULL(SUM(order_money),0) orderMoney,
- IFNULL(SUM(CASE WHEN order_from = 1 THEN order_money ELSE 0 END),0) onlineMoney,
- IFNULL(SUM(CASE WHEN order_from = 3 THEN order_money ELSE 0 END),0) offlineMoney,
- IFNULL(SUM(CASE WHEN order_from = 2 THEN order_money ELSE 0 END),0) activityMoney
- FROM t_order WHERE del_flag = 0
+ IFNULL(SUM(CASE WHEN order_from = 1 THEN change_receivable_money ELSE 0 END),0) onlineMoney,
+ IFNULL(SUM(CASE WHEN order_from = 3 THEN change_receivable_money ELSE 0 END),0) offlineMoney,
+ IFNULL(SUM(CASE WHEN order_from = 2 THEN change_receivable_money ELSE 0 END),0) activityMoney
+ FROM t_order WHERE del_flag = 0 AND order_status IN (2,3)
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -1393,7 +1393,7 @@
SUM(tog.goods_receivable_money) AS mapValueSecond
FROM t_order toc
INNER JOIN t_order_goods tog ON toc.order_id = tog.order_id
- WHERE toc.del_flag = 0 AND tog.del_flag = 0 AND tog.goods_type = #{param.goodsType}
+ WHERE toc.del_flag = 0 AND toc.order_status IN (2,3) AND tog.del_flag = 0 AND tog.goods_type = #{param.goodsType}
<if test="param.shopId != null and param.shopId != ''">
AND shop_id = #{param.shopId}
</if>
@@ -1411,11 +1411,10 @@
SELECT
tog.goods_type mapKey,
COUNT(DISTINCT toc.order_id) AS mapValueFirst,
- IFNULL(SUM(tog.goods_total_money),0) AS mapValueSecond
- FROM
- t_order toc
+ IFNULL(SUM(tog.goods_receivable_money),0) AS mapValueSecond
+ FROM t_order toc
INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
- WHERE toc.del_flag = 0
+ WHERE toc.del_flag = 0 AND toc.order_status IN (2,3)
<if test="param.shopId != null and param.shopId != ''">
AND toc.shop_id = #{param.shopId}
</if>
@@ -1437,10 +1436,13 @@
<select id="listMerOrderTotalGoodsRank" resultType="com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo">
SELECT
tog.goods_name mapKey,
- IFNULL(SUM(tog.goods_total_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
+ WHERE toc.del_flag = 0 AND toc.order_status IN (2,3)
+ <if test="param.goodsType != null and param.goodsType != ''">
+ AND tog.goods_type = #{param.goodsType}
+ </if>
<if test="param.shopId != null and param.shopId != ''">
AND toc.shop_id = #{param.shopId}
</if>
@@ -1457,7 +1459,7 @@
AND Date(toc.create_time) <= #{param.endDate}
</if>
GROUP BY tog.goods_name
- ORDER BY SUM(tog.goods_total_money) DESC LIMIT 10
+ ORDER BY mapValue DESC LIMIT 15
</select>
<select id="listMerOrderTotalOrderFrom" resultType="com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo">
@@ -1469,7 +1471,10 @@
END mapKey,
IFNULL(SUM(toc.order_money),0) mapValue
FROM t_order toc
- WHERE toc.del_flag = 0
+ WHERE toc.del_flag = 0 AND toc.order_status IN (2,3)
+ <if test="param.goodsType != null and param.goodsType != ''">
+ AND tog.goods_type = #{param.goodsType}
+ </if>
<if test="param.shopId != null and param.shopId != ''">
AND toc.shop_id = #{param.shopId}
</if>
--
Gitblit v1.7.1