区分渠道用户注册和登录

yt-app/app-service/src/main/java/com/ytpm/dao/AppUserMapper.java

@@ -13,7 +13,7 @@ public interface AppUserMapper {
     /**
      * openid查询用户信息
      */
-    YtDyzUser getYtAppUser(@Param("openid")String openid);
+    YtDyzUser getYtAppUser(@Param("openid")String openid,@Param("ditchId")long ditchId);
 
     /**
      * 主键查询

yt-app/app-service/src/main/java/com/ytpm/service/AppUserService.java

@@ -6,5 +6,5 @@ public interface AppUserService {
     /**
      * openid查询用户信息
      */
-    YtDyzUser selectByOpenid(String openid);
+    YtDyzUser selectByOpenid(String openid, long ditchId);
 }

yt-app/app-service/src/main/java/com/ytpm/service/impl/AppUserServiceImpl.java

@@ -16,7 +16,7 @@ public class AppUserServiceImpl implements AppUserService {
      * openid查询用户信息
      */
     @Override
-    public YtDyzUser selectByOpenid(String openid) {
-        return appUserMapper.getYtAppUser(openid);
+    public YtDyzUser selectByOpenid(String openid,long ditchId) {
+        return appUserMapper.getYtAppUser(openid,ditchId);
     }
 }

yt-app/app-service/src/main/resources/mapper/AppUserMapper.xml

@@ -138,6 +138,7 @@
            user_id, ditch_id, nick_name,head_img, power, registry_time, last_login_time, last_login_ip, login_days, total_video, total_income, red_packet_balance, red_packet_amount, points_balance, points_total, withdraw_total, sign_days, user_status, risk_reason, wx_open_id, platform_id
         from yt_dyz_user
         where wx_open_id = #{openid}
+        and ditch_id = #{ditchId}
     </select>
     <select id="queryAll" resultType="com.ytpm.app.model.YtDyzUser">
         select