update

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -325,7 +325,7 @@ public class MemberService {
 		dto.setEndDate(lastDay);
 
 		// 查询会员钱包信息表，获取 本金余额
-		MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId());
+		MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId(), null);
 		if (memberWalletInfo == null) {
 			// 用户未注册小程序
 			throw new BusinessException(ReturnCodeEnum.CODE_AUTHENTICATION_ERROR);

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java

@@ -73,7 +73,7 @@ public class MemberBasicInfoController extends BaseController {
     public RestApiResponse<?> getMerchantListByAuth() {
         RestApiResponse<?> response = null;
         List<String> deptIds = getDeptIds();
-        List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth(deptIds);
+        List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuthV2(deptIds);
         if (CollectionUtils.isEmpty(list)) {
             list = new ArrayList<>();
         }

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

@@ -1,6 +1,7 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.MemberWalletInfo;
+import org.apache.ibatis.annotations.Param;
 
 public interface MemberWalletInfoMapper {
     /**
@@ -51,5 +52,7 @@ public interface MemberWalletInfoMapper {
      */
     int updateByPrimaryKey(MemberWalletInfo record);
 
-    MemberWalletInfo selectByMemberId(String memberId);
+    // MemberWalletInfo selectByMemberId(String memberId);
+
+    MemberWalletInfo selectByMemberId(@Param("memberId") String memberId, @Param("merchantId") String merchantId);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java

@@ -153,4 +153,6 @@ public interface IMemberBasicInfoService {
 	 * 获取当前会员中的运营商列表（带权限校验）
 	 */
 	List<MerchantInfoVO> getMerchantListByAuth(List<String> deptIds);
+
+	List<MerchantInfoVO> getMerchantListByAuthV2(List<String> deptIds);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java

@@ -11,7 +11,7 @@ public interface MemberWalletInfoService {
 
 	MemberWalletInfo selectByPrimaryKey(Integer id);
 
-	MemberWalletInfo selectByMemberId(String memberId);
+	MemberWalletInfo selectByMemberId(String memberId, String merchantId);
 
 	int updateByPrimaryKeySelective(MemberWalletInfo record);
 

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

@@ -177,7 +177,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 		BigDecimal updatePrincipalBalance = dto.getUpdatePrincipalBalance();
 		log.info("修改用户余额 memberId:{}, updatePrincipalBalance:{}, updateGiftBalance:{}", memberId, updatePrincipalBalance, updateGiftBalance);
 		// 查询用户余额
-		MemberWalletInfo info = memberWalletInfoMapper.selectByMemberId(memberId);
+		MemberWalletInfo info = memberWalletInfoMapper.selectByMemberId(memberId, dto.getMerchantId());
 		if (info == null) {
 			log.warn("根据会员id:{}, 查询会员信息为空", memberId);
 			return 0;
@@ -427,5 +427,15 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 		return memberBasicInfoMapper.getMerchantListByAuth(deptIds);
 	}
 
+	/**
+	 * 获取当前会员中的运营商列表（带权限校验）
+	 */
+	@Override
+	public List<MerchantInfoVO> getMerchantListByAuthV2(List<String> deptIds) {
+		// 获取登录用户 所有有权限运营商
+		SecurityUtils.getAuthorizedMap();
+		return null;
+	}
+
 
 }

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

@@ -34,8 +34,8 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService {
     }
 
     @Override
-    public MemberWalletInfo selectByMemberId(String memberId) {
+    public MemberWalletInfo selectByMemberId(String memberId, String merchantId) {
-        return memberWalletInfoMapper.selectByMemberId(memberId);
+        return memberWalletInfoMapper.selectByMemberId(memberId, merchantId);
     }
 
     @Override

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/UpdateMemberBalanceDTO.java

@@ -19,6 +19,11 @@ public class UpdateMemberBalanceDTO {
 	 */
 	private String memberId;
 
+	/**
+	 * 所属运营商id
+	 */
+	private String merchantId;
+
 	/**
 	 * 更新类型
 	 * 1-进账；2-出账

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

@@ -180,7 +180,8 @@
     select
     <include refid="Base_Column_List" />
     from member_wallet_info
-    where member_id = #{memberId,jdbcType=INTEGER}
+    where del_flag = '0'
-    and del_flag = '0'
+    and member_id = #{memberId,jdbcType=INTEGER}
+    and merchant_id = #{merchantId,jdbcType=VARCHAR}
   </select>
 </mapper>

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

@@ -207,7 +207,20 @@
         <el-dialog title="会员充值/扣款" @close="closeUpdateBalance" :visible.sync="openUpdateBalance" width="500px"
                    append-to-body>
             <p>线下充值本金，客户直接在线下付款给商家</p>
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+                <el-form-item label="选择运营商">
+                    <el-select
+                        v-model="queryParams.merchantId"
+                        clearable placeholder="请选择运营商"
+                    >
+                        <el-option
+                            v-for="item in merchantList"
+                            :key="item.merchantName"
+                            :label="item.merchantName"
+                            :value="item.merchantId">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="操作类型">
                     <el-radio v-model="type" label="1" border>充值</el-radio>
                     <el-radio v-model="type" label="2" border>扣款</el-radio>
@@ -320,10 +333,10 @@ export default {
         },
         // 获取运营商列表
         getMerchantList() {
-            // getMerchantList().then((response) =>{
+            getMerchantList().then((response) =>{
-            //   console.log("response", response)
+              console.log("response", response)
-            //   this.merchantList = response.obj
+              this.merchantList = response.obj
-            // })
+            })
         },
         // 取消按钮
         cancel() {