feat:iso服务逻辑优化

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

@@ -161,7 +161,6 @@ public class AdServiceImpl implements AdService {
         YtDyzAdRecord adRecord = new YtDyzAdRecord();
         handleParam(param);
         BeanUtils.copyProperties(param, adRecord);
-        timeParse(param, adRecord);
         adRecord.setRecordId(IdUtil.fastSimpleUUID());
         adRecord.setIosId(param.getIosId());
         adRecord.setNetworkName(AdPlatformTypeEnum.getDesc(Integer.parseInt(param.getNetworkFormId())));
@@ -374,21 +373,4 @@ public class AdServiceImpl implements AdService {
         return vos;
     }
 
-    private static void timeParse(DyzAdRecordParam param, YtDyzAdRecord adRecord) {
-        if (param.getBegintimestamp() != null && param.getFinishtimestamp() != null) {
-            // 处理 begintimestamp（兼容秒级和毫秒级）
-            long beginTimestamp = param.getBegintimestamp();
-            if (String.valueOf(beginTimestamp).length() == 10) { // 秒级时间戳（10位）
-                beginTimestamp *= 1000; // 转为毫秒级
-            }
-            adRecord.setBeginTime(DateUtil.format(new Date(beginTimestamp), "yyyy-MM-dd HH:mm:ss"));
-
-            // 处理 finishtimestamp（兼容秒级和毫秒级）
-            long finishTimestamp = param.getFinishtimestamp();
-            if (String.valueOf(finishTimestamp).length() == 10) { // 秒级时间戳（10位）
-                finishTimestamp *= 1000; // 转为毫秒级
-            }
-            adRecord.setFinishTime(DateUtil.format(new Date(finishTimestamp), "yyyy-MM-dd HH:mm:ss"));
-        }
-    }
 }

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

@@ -360,6 +360,7 @@
         <result column="app_id" property="appId" />
         <result column="platform_id" property="platformId" />
         <result column="power" property="power" />
+        <result column="nearly_income" property="nearlyIncome" />
         <collection property="loginRecordList" ofType="com.ytpm.app.model.YtDyzLoginRecord">
             <result column="record_id" property="recordId" />
             <result column="user_id" property="userId" />
@@ -397,6 +398,7 @@
             du.app_id,
             du.platform_id,
             du.power,
+            du.nearly_income,
             lr.record_id,
             lr.login_time,
             lr.device_brand,
@@ -426,7 +428,7 @@
     <select id="queryAllByTime" resultType="com.ytpm.app.model.YtDyzUser">
         SELECT
         user_id,app_id,phone,device_id, nick_name, head_img, power, registry_time,
-        last_login_time, last_login_ip, login_days, total_video,
+        last_login_time, last_login_ip, login_days, total_video,nearly_income,
         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
@@ -720,13 +722,18 @@
     </select>
     <select id="queryByOpenid" resultType="com.ytpm.app.model.YtDyzUser">
         select
-            user_id,phone,device_id, head_img, nick_name, 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, ditch_id, app_id, platform_id, power
+            user_id,phone,device_id, head_img, nick_name, registry_time, last_login_time, last_login_ip, login_days,
+            total_video, total_income,nearly_income, red_packet_balance, red_packet_amount, points_balance, points_total,
+            withdraw_total, sign_days, user_status, risk_reason, wx_open_id, ditch_id, app_id, platform_id, power
         from yt_dyz_user
         where wx_open_id = #{openid}
     </select>
     <select id="queryByIosId" resultType="com.ytpm.app.model.YtDyzUser">
         select
-            user_id,phone,device_id, head_img, nick_name, 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, ditch_id, app_id, platform_id, power
+            user_id,phone,device_id, head_img, nick_name, registry_time,
+            last_login_time, last_login_ip, login_days, total_video, total_income, nearly_income,
+            red_packet_balance, red_packet_amount, points_balance, points_total, withdraw_total,
+            sign_days, user_status, risk_reason, wx_open_id, ditch_id, app_id, platform_id, power
         from yt_dyz_user
         where ios_id = #{iosId}
     </select>
@@ -948,7 +955,10 @@
     </select>
     <select id="queryByUserIds" resultType="com.ytpm.app.model.YtDyzUser">
         select
-            user_id, head_img, nick_name, 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, ditch_id, app_id, platform_id, power, phone, device_id
+            user_id, head_img, nick_name, registry_time, last_login_time, last_login_ip, login_days,
+            total_video, total_income, nearly_income, red_packet_balance, red_packet_amount, points_balance,
+            points_total, withdraw_total, sign_days, user_status, risk_reason, wx_open_id, ditch_id, app_id, platform_id,
+            power, phone, device_id
         from yt_dyz_user
         where user_id in
         <foreach collection="userIds.split(',')" separator="," item="item"  open="(" close=")">
@@ -1001,7 +1011,10 @@
     </select>
     <select id="getMonthRegistryUser" resultType="com.ytpm.app.model.YtDyzUser">
         select
-        user_id, head_img, nick_name, 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, ditch_id, app_id, platform_id, power, phone, device_id
+        user_id, head_img, nick_name, registry_time, last_login_time, last_login_ip, login_days,
+        total_video, total_income, nearly_income, red_packet_balance, red_packet_amount, points_balance, points_total,
+        withdraw_total, sign_days, user_status, risk_reason, wx_open_id, ditch_id, app_id,
+        platform_id, power, phone, device_id
         from yt_dyz_user
         where app_id in
         <foreach collection="appIds.split(',')" separator="," item="item" open="(" close=")">