Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/adapay/demo/MainDemo.java

@@ -17,7 +17,7 @@ public class MainDemo {
 		testMerchant();
 
 		//若是技术性渠道商为其它商户提供服务功能，请使用多商户模式
-		// testMultiMerchant();
+		testMultiMerchant();
 	}
 
 	public static void testMerchant() throws Exception {

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

@@ -1167,7 +1167,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         if (StringUtils.isBlank(transactionCode)) {
             return resultList;
         }
-        // logger.info("transactionCode:{}", transactionCode);
         String pileConnectorCode = transactionCode.substring(0, 16);
         String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode;
         // 拿到所有数据

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

@@ -331,7 +331,6 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 
 	@Override
 	public PileInfoVO selectPileInfoBySn(String pileSn) {
-		// TODO 换成缓存方法
 		PileBasicInfo basicInfo = selectPileBasicInfoBySN(pileSn);
 		if (basicInfo == null) {
 			return null;

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

@@ -59,4 +59,8 @@ public class MemberVO {
      */
     private List<String> plateNumberList;
 
+    /**
+     * 头像地址
+     */
+    private String avatarUrl;
 }

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

@@ -165,7 +165,7 @@
         <include refid="Base_Column_List"/>
         FROM member_basic_info
         WHERE del_flag = '0'
-        and member_id = #{memberId,jdbcType=VARCHAR,jdbcType=VARCHAR}
+        and member_id = #{memberId,jdbcType=VARCHAR}
     </select>
 
     <update id="updateMemberBalance">
@@ -201,7 +201,8 @@
             t1.nick_name as nickName,
             t1.mobile_number as mobileNumber,
             t2.principal_balance as principalBalance,
-            t2.gift_balance as giftBalance
+            t2.gift_balance as giftBalance,
+            t1.avatar_url as avatarUrl
         FROM
             member_basic_info t1
             JOIN member_wallet_info t2 ON t1.member_id = t2.member_id