Prechádzať zdrojové kódy

Merge branch 'V2.0.1' into test

zhaoxian 3 rokov pred
rodič
commit
2d6630cceb

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

@@ -131,6 +131,7 @@
         FROM `ctop_kuaishou_channel`
         WHERE account_id = #{accountId}
           AND state = 1
+          AND channel_state = 1
           AND id > #{usedId}
           AND usage_range = #{usageRange}
         ORDER BY channel_code, channel_number limit 10
@@ -146,6 +147,7 @@
         FROM `ctop_kuaishou_channel`
         WHERE account_id = #{accountId}
         AND state = 1
+        AND channel_state = 1
         <if test="isHaveItem != null">
             and is_have_item = #{isHaveItem}
         </if>
@@ -317,6 +319,7 @@
             #{item}
         </foreach>
         AND state = 1
+        AND channel_state = 1
         group by usage_times
     </select>
 
@@ -351,6 +354,7 @@
               LEFT JOIN ctop_kuaishou_channel_app_info t2 ON t1.app_id = t2.app_id
       WHERE
           t1.state = 1
+        AND t1.channel_state = 1
         AND t1.account_id = #{accountId}
         AND t2.app_name = #{appName}
 
@@ -379,6 +383,7 @@
         WHERE t2.account_id = #{accountId}
           AND t2.usage_level = #{level}
           AND t2.state = 1
+          AND t2.channel_state = 1
           AND t1.campaign_id = #{campaignId} LIMIT 1
     </select>
 

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

@@ -168,7 +168,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
      * 校验渠道号是否重复
      */
     private boolean checkChannelCode(KuaishouChannelCreateStrategy strategy) {
-        String numberValue = strategy.getNumberValue();
+        String numberValue = strategy.getNumberValue().trim();
         Integer min = null;
         Integer max = null;
         if (numberValue.contains("-")) {