update运营商VIP

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java

@@ -119,5 +119,5 @@ public interface MemberBasicInfoMapper {
 	 */
 	List<MerchantInfoVO> getMerchantListByAuth(@Param("deptIds") List<String> deptIds);
 
-	List<MerchantVipVO> queryMerchantVipList(@Param("merchantIdList") List<String> merchantIdList);
+	List<MerchantVipVO> queryMerchantVipList(@Param("merchantIdList") List<String> merchantIdList, @Param("dto") QueryMemberInfoDTO dto);
 }

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

@@ -488,7 +488,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 		List<MerchantInfoVO> merchantInfoVOList = loginUserDetail.getMerchantInfoVOList();
 		List<String> merchantIdList = merchantInfoVOList.stream()
 				.map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
-		List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList);
+		List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList, dto);
 
 		return resultList;
 	}

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

@@ -272,5 +272,9 @@
         <foreach collection="merchantIdList" item="merchantId" open="(" separator="," close=")">
             #{merchantId,jdbcType=VARCHAR}
         </foreach>
+        <if test="dto.mobileNumber != null and dto.mobileNumber != ''">
+            and t2.mobile_number like '%${dto.mobileNumber}%'
+        </if>
+        <if test="dto.memberId != null and dto.memberId != ''">and t2.member_id like '%${dto.memberId}%'</if>
     </select>
 </mapper>

jsowell-ui/src/views/member/merchantVIP/index.vue

@@ -280,6 +280,8 @@ export default {
             rules: {},
             // 开卡参数
             createMerchantVip: {},
+            // 充值/扣款
+            updateMerchantVip: {},
         };
     },
     computed: {