xyzc-start/src/main/java/com/xyzc/start/domain/BaseUser.java

@@ -42,7 +42,7 @@ public class BaseUser {
     /**
      * 用户头像
      */
-    private Long avatar;
+    private String avatar;
 
     /**
      * 微信openid

xyzc-start/src/main/java/com/xyzc/start/service/impl/UserInfoServiceImpl.java

@@ -80,7 +80,6 @@ public class UserInfoServiceImpl implements IUserInfoService {
         // 添加用户拥有的会员卡
         List<BaseUserMemberCardVo> memberCardVos = baseUserMapper.queryMyMemberCardByUserId(baseUserVo.getId());
         baseUserVo.setMemberCardCount(0);
-        baseUserVo.setMemberCardVoList(null);
         if (memberCardVos != null && !memberCardVos.isEmpty()) {
             baseUserVo.setMemberCardVoList(memberCardVos);
             // 添加用户会员卡数量

xyzc-start/src/main/java/com/xyzc/start/service/impl/WeiXinAuthServiceImpl.java

@@ -237,10 +237,9 @@ public class WeiXinAuthServiceImpl implements IWeiXinAuthService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AccessTokenVo getStatus(String ticket) {
-
         AccessTokenVo baseUserTokenVo = new AccessTokenVo();
 
-
+        // 判断用户是否已经扫码
         String userOpenid = sysParamsCache.getUserStatus(ticket);
         if (userOpenid == null || userOpenid.isEmpty()) {
             baseUserTokenVo.setStatus(WxScanStatus.NO_SCAN.getCode());

xyzc-start/src/main/resources/banner.txt

@@ -0,0 +1,10 @@
+-----------------------------------------------------------------------------
+
+    __   _______          ______     _______ ___________
+    \ \ / /_   _|   /\   / __ \ \   / /_   _|___  / ____|
+     \ V /  | |    /  \ | |  | \ \_/ /  | |    / / |
+      > <   | |   / /\ \| |  | |\   /   | |   / /| |
+     / . \ _| |_ / ____ \ |__| | | |   _| |_ / /_| |____
+    /_/ \_\_____/_/    \_\____/  |_|  |_____/_____\_____|
+
+-----------------------------------------------------------------------------

xyzc-start/src/main/resources/mapper/WebStart/BaseUserMapper.xml

@@ -34,10 +34,9 @@
                mcan.alias_name  as card_alias_name,
                mc.card_level    as card_level,
                oss.url          as oss_url,
-               bumc.create_time as create_time,
                bumc.expire_time as expire_time
-        from xy_base_user bu
-                 left join xy_base_user_member_card bumc on bu.id = bumc.base_user_id
+        from xy_base_user_member_card bumc
+                 left join xy_base_user bu on bu.id = bumc.base_user_id
                  left join xy_member_card mc on mc.id = bumc.memeber_id
                  left join xy_member_card_alias_name mcan
                            on bu.agent_mer_id = mcan.agent_mer_id and mc.id = mcan.member_card_id
@@ -48,12 +47,11 @@
     <select id="queryBaseUserVoById" resultType="com.xyzc.start.domain.vo.BaseUserVo">
         select bu.id        as id,
                bu.user_name as user_name,
-               bu.user_no   AS user_no,
+               bu.avatar    as avatar,
+               bu.user_no   AS user_id,
                bu.mobile,
-               bu.surplus_fuel,
-               oss.url      as avatar
+               bu.surplus_fuel
         from xy_base_user bu
-                 left join sys_oss oss on bu.avatar = oss.oss_id
         where id = #{userId}
     </select>