yumeng 3 rokov pred
rodič
commit
f7cda505b3

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionUnitController.java

@@ -83,7 +83,7 @@ public class KuaiShouDimensionUnitController {
                     }
                     }
                     List<JSONObject> campaignList = kuaiShouDimensionUnitService.getCampaignCount(account.getAccountId(), strategyId);
                     List<JSONObject> campaignList = kuaiShouDimensionUnitService.getCampaignCount(account.getAccountId(), strategyId);
                     jsonInfo.put("campaignCount", campaignList.size());
                     jsonInfo.put("campaignCount", campaignList.size());
-                    Integer unitCount = kuaiShouDimensionUnitService.getUnitCount(account.getAccountId());
+                    Integer unitCount = kuaiShouDimensionUnitService.getUnitCount(account.getAccountId(), strategyId);
                     jsonInfo.put("unitCount", unitCount);
                     jsonInfo.put("unitCount", unitCount);
                     for (int i = 0; i < campaignList.size(); i++) {
                     for (int i = 0; i < campaignList.size(); i++) {
                         JSONObject campaignJson = campaignList.get(i);
                         JSONObject campaignJson = campaignList.get(i);

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/mapper/KuaiShouDimensionUnitMapper.java

@@ -17,9 +17,9 @@ import java.util.List;
  */
  */
 public interface KuaiShouDimensionUnitMapper extends BaseMapper<KuaiShouDimensionUnit> {
 public interface KuaiShouDimensionUnitMapper extends BaseMapper<KuaiShouDimensionUnit> {
 
 
-    List<JSONObject> getCampaignCount(@Param("accountId") Long accountId,@Param("strategyId") Long strategyId);
+    List<JSONObject> getCampaignCount(@Param("accountId") Long accountId, @Param("strategyId") Long strategyId);
 
 
-    Integer getUnitCount(@Param("accountId") Long accountId);
+    Integer getUnitCount(@Param("accountId") Long accountId, @Param("strategyId") Long strategyId);
 
 
     void editBatch(@Param("submitStatus") Integer submitStatus, @Param("ids") JSONArray ids);
     void editBatch(@Param("submitStatus") Integer submitStatus, @Param("ids") JSONArray ids);
 
 

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/mapper/xml/KuaiShouDimensionUnitMapper.xml

@@ -45,8 +45,8 @@
 			count(1) as 'count'
 			count(1) as 'count'
 		FROM
 		FROM
 			ctop_kuaishou_dimension_unit
 			ctop_kuaishou_dimension_unit
-		WHERE
-			account_id = #{accountId}
+		WHERE strategy_id = #{strategyId}
+			and account_id = #{accountId}
 		AND submit_status = 0
 		AND submit_status = 0
 	</select>
 	</select>
     <select id="getUnitCountByStrategyId" resultType="java.lang.Integer">
     <select id="getUnitCountByStrategyId" resultType="java.lang.Integer">

+ 2 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/IKuaiShouDimensionUnitService.java

@@ -1,6 +1,5 @@
 package cn.com.ctop.kuaishou.modules.dimension.service;
 package cn.com.ctop.kuaishou.modules.dimension.service;
 
 
-import cn.com.ctop.kuaishou.modules.dimension.entity.KuaiShouDimensionAccount;
 import cn.com.ctop.kuaishou.modules.dimension.entity.KuaiShouDimensionUnit;
 import cn.com.ctop.kuaishou.modules.dimension.entity.KuaiShouDimensionUnit;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
@@ -21,9 +20,9 @@ public interface IKuaiShouDimensionUnitService extends IService<KuaiShouDimensio
 
 
     Boolean getCreateOverrun(Long account);
     Boolean getCreateOverrun(Long account);
 
 
-    List<JSONObject> getCampaignCount(Long accountId,Long strategyId);
+    List<JSONObject> getCampaignCount(Long accountId, Long strategyId);
 
 
-    Integer getUnitCount(Long accountId);
+    Integer getUnitCount(Long accountId, Long strategyId);
 
 
     List<KuaiShouDimensionUnit> getUnitListBy(Long strategyId, Long accountId, Long campaignId);
     List<KuaiShouDimensionUnit> getUnitListBy(Long strategyId, Long accountId, Long campaignId);
 
 

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/impl/KuaiShouDimensionUnitServiceImpl.java

@@ -248,12 +248,12 @@ public class KuaiShouDimensionUnitServiceImpl extends ServiceImpl<KuaiShouDimens
 
 
     @Override
     @Override
     public List<JSONObject> getCampaignCount(Long accountId, Long strategyId) {
     public List<JSONObject> getCampaignCount(Long accountId, Long strategyId) {
-        return dimensionUnitMapper.getCampaignCount(accountId,strategyId);
+        return dimensionUnitMapper.getCampaignCount(accountId, strategyId);
     }
     }
 
 
     @Override
     @Override
-    public Integer getUnitCount(Long accountId) {
-        return dimensionUnitMapper.getUnitCount(accountId);
+    public Integer getUnitCount(Long accountId, Long strategyId) {
+        return dimensionUnitMapper.getUnitCount(accountId, strategyId);
     }
     }
 
 
     @Override
     @Override