From 4346afa63c92d7381cf5314b1c279202a305f8d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Aug 2022 18:01:03 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 13 ++++++++-----
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 2 ++
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 3 ++-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index c4e52ab..78fad81 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
+import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
import cc.mrbird.febs.mall.conversion.MallTeamLeaderConversion;
import cc.mrbird.febs.mall.dto.*;
@@ -42,6 +43,13 @@
@Service
@RequiredArgsConstructor
public class ApiMallTeamLeaderServiceImpl extends ServiceImpl<MallTeamLeaderMapper, MallTeamLeader> implements IApiMallTeamLeaderService {
+
+
+ private final MallOrderInfoMapper mallOrderInfoMapper;
+ private final MallTeamLeaderMapper mallTeamLeaderMapper;
+ private final MallMemberMapper mallMemberMapper;
+ private final IXcxPayService iXcxPayService;
+ private final SpringContextHolder springContextHolder;
@Override
@Transactional
@@ -117,11 +125,6 @@
IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiLeaderOrderListInPage(page, apiLeaderOrderListDto);
return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
}
-
- private final MallOrderInfoMapper mallOrderInfoMapper;
- private final MallTeamLeaderMapper mallTeamLeaderMapper;
- private final MallMemberMapper mallMemberMapper;
- private final IXcxPayService iXcxPayService;
@Override
@Transactional
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
index 6fcd151..40d6e17 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -41,6 +41,8 @@
WeixinServiceUtil weixinServiceUtil;
@Autowired
RedisUtils redisUtils;
+ @Autowired
+ private SpringContextHolder springContextHolder;
private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index aff7cc1..4518cc7 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -55,7 +55,8 @@
</select>
<select id="selectOrderByMemberIdAndId" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
- select * from mall_order_info where member_id=#{memberId} and id=#{id}
+ select * from mall_order_info
+ inner join mall_order_item b on a.id=b.order_id where member_id=#{memberId} and id=#{id}
</select>
<select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
--
Gitblit v1.9.1