yumeng 3 years ago
parent
commit
414235f1a9

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

@@ -81,7 +81,7 @@ public class KuaiShouDimensionUnitController {
                     if (!Check.isNull(accountInfo)) {
                         jsonInfo.put("authName", accountInfo.getAuthName());
                     }
-                    List<JSONObject> campaignList = kuaiShouDimensionUnitService.getCampaignCount(account.getAccountId());
+                    List<JSONObject> campaignList = kuaiShouDimensionUnitService.getCampaignCount(account.getAccountId(), strategyId);
                     jsonInfo.put("campaignCount", campaignList.size());
                     Integer unitCount = kuaiShouDimensionUnitService.getUnitCount(account.getAccountId());
                     jsonInfo.put("unitCount", unitCount);

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

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

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

@@ -23,8 +23,8 @@
 			campaign_id
 		FROM
 			ctop_kuaishou_dimension_unit
-		WHERE
-			account_id = #{accountId}
+		WHERE strategy_id = #{strategyId}
+		and account_id = #{accountId}
 		AND submit_status = 0
 		GROUP BY
 			campaign_id
@@ -34,8 +34,8 @@
 		*
 	    FROM
 		ctop_kuaishou_dimension_campaign
-	    WHERE
-		account_id = #{accountId}
+	    WHERE strategy_id = #{strategyId}
+		and account_id = #{accountId}
     )  t2
         ON t1.campaign_id = t2.campaign_id
 

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

@@ -21,7 +21,7 @@ public interface IKuaiShouDimensionUnitService extends IService<KuaiShouDimensio
 
     Boolean getCreateOverrun(Long account);
 
-    List<JSONObject> getCampaignCount(Long accountId);
+    List<JSONObject> getCampaignCount(Long accountId,Long strategyId);
 
     Integer getUnitCount(Long accountId);
 

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/impl/KuaiShouDimensionAccountServiceImpl.java

@@ -61,6 +61,7 @@ public class KuaiShouDimensionAccountServiceImpl extends ServiceImpl<KuaiShouDim
             KuaiShouDimensionAccount dimensionAccount = new KuaiShouDimensionAccount();
             dimensionAccount.setStrategyId(id);
             dimensionAccount.setAccountId(accountId);
+            dimensionAccount.setAccountStatus(0);
             dimensionAccount.setAccountStatus(jsonObject.getInteger("accountStatus"));
             if (!Check.isNull(jsonObject.getLong("appId"))) {
                 dimensionAccount.setAppId(jsonObject.getLong("appId"));

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

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