Merge remote-tracking branch 'origin/master'

yt-common/src/main/java/com/ytpm/app/model/YtDyzUser.java

@@ -40,6 +40,13 @@ public class YtDyzUser extends PageMeta {
     /** 最新登录时间 */
     @ApiModelProperty("最新登录时间")
     private Date lastLoginTime;
+    /** 注册时间 */
+    @CustomField(node = 1)
+    @ApiModelProperty("注册时间")
+    private String registryTimeStr;
+    /** 最新登录时间 */
+    @ApiModelProperty("最新登录时间")
+    private String lastLoginTimeStr;
     /** 最新登录IP */
     @ApiModelProperty("最新登录IP")
     private String lastLoginIp;

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/controller/WxController.java

@@ -5,13 +5,12 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.ytpm.app.enums.AppTypeEnums;
 import com.ytpm.app.model.YtAppDefaultConfig;
 import com.ytpm.app.model.YtDyzPowerRecord;
 import com.ytpm.app.model.YtDyzUser;
-import com.ytpm.app.param.WxLoginParam;
 import com.ytpm.app.param.IosLoginParam;
+import com.ytpm.app.param.WxLoginParam;
 import com.ytpm.app.view.IosUserInfo;
 import com.ytpm.app.view.WxDefaultConfig;
 import com.ytpm.app.view.WxLoginResult;
@@ -97,9 +96,11 @@ public class WxController {
         if(result.getCode()!=200){
             return new Result<>(StatusCode.ACCESS_ERR,result.getMessage());
         }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        old.setLastLoginTime(new Date(sdf.format(old.getLastLoginTime())));
-        old.setRegistryTime(new Date(sdf.format(old.getRegistryTime())));
+        if (old.getLastLoginTime() != null && old.getRegistryTime() != null){
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            old.setLastLoginTimeStr(sdf.format(old.getLastLoginTime()));
+            old.setRegistryTimeStr(sdf.format(old.getRegistryTime()));
+        }
         //调用风控服务校验默认风控配置
         return Result.resultOk(RepMessage.LOGIN_SUCCESS, old);
     }

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/dao/AppUserMapper.java

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

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/service/impl/AppUserServiceImpl.java

@@ -72,7 +72,7 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public YtDyzUser crudForNewTransIos(IosLoginParam param, IosUserInfo userInfo) {
-        YtDyzUser old = appUserMapper.getYtAppUser(param.getIosId(), param.getDitchId());
+        YtDyzUser old = appUserMapper.getYtAppUserForIos(param.getIosId(), param.getDitchId());
         if(Objects.isNull(old)) {
             old = new YtDyzUser();
             registryUserForIos(param,userInfo, old);

yt-ios-lemon/lemon-ios-service/src/main/resources/mapper/AppUserMapper.xml

@@ -246,7 +246,7 @@
         select
             user_id, app_id,phone,device_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, ios_id, platform_id
         from yt_dyz_user
-        where wios_id = #{iosId}
+        where ios_id = #{iosId}
           and ditch_id = #{ditchId}
     </select>
     <select id="queryAll" resultType="com.ytpm.app.view.YtAppUserListView">