فهرست منبع

渠道号修改

zhaoxian 3 سال پیش
والد
کامیت
49b28a749f

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/channel/mapper/KuaishouChannelMapper.java

@@ -42,7 +42,7 @@ public interface KuaishouChannelMapper extends BaseMapper<KuaishouChannel> {
 
     List<Integer> queryUsedLevel(@Param("strategys") List<KuaishouChannelCreateStrategy> strategys);
 
-    List<KuaishouChannel> queryChannelByHaveCycleTimes(@Param("haveCycleTimes") Integer haveCycleTimes, @Param("usageLevel") String usageLevel, @Param("strategys") List<KuaishouChannelCreateStrategy> strategys);
+    List<KuaishouChannel> queryChannelByUsageTimes(@Param("usageTimes") Integer usageTimes, @Param("usageLevel") String usageLevel, @Param("strategys") List<KuaishouChannelCreateStrategy> strategys, @Param("appName") String appName);
 
     List<JSONObject> queryItemsListByAccountId(@Param("accountId") Long accountId, @Param("appName") String appName);
 

+ 23 - 22
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/channel/mapper/xml/KuaishouChannelMapper.xml

@@ -131,7 +131,6 @@
         FROM `ctop_kuaishou_channel`
         WHERE account_id = #{accountId}
           AND state = 1
-          AND usage_times &lt; cycle_times
           AND id > #{usedId}
           AND usage_range = #{usageRange}
         ORDER BY channel_code, channel_number limit 10
@@ -173,7 +172,6 @@
                usage_range,
                usage_times,
                is_have_item,
-               cycle_times,
                channel_name,
                click_track_url,
                actionbar_click_url,
@@ -182,31 +180,34 @@
         WHERE account_id = #{accountId}
           and usage_level = #{usageLevel}
           AND state = 1
-          and channel_lock = 1
+          AND channel_state = 1
     </select>
 
-    <select id="queryChannelByHaveCycleTimes" resultType="cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannel">
-        SELECT id,
-        channel_code,
-        usage_level,
-        usage_range,
-        usage_times,
-        is_have_item,
-        cycle_times,
-        channel_name,
-        click_track_url,
-        actionbar_click_url,
-        schema_uri
-        FROM `ctop_kuaishou_channel`
-        WHERE strategy_id IN
+    <select id="queryChannelByUsageTimes" resultType="cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannel">
+        SELECT t1.id,
+        t1.channel_code,
+        t1.usage_level,
+        t1.usage_range,
+        t1.usage_times,
+        t1.is_have_item,
+        t1.channel_name,
+        t1.click_track_url,
+        t1.actionbar_click_url,
+        t1.schema_uri
+        FROM `ctop_kuaishou_channel` t1
+        LEFT JOIN ctop_kuaishou_channel_app_info t2 ON t1.app_id = t2.app_id
+        WHERE t1.strategy_id IN
         <foreach collection="strategys" item="item" separator=","
                  open="(" close=")">
             #{item.id}
         </foreach>
-        AND state = 1
-        and usage_level = #{usageLevel}
-        and channel_lock = 1
-        ORDER BY usage_times,is_have_item Desc
+        AND t1.state = 1
+        AND t1.channel_state = 1
+        AND t2.app_name = #{appName}
+        AND t1.usage_times = #{usageTimes}
+        and t1.usage_level = #{usageLevel}
+        GROUP BY  t1.channel_code
+        ORDER BY t1.create_time,t1.channel_number
     </select>
 
 
@@ -255,7 +256,7 @@
           t1.state = 1
         AND t1.account_id = #{accountId}
         AND t2.app_name = #{appName}
-        AND usage_times &lt; cycle_times
+
       ORDER BY
       t1.create_time DESC
   </select>

+ 9 - 21
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/channel/service/impl/KuaishouChannelServiceImpl.java

@@ -1223,24 +1223,20 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
     }
 
     //通过账户范围计划层级查询
-    private Result<Object> doPlanLevel(Long accountId, List<KuaishouChannelCreateStrategy> strategys, String
-            appName, int count) throws
+    private Result<Object> doPlanLevel(Long accountId, List<KuaishouChannelCreateStrategy> strategys, String appName, int count) throws
             Exception {
-        List<Integer> haveCycleTimesList = channelMapper.queryUsedLevel(strategys);
-        if (Check.isNull(haveCycleTimesList)) {
+        List<Integer> usageTimesTypes = channelMapper.queryUsedLevel(strategys);
+        if (Check.isNull(usageTimesTypes)) {
             return Result.error("渠道号已无效");
         }
-        for (Integer haveCycleTimes : haveCycleTimesList) {
+        for (Integer usageTimes : usageTimesTypes) {
             //获取可用渠道号,筛查出一个返回给前端
-            List<KuaishouChannel> list = channelMapper.queryChannelByHaveCycleTimes(haveCycleTimes, "plan", strategys);
+            List<KuaishouChannel> list = channelMapper.queryChannelByUsageTimes(usageTimes, "plan", strategys,appName);
             if (Check.isNull(list)) {
                 continue;
             }
             for (KuaishouChannel channel : list) {
-//                Integer cycleTimes = channel.getCycleTimes();//可循环次数
-                Integer usageTimes = channel.getUsageTimes();//使用次数
-                //优先判断已经循环的次数 大于 使用次数
-                if (haveCycleTimes > usageTimes) {
+                //1 关联单品,无单品则跳过
                     if (channel.getIsHaveItem() == 1) {
                         List<KuaishouChannelItems> items = channelItemsRelService.queryItems(channel.getId());
                         if (Check.isNull(items) || items.isEmpty()) {
@@ -1248,7 +1244,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
                         }
                         channel.setItems(items);
                     }
-                    // 符合条件,获取该渠道号
+                    // 获取绑定应用的渠道号
                     KuaishouChannelRel channelRel = channelRelService.queryByAccountChannelCode(channel.getChannelCode(), accountId, appName);
                     if (Check.isNull(channelRel)) {
                         continue;
@@ -1269,15 +1265,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
                         channel.setAppId(channelRel.getAppId());
                         return Result.ok(channel);
                     }
-                } else {
-                    //判断可循环次数 大于 已经循环的次数
-//                    if (cycleTimes > haveCycleTimes) {
-//                        //已循环次数+1
-//                        channel.setHaveCycleTimes(haveCycleTimes + 1);
-//                        this.saveOrUpdate(channel);
-//                    }
-                    continue;
-                }
+
             }
         }
         if (count == 0) {
@@ -1294,7 +1282,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
             return Result.error("渠道号已无效");
         }
         for (Integer haveCycleTimes : haveCycleTimesList) {
-            List<KuaishouChannel> list = channelMapper.queryChannelByHaveCycleTimes(haveCycleTimes, "group", strategys);
+            List<KuaishouChannel> list = channelMapper.queryChannelByUsageTimes(haveCycleTimes, "group", strategys,appName);
             if (Check.isNull(list)) {
                 continue;
             }