希晓会员查询会员详情

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

@@ -364,6 +364,11 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 			return null;
 		}
 
+		if (StringUtils.equals("35", vo.getMerchantId())) {
+			// 如果会员属于希晓，那么merchantId默认为希晓的运营商id
+			merchantId = "35";
+		}
+
 		try {
 			BigDecimal totalAccountAmount = BigDecimal.ZERO;
 			BigDecimal principalBalance = BigDecimal.ZERO;

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java

@@ -24,6 +24,9 @@ public class MemberVO {
      */
     private String memberId;
 
+    /**
+     * 会员所属一级运营商
+     */
     private String merchantId;
 
     /**

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

@@ -185,7 +185,8 @@
             t1.STATUS as status,
             t1.nick_name as nickName,
             t1.avatar_url as avatarUrl,
-            t1.mobile_number as mobileNumber
+            t1.mobile_number as mobileNumber,
+            t1.merchant_id as merchantId
             <!--t2.principal_balance as principalBalance,
             t2.gift_balance as giftBalance-->
         FROM