Преглед изворни кода

Merge branch 'master' into V1.1.3

yumeng пре 4 година
родитељ
комит
6c1ab72ace

+ 8 - 9
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaiShouCreateServiceImpl.java

@@ -181,7 +181,6 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     returnJson.put("unit_id", unitId);
                     returnJson.put("code", 0);
                     returnJson.put("message", "广告组创建成功");
-                    returnJson.put("type", 1);
                     KuaiShouGroup group = groupService.selectGroupByUnitId(oauthToken.getAccountId(), unitId);
                     if (!Check.isNull(group)) {
                         returnJson.put("group_create_time", group.getGroupCreateTime());
@@ -200,7 +199,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 } else {
                     returnJson.put("code", -1);
                     returnJson.put("message", unitMap.get("message"));
-                    returnJson.put("type", 1);
+
                 }
                 returnArr.add(returnJson);
             } catch (Exception e) {
@@ -208,7 +207,6 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 returnJson.put("group_uuid", group_uuid);
                 returnJson.put("code", -1);
                 returnJson.put("message", e.getMessage());
-                returnJson.put("type", 1);
                 returnArr.add(returnJson);
             }
         }
@@ -303,10 +301,11 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 Map<String, Object> creativeMap = iKuaishouInterfaceService.creativeCreate(oauthToken.getAccessToken(), oauthToken.getAccountId(), createJson, 1);
                 JSONObject returnJson = new JSONObject();
                 returnJson.put("creative_uuid", creative_uuid);
+                returnJson.put("unit_id", unit_id);
+                returnJson.put("type", 1);
                 if ((Integer) creativeMap.get("code") == 0) {
                     Long creativeId = (Long) creativeMap.get("creativeId");
                     returnJson.put("creative_id", creativeId);
-                    returnJson.put("unit_id", unit_id);
                     returnJson.put("code", 0);
                     returnJson.put("message", "广告创意创建成功");
                 } else {
@@ -320,6 +319,8 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 returnJson.put("creative_uuid", creative_uuid);
                 returnJson.put("message", e.getMessage());
                 returnJson.put("code", -1);
+                returnJson.put("unit_id", unit_id);
+                returnJson.put("type", 1);
                 returnArr.add(returnJson);
             }
         }
@@ -400,16 +401,14 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             JSONObject resultJson = JSONObject.parseObject(result);
             JSONObject returnJson = new JSONObject();
             returnJson.put("creative_uuid", creative_uuid);
+            returnJson.put("unit_id", unit_id);
+            returnJson.put("type", 2);
             if (!Check.isNull(resultJson)) {
                 if (resultJson.getInteger("code") == 0) {
-                    returnJson.put("unit_id", unit_id);
-                    returnJson.put("type", 2);
                     returnJson.put("code", 0);
                     returnJson.put("message", "程序化创意创建成功");
                 } else {
                     returnJson.put("code", -1);
-                    returnJson.put("unit_id", unit_id);
-                    returnJson.put("type", 2);
                     returnJson.put("message", resultJson.getString("message"));
                 }
             }
@@ -419,9 +418,9 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             JSONObject returnJson = new JSONObject();
             returnJson.put("creative_uuid", creative_uuid);
             returnJson.put("message", e.getMessage());
+            returnJson.put("code", -1);
             returnJson.put("unit_id", unit_id);
             returnJson.put("type", 2);
-            returnJson.put("code", -1);
             returnArray.add(returnJson);
         }
         callback(creativeUrl, returnArray, "program_create");