Merge branch 'master' into lih0919

yt-agent/agent-service/src/main/java/com/ytpm/controller/AgentIndexController.java

@@ -137,11 +137,11 @@ public class AgentIndexController {
         if(CollUtil.isEmpty(appList)){
             return Result.resultErr(RepMessage.APP_EMPTY);
         }
-        //设定缓存键值 小于三分钟时更新续存
+        //设定缓存键值
         String redisKey = StrConstant.PLATFORM_AGENT_SUFFIX + appId +StrConstant.PROFIT+userInfo.getUserId();
         String appIds = appList.stream().map(YtApp::getAppId).distinct().collect(Collectors.joining(","));
         //分广告平台，分别统计用户当天、昨日、本月的数据封装并返回
-        if(Boolean.FALSE.equals(redisService.hasKey(redisKey)) || redisService.getExpire(redisKey) < 3){
+        if(Boolean.FALSE.equals(redisService.hasKey(redisKey))){
             Object o = feignInvoker.invoke(app.getServiceName(),"getAgentProfit", appIds);
             List<AgentAdGroupStaticsVO> agentProfit = JSONArray.parseArray(JSON.toJSONString(o), AgentAdGroupStaticsVO.class);
             if(CollUtil.isNotEmpty(agentProfit)){

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

@@ -33,7 +33,6 @@ public class DitchController {
     @ApiOperation("获取渠道类型列表")
     @PostMapping("/list")
     public Result<List<AgentDitchView>> list(@RequestBody DitchListForIosParam param) {
-        param.setAppId(param.getAppId());
         DitchListParam ditchListParam = new DitchListParam();
         return Result.resultOk(RepMessage.QUERY_SUCCESS, agentDitchService.ditchList(ditchListParam));
     }

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

@@ -175,8 +175,20 @@ public class UserController {
     @PostMapping("/adRecords/page")
     public ResultTable<YtDyzAdRecord> adRecordsPage(@RequestBody AdRecordListParam param, Errors errors) {
         PageHelper.startPage(param.getPage(), param.getLimit());
-        log.error("=================================",param.getLoginStatus());
-        List<YtDyzAdRecord> adrecords = adRecordMapper.getByUserByParam(param);
+        YtDyzUser user = appUserMapper.selectById(param.getUserId());
+        List<YtDyzAdRecord> adrecords;
+        if (param.getLoginStatus() == 1){
+            adrecords = adRecordMapper.getByIosIdBeforeLogin(user.getIosId());
+            for (YtDyzAdRecord adrecord: adrecords){
+                if (adrecord.getUserId() == null){
+                    adrecord.setUserId(user.getUserId());
+                    adRecordMapper.updateOneVisitor(adrecord);
+                }
+                adrecord.setLoginStatus(1);
+            }
+        } else {
+            adrecords = adRecordMapper.getByUserByParam(param);
+        }
         return ResultTable.resultTableOk(new PageInfo<>(adrecords));
     }
 

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

@@ -62,4 +62,9 @@ public interface AdRecordMapper {
      * 保存游客广告记录
      */
     void addOneVisitor(YtDyzAdRecord adRecord);
+
+    /**
+     * 保存游客广告记录
+     */
+    void updateOneVisitor(YtDyzAdRecord adRecord);
 }

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

@@ -68,6 +68,7 @@ public class AdServiceImpl implements AdService {
             }
             BeanUtils.copyProperties(param, adRecord);
             adRecord.setIosId(param.getIosId());
+            adRecord.setAppId("251be4dff0fd408fbc1fe2c47bf515eb");
             adRecord.setRecordId(IdUtil.fastSimpleUUID());
             adRecord.setNetworkName(AdPlatformTypeEnum.getDesc(Integer.parseInt(param.getNetworkFormId())));
             adRecordMapper.addOneVisitor(adRecord);

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

@@ -231,9 +231,15 @@ public class AppUserServiceImpl implements AppUserService {
         YtDyzUser newUser = new YtDyzUser();
         if (old.getDitchId() == null) {
             newUser.setDitchId(param.getDitchId());
-            YtDitch ditch =  ditchMapper.selectById(param.getDitchId());
+            YtDitch ditch = ditchMapper.selectById(param.getDitchId());
             newUser.setAppId(ditch.getAppId());
         }
+        if (param.getDitchId() != null){
+            newUser.setDitchId(param.getDitchId());
+            YtDitch ditch = ditchMapper.selectById(param.getDitchId());
+            newUser.setAppId(ditch.getAppId());
+        }
+
         newUser.setUserId(old.getUserId());
         newUser.setNickName(userInfo.getNickname());
         newUser.setHeadImg(userInfo.getHeadimgurl());
@@ -243,6 +249,8 @@ public class AppUserServiceImpl implements AppUserService {
         newUser.setDeviceId(param.getDeviceId());
         newUser.setLoginDays(old.getLoginDays()+1);
         appUserMapper.updateUser(newUser);
+        YtDyzUser oldUser = appUserMapper.selectById(newUser.getUserId());
+        System.out.println(oldUser);
     }
 
     /**

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

@@ -86,6 +86,28 @@
                 #{appId}
             )
     </insert>
+    <update id="updateOneVisitor" parameterType="com.ytpm.app.model.YtDyzAdRecord">
+        update yt_dyz_ad_record_visitor
+        <set>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="nickName != null">nick_name = #{nickName},</if>
+            <if test="iosId != null">ios_id = #{iosId},</if>
+            <if test="placementId != null">placement_id = #{placementId},</if>
+            <if test="adSourceId != null">ad_source_id = #{adSourceId},</if>
+            <if test="revenue != null">revenue = #{revenue},</if>
+            <if test="networkFormId != null">network_form_id = #{networkFormId},</if>
+            <if test="networkName != null">network_name = #{networkName},</if>
+            <if test="networkPlacementId != null">network_placement_id = #{networkPlacementId},</if>
+            <if test="beginTime != null">begin_time = #{beginTime},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="resultJson != null">result_json = #{resultJson},</if>
+            <if test="adSourceIndex != null">ad_source_index = #{adSourceIndex},</if>
+            <if test="adSourceType != null">ad_source_type = #{adSourceType},</if>
+            <if test="ecpm != null">ecpm = #{ecpm},</if>
+            <if test="appId != null">app_id = #{appId},</if>
+        </set>
+        where record_id = #{recordId}  <!-- 假设record_id是主键 -->
+    </update>
     <select id="countByAppIds" resultType="java.lang.Integer">
         select
             count(record_id)

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

@@ -225,6 +225,12 @@
             <if test="iosId != null">
                 ios_id = #{iosId},
             </if>
+            <if test="appId != null">
+                app_id = #{appId},
+            </if>
+            <if test="ditchId != null">
+                ditch_id = #{ditchId},
+            </if>
             <if test="phoneJson != null">
                 phone_json = #{phoneJson},
             </if>