Merge #7 into master from pingkang

常读分销账号同步

* pingkang: (1 commits)
  常读分销账号同步

Signed-off-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>
Merged-by: 1129979389@qq.com <accounts_6361eaad7b63b44dd7833e63@mail.teambition.com>

CR-link: https://codeup.aliyun.com/60c06368dbbed34fe0f0c263/job/hr_job-bytedance/change/7

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/entity/ChangDuAppDistributor.java

@@ -10,7 +10,7 @@ public class ChangDuAppDistributor {
     private String appId;
     private String appName;
     private String distributorId;
-    @JSONField(name = "nick_name")
+    private String nickName;
     private String distributorName;
     private String changduAccountId;
     private Integer channelType;

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/ChannelMapper.xml

@@ -117,7 +117,7 @@
     </insert>
 
     <select id="getDistributorKey" resultType="com.alibaba.fastjson.JSONObject">
-        select changdu_account_id as 'changduAccountId',
+        select changdu_account_id as 'changduAccountId',max(account_name) as 'accountName',
                 max(distributor_id) as 'distributorId', max(api_key) as 'apiKey'
         from deepthink.changdu_distributor_config c
                  join deepthink.changdu_account_config a
@@ -126,7 +126,7 @@
     </select>
 
     <insert id="insertChangduDistributorApp">
-        insert ignore into deepthink.changdu_distributor_app (distributor_id,app_id)
+        replace into deepthink.changdu_distributor_app (distributor_id,app_id)
         values
         <foreach collection="collection" item="item" separator=",">
             (
@@ -136,7 +136,7 @@
         </foreach>
     </insert>
     <insert id="insertChangduDistributorConfig">
-        insert ignore into deepthink.changdu_distributor_config
+        replace into deepthink.changdu_distributor_config
         (distributor_id,distributor_name,changdu_account_id,channel_type,remark)
         values
         <foreach collection="collection" item="item" separator=",">
@@ -150,7 +150,7 @@
         </foreach>
     </insert>
     <insert id="insertChannelAccountInfo">
-        insert ignore into deepthink.channel_account_info
+        replace into deepthink.channel_account_info
         (channel_account_id,channel_account_name,channel_app_id,channel_app_name,business_type,secret_key)
         values
         <foreach collection="collection" item="item" separator=",">

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/ChannelServiceImpl.java

@@ -96,9 +96,11 @@ public class ChannelServiceImpl implements IChannelService {
             Set<ChangDuAppDistributor> adds = new HashSet<>();
             for (JSONObject appDistributor : distributorApp) {
                 String appId = appDistributor.getString("app_id");
+                String appName = appDistributor.getString("app_name");
                 String apiKey = appDistributor.getString("api_key");
                 String distributorId = appDistributor.getString("distributor_id");
                 String changduAccountId = appDistributor.getString("changdu_account_id");
+                String accountName = appDistributor.getString("account_name");
                 int thisPageIndex = 0;
                 int pageSize = 50;
                 int totalPageIndex = 0;
@@ -128,6 +130,7 @@ public class ChannelServiceImpl implements IChannelService {
                                     distributorConfig.setChangduAccountId(changduAccountId);
                                     distributorConfig.setChannelType(3);
                                     distributorConfig.setApiKey(apiKey);
+                                    distributorConfig.setDistributorName(accountName + "-" + appName + "-" + distributorConfig.getNickName());
                                     log.info("番茄获取小程序绑定的渠道信息 {}", distributorConfig);
                                     adds.add(distributorConfig);
                                 }
@@ -159,6 +162,7 @@ public class ChannelServiceImpl implements IChannelService {
                 String changduAccountId = didKey.getString("changduAccountId");
                 String distributorId = didKey.getString("distributorId");
                 String apiKey = didKey.getString("apiKey");
+                String accountName = didKey.getString("accountName");
                 String url = "https://www.changdunovel.com/novelsale/openapi/package_info/v1/";
                 String ts = String.valueOf(System.currentTimeMillis()).substring(0, 10);
                 String sign = getSign(distributorId, apiKey, ts);
@@ -177,6 +181,7 @@ public class ChannelServiceImpl implements IChannelService {
                                 JSONObject resultJson = result.getJSONObject(i);
                                 resultJson.put("changdu_account_id", changduAccountId);
                                 resultJson.put("api_key", apiKey);
+                                resultJson.put("account_name", accountName);
                                 log.info("番茄获取账户内快应用/公众号列表 {}", resultJson);
                                 appDistributors.add(resultJson);
                             }