后管充值本金

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jsowell.pile.service.impl;
 
+import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Lists;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
@@ -18,6 +19,7 @@ import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper;
 import com.jsowell.pile.mapper.MemberWalletInfoMapper;
 import com.jsowell.pile.mapper.MemberWalletLogMapper;
 import com.jsowell.pile.service.IMemberBasicInfoService;
+import com.jsowell.pile.service.IMemberTransactionRecordService;
 import com.jsowell.pile.service.IPileBasicInfoService;
 import com.jsowell.pile.service.IPileMerchantInfoService;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
@@ -31,6 +33,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StopWatch;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -66,6 +69,9 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 	@Autowired
 	private IPileMerchantInfoService pileMerchantInfoService;
 
+	@Autowired
+	private IMemberTransactionRecordService memberTransactionRecordService;
+
 	/**
 	 * 查询会员基础信息
 	 *
@@ -249,6 +255,9 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 		if (CollectionUtils.isNotEmpty(logList)) {
 			memberWalletLogMapper.batchInsert(logList);
 		}
+
+		// 记录会员交易流水
+		// memberTransactionRecordService.insertSelective(memberTransactionRecord);
 		return i;
 	}
 
@@ -308,6 +317,9 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 	 */
 	@Override
 	public List<MemberVO>  selectMemberList(QueryMemberInfoDTO dto) {
+		StopWatch sw = new StopWatch("查询会员列表");
+
+		sw.start("获取登录账号信息");
 		// 获取登录账号信息
 		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
 		if (authorizedMap == null) {
@@ -317,14 +329,23 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 		if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
 			dto.setMerchantDeptIds(merchantDeptIds);
 		}
+		sw.stop();
 
+		sw.start("获取一级运营商信息");
 		PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(authorizedMap.getDeptId());
 		if (pileMerchantInfo != null) {
 			String id = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(pileMerchantInfo.getId() + "");
 			dto.setMerchantId(id);
 		}
+		sw.stop();
 
-		return memberBasicInfoMapper.selectMemberList(dto);
+		sw.start("查询数据库会员信息");
+		PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
+		List<MemberVO> memberVOS = memberBasicInfoMapper.selectMemberList(dto);
+		sw.stop();
+
+		log.info("查询耗时：{}", sw.prettyPrint());
+		return memberVOS;
 	}
 
 	/**

jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml

@@ -210,7 +210,9 @@
             member_basic_info t1
         JOIN member_wallet_info t2 ON t1.member_id = t2.member_id and t2.del_flag = '0'
         JOIN pile_merchant_info t3 ON t1.merchant_id = t3.id and t3.del_flag = '0'
-        left join member_plate_number_relation t4 on t4.member_id = t1.member_id and t4.del_flag = '0'
+        <if test="dto.vinCode != null">
+            join member_plate_number_relation t4 on t4.member_id = t1.member_id and t4.del_flag = '0'
+        </if>
         where
             t1.del_flag = '0'
         <if test="dto.mobileNumber != null and dto.mobileNumber != ''">and t1.mobile_number like '%${dto.mobileNumber}%'</if>
@@ -226,6 +228,7 @@
         <if test="dto.vinCode != null">
             and t4.vin_code like '%${dto.vinCode}%'
         </if>
+        GROUP BY (t1.member_id)
     </select>
 
     <select id="getMerchantListByAuth" resultType="com.jsowell.pile.vo.base.MerchantInfoVO">