合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/domain/user/mapper/TemporaryInfoMapper.java

@@ -38,7 +38,7 @@ public interface TemporaryInfoMapper extends BaseMapper<TemporaryInfoDO> {
             @Param("date") String date
     );
 
-    int batchInsertOrUpdate(List<TemporaryInfoDO> doList);
+    int batchInsertOrUpdate(@Param("list") List<TemporaryInfoDO> doList);
 }
 
 

src/main/resources/mapper/TemporaryInfoMapper.xml

@@ -41,16 +41,13 @@
 
     <insert id="batchInsertOrUpdate">
         INSERT INTO temporary_info (
-        open_id, store_name, store_code, data_date,
-        create_time, modify_time
+        open_id, store_name, store_code, modify_time
         ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
-            #{item.openId}, #{item.storeName}, #{item.storeCode}, #{item.dataDate},
-            NOW(), NOW()
+            #{item.openId}, #{item.storeName}, #{item.storeCode}, NOW()
             )
         </foreach>
-        <!-- 仅更新需要的字段，不覆盖原有核心字段（name/phone/idenNumber等） -->
         ON DUPLICATE KEY UPDATE
         store_name = VALUES(store_name),   <!-- 仅更新门店名称 -->
         store_code = VALUES(store_code),   <!-- 仅更新门店编码 -->

src/main/resources/mapper/WxTemporaryInfoDelayMapper.xml

@@ -6,7 +6,7 @@
             <id column="id" property="id"/> <!-- 主键映射 -->
             <result column="open_id" property="openId"/> <!-- 数据库下划线 → Java驼峰 -->
             <result column="store_name" property="storeName"/>
-            <result column="store_address" property="storeCode"/>
+            <result column="store_code" property="storeCode"/>
             <result column="contact_phone" property="contactPhone"/>
             <result column="create_time" property="createTime"/>
             <result column="is_processed" property="isProcessed"/>