合并分支 'ldx_dealer_partener' 到 'qa'

src/main/java/com/wangxiaolu/promotion/domain/user/mapper/entity/QinceDealerDO.java

@@ -36,6 +36,16 @@ public class QinceDealerDO implements Serializable {
      */
     private String dealerCooperateStatus;
 
+    /**
+     * 经销商助理ID（多个用逗号隔开）
+     */
+    private String dealerAssistantId;
+
+    /**
+     * 经销商助理姓名（多个用逗号隔开）
+     */
+    private String dealerAssistantName;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

src/main/java/com/wangxiaolu/promotion/service/user/impl/QinCeDataTaskServiceImpl.java

 package com.wangxiaolu.promotion.service.user.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.wangxiaolu.promotion.common.redis.RedisKeys;
@@ -163,8 +164,8 @@ public class QinCeDataTaskServiceImpl implements QinCeDataTaskService {
             return false;
         }
 
-        List<Object> dealerAddJsons = new ArrayList<>(1500);
-        Map<Object,Object> dealers = new HashMap<>(1500);
+        List<Object> dealerAddJsons = new ArrayList<>(1500); // 存储所有要保存的经销商数据
+        Map<Object,Object> dealers = new HashMap<>(1500); // 存储合作中的经销商（用于 Redis)
 
         for (int index = 0; index < responseDatas.size(); index++) {
             JSONObject jsonObject = responseDatas.getJSONObject(index);

src/main/resources/mapper/QinceDealerMapper.xml

@@ -9,24 +9,29 @@
             <result property="dealerId" column="dealer_id" jdbcType="VARCHAR"/>
             <result property="dealerName" column="dealer_name" jdbcType="VARCHAR"/>
             <result property="dealerCooperateStatus" column="dealer_cooperate_status" jdbcType="CHAR"/>
+            <result property="dealerAssistantId" column="dealer_assistant_id" jdbcType="VARCHAR"/>
+            <result property="dealerAssistantName" column="dealer_assistant_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,dealer_id,dealer_name,
-        dealer_cooperate_status,dealer_modify_time
+        dealer_cooperate_status,dealer_modify_time,
+        dealer_assistant_id,dealer_assistant_name
     </sql>
 
     <insert id="saveList">
         insert into qince_dealer
-        (dealer_id, dealer_name, dealer_cooperate_status)
+        (dealer_id, dealer_name, dealer_cooperate_status, dealer_assistant_id, dealer_assistant_name)
         VALUES
         <foreach collection="dealerJsons" item="item" separator=",">
             (#{item.dealer_id}, #{item.dealer_name},
-            #{item.dealer_cooperate_status})
+            #{item.dealer_cooperate_status}, #{item.dealer_assistant_id}, #{item.dealer_assistant_name})
         </foreach>
         ON DUPLICATE KEY UPDATE
         dealer_name = values(dealer_name),
-        dealer_cooperate_status = values(dealer_cooperate_status)
+        dealer_cooperate_status = values(dealer_cooperate_status),
+        dealer_assistant_id = values(dealer_assistant_id),
+        dealer_assistant_name = values(dealer_assistant_name)
     </insert>
 
 </mapper>