From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml | 14 +++++++-------
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml | 2 +-
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 6 +++++-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 4 ++--
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 2 ++
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml | 2 +-
ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java | 15 +++++++--------
7 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index a71a5ed..47f06d7 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -198,7 +198,7 @@
FROM t_goods tg
INNER JOIN t_goods_total tgt ON tg.goods_id = tgt.goods_id
LEFT JOIN t_goods_file tgf ON tg.goods_id = tgf.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
- LEFT JOIN t_shop_goods tsg ON tg.goods_id = tsg.goods_id AND tsg.shop_id = #{param.shopId}
+ LEFT JOIN t_shop_goods tsg ON tg.goods_id = tsg.goods_id AND tsg.shop_id = #{param.shopId} AND del_flag = 0
WHERE tg.del_flag = 0 AND tg.goods_status = 1
<if test="param.goodsType!=null and param.goodsType != ''">
AND tg.goods_type = #{param.goodsType}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 5009b91..f559ea3 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -1255,7 +1255,7 @@
menPercent = new BigDecimal("100.00");
womenPercent = new BigDecimal("0.00");
}else{
- menPercent = manTotalBig.divide(personTotalBig).setScale(0,BigDecimal.ROUND_HALF_UP);
+ menPercent = manTotalBig.divide(personTotalBig,2,BigDecimal.ROUND_HALF_UP);
womenPercent = bigTen.subtract(menPercent);
}
mgtTotalMemberTotalVo.setManPercent(menPercent);
@@ -1398,7 +1398,7 @@
menPercent = new BigDecimal("100.00");
womenPercent = new BigDecimal("0.00");
}else{
- menPercent = manTotalBig.divide(personTotalBig).setScale(0,BigDecimal.ROUND_HALF_UP);
+ menPercent = manTotalBig.divide(personTotalBig,2,BigDecimal.ROUND_HALF_UP);
womenPercent = bigTen.subtract(menPercent);
}
plTotalMemberTotalVo.setManTotal(manTotal);
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 7c79354..f1f41a2 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
@@ -425,7 +425,7 @@
FROM (
SELECT member_id, SUBSTRING_INDEX(SUBSTRING_INDEX(member_nurse, ',', numbers.n), ',', -1) member_nurse
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 UNION ALL SELECT 11 UNION ALL SELECT 12 UNION ALL SELECT 13 UNION ALL SELECT 14 UNION ALL SELECT 15 UNION ALL SELECT 16 UNION ALL SELECT 17 UNION ALL SELECT 18 UNION ALL SELECT 19 UNION ALL SELECT 20 UNION ALL SELECT 21 UNION ALL SELECT 22 UNION ALL SELECT 23 UNION ALL SELECT 24 UNION ALL SELECT 25 UNION ALL SELECT 26 UNION ALL SELECT 27 UNION ALL SELECT 28 UNION ALL SELECT 29 UNION ALL SELECT 30 UNION ALL SELECT 31 UNION ALL SELECT 32 UNION ALL SELECT 33 UNION ALL SELECT 34 UNION ALL SELECT 35 UNION ALL SELECT 36 UNION ALL SELECT 37 UNION ALL SELECT 38 UNION ALL SELECT 39 UNION ALL SELECT 40) numbers
- INNER JOIN t_member ON CHAR_LENGTH(member_nurse) - CHAR_LENGTH(REPLACE(member_nurse, ',', '')) >= numbers.n - 1
+ INNER JOIN t_member ON CHAR_LENGTH(member_nurse) - CHAR_LENGTH(REPLACE(member_nurse, ',', '')) >= numbers.n - 1 AND del_flag = 0 AND binding_flag = 1
<if test="param.shopId != null and param.shopId != ''">
AND relation_shop_id = #{param.shopId}
</if>
@@ -443,7 +443,7 @@
<select id="getTotalMemberTotalLevel" resultType="com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo">
SELECT level mapKey, COUNT(*) mapValue
FROM t_member
- WHERE (level IS NOT NULL OR level != '')
+ WHERE (level IS NOT NULL OR level != '') AND del_flag = 0 AND binding_flag = 1
<if test="param.shopId != null and param.shopId != ''">
AND relation_shop_id = #{param.shopId}
</if>
@@ -461,7 +461,7 @@
FROM (
SELECT member_id, SUBSTRING_INDEX(SUBSTRING_INDEX(goods_type, ',', numbers.n), ',', -1) goods_type
FROM (SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5) numbers
- INNER JOIN t_member ON CHAR_LENGTH(goods_type) - CHAR_LENGTH(REPLACE(goods_type, ',', '')) >= numbers.n - 1
+ INNER JOIN t_member ON CHAR_LENGTH(goods_type) - CHAR_LENGTH(REPLACE(goods_type, ',', '')) >= numbers.n - 1 AND del_flag = 0 AND binding_flag = 1
<if test="param.shopId != null and param.shopId != ''">
AND relation_shop_id = #{param.shopId}
</if>
@@ -481,7 +481,7 @@
COUNT(tm.member_id)
FROM t_member tm
LEFT JOIN t_member_total tmt ON tm.member_id = tmt.member_id
- WHERE tm.del_Flag = 0
+ WHERE tm.del_Flag = 0 AND binding_flag = 1
<if test="shopId != null and shopId != ''">
AND tm.relation_shop_id = #{shopId}
</if>
@@ -499,7 +499,7 @@
tmt.total_pay_count mapValue
FROM t_member tm
INNER JOIN t_member_total tmt ON tm.member_id = tmt.member_id
- WHERE tm.del_flag = 0
+ WHERE tm.del_flag = 0 AND binding_flag = 1
<if test="param.shopId != null and param.shopId != ''">
AND tm.relation_shop_id = #{param.shopId}
</if>
@@ -561,7 +561,7 @@
SELECT
COUNT(*) AS memberTotal,
COUNT(CASE WHEN DATE(binding_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) THEN 1 END) AS memberYesterday,
- COUNT(CASE WHEN binding_time BETWEEN DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND CURDATE() THEN 1 END) AS memberSeven
+ COUNT(CASE WHEN binding_time BETWEEN DATE_SUB(CURDATE(), INTERVAL 6 DAY) AND DATE_SUB(CURDATE(), INTERVAL -1 DAY) THEN 1 END) AS memberSeven
FROM t_member WHERE del_flag = 0 AND binding_flag = 1
</select>
@@ -676,7 +676,7 @@
<select id="getPlTotalMemberRankPay" resultType="com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo">
SELECT
- tm.nick_name mapKey,
+ tm.real_name mapKey,
tmt.total_pay_count mapValue
FROM t_member tm
INNER JOIN t_member_total tmt ON tm.member_id = tmt.member_id
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 6ff0f42..b6305ca 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
@@ -3660,6 +3660,7 @@
List<MgtMapBigTotalVo> goodsRankList = orderMapper.listMerOrderTotalGoodsRank(merTotalDto);
if (goodsRankList != null && goodsRankList.size() > 0) {
goodsRankList = bigListRemoveNull(goodsRankList);
+ Collections.reverse(goodsRankList);
orderGoodsRankVo.setGoodsRankList(goodsRankList);
}
return orderGoodsRankVo;
@@ -3685,6 +3686,7 @@
List<MgtMapBigTotalVo> orderFromList = orderMapper.listMerOrderTotalOrderFrom(merTotalDto);
if (orderFromList != null && orderFromList.size() > 0) {
orderFromList = bigListRemoveNull(orderFromList);
+ Collections.reverse(orderFromList);
merOrderFromRankVo.setOrderFromRankList(orderFromList);
}
return merOrderFromRankVo;
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 a327624..d5755f5 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
@@ -1116,8 +1116,12 @@
String[] shopSalesKey = new String[shopSalesRank.size()];
BigDecimal[] shopSalesValue = new BigDecimal[shopSalesRank.size()];
// 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
+ Long shopId;
+ Shop shop;
for (int i = 0; i < shopSalesRank.size(); i++) {
- shopSalesKey[i] = shopSalesRank.get(i).getMapKey();
+ shopId = Long.valueOf(shopSalesRank.get(i).getMapKey());
+ shop = this.getByShopId(shopId);
+ shopSalesKey[i] = shop.getShopName();
shopSalesValue[i] = shopSalesRank.get(i).getMapValue();
}
plTotalShopTotalVo.setShopSalesRankKey(shopSalesKey);
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
index e8ca8c9..5bd8805 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
@@ -738,7 +738,7 @@
<select id="listShopSalesRank" resultType="java.lang.Long">
SELECT
- ts.shop_id mapKey,
+ ts.shop_name mapKey,
tst.total_order_money mapValue
FROM t_shop ts
INNER JOIN t_shop_total tst ON ts.shop_id = tst.shop_id
diff --git a/ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java b/ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java
index 53a62d2..3bd6e9b 100644
--- a/ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java
+++ b/ruoyi-modules/ruoyi-shop/src/test/java/com/ruioyi/shop/shopTest.java
@@ -1,10 +1,10 @@
package com.ruioyi.shop;
-import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverRequest;
-import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverResult;
import com.ruoyi.shop.RuoYiShopApplication;
+import com.ruoyi.shop.domain.vo.MgtPlTotalShopTotalVo;
import com.ruoyi.shop.service.shop.ShopService;
+import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
@@ -28,11 +28,10 @@
@Test
public void main() {
-
- ProfitSharingReceiverRequest request = new ProfitSharingReceiverRequest();
- request.setAccount("1650744551");
- request.setName("泸州矗众信息科技有限责任公司");
- ProfitSharingReceiverResult result = shopService.addProfitSharingReceiver(request);
- System.out.println(result);
+ MgtBasePlatformDto mgtBasePlatformDto = new MgtBasePlatformDto();
+ mgtBasePlatformDto.setDeptId(121L);
+ mgtBasePlatformDto.setUserId(146L);
+ MgtPlTotalShopTotalVo mgtPlTotalShopTotalVo = shopService.getPlTotalShopTotal(mgtBasePlatformDto);
+ System.out.println(mgtPlTotalShopTotalVo);
}
}
--
Gitblit v1.7.1