Merge branch 'master' into cc_20250527_desk

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java

coolstore-partner-dao/src/main/java/com/cool/store/dao/PosAndOrderInfoDAO.java

@@ -54,4 +54,11 @@ public class PosAndOrderInfoDAO {
         }
         return posAndOrderInfoMapper.batchInsert(posAndOrderInfoDOList);
     }
+    //不通用只用于批量云流水修改备注
+    public Integer batchUpdateYlsRemarkByShopCode(List<String> shopCodeList, String remark){
+        if(CollectionUtils.isEmpty(shopCodeList)){
+            return 0;
+        }
+        return posAndOrderInfoMapper.batchUpdateYlsRemarkByShopCode(shopCodeList,remark);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java

@@ -18,6 +18,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @Author suzhuhong
@@ -55,7 +56,7 @@ public class ShopAccountDAO {
     }
 
 
-    int batchInsert(List<ShopAccountDO> list){
+   public int batchInsert(List<ShopAccountDO> list){
         if (CollectionUtils.isEmpty(list)){
             return CommonConstants.ZERO;
         }
@@ -169,4 +170,8 @@ public class ShopAccountDAO {
         }
         return shopAccountMapper.updateStatusDataHandle(shopIds);
     }
+    public List<Long> getShopId(){
+        List<ShopAccountDO> shopAccountDOS = shopAccountMapper.selectAll();
+        return new ArrayList<>(shopAccountDOS.stream().map(ShopAccountDO::getShopId).collect(Collectors.toSet())) ;
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/PosAndOrderInfoMapper.java

@@ -16,6 +16,8 @@ import java.util.List;
 public interface PosAndOrderInfoMapper extends Mapper<PosAndOrderInfoDO> {
 
     Integer batchInsert(@Param("list") List<PosAndOrderInfoDO> posAndOrderInfoDOList);
+
+    Integer batchUpdateYlsRemarkByShopCode( @Param("list") List<String> shopCodeList,  @Param("remark") String remark);
 }
 
 

coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml

@@ -37,7 +37,10 @@
         update_time,
         deleted,
         two_certificates_one,
-        legal_is_same_partner
+        legal_is_same_partner,
+        single_shop,
+        commitment_url,
+        food_shop_list_url
     </sql>
     <update id="updateByShopId">
         update xfsg_license_transact

coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml

@@ -30,6 +30,7 @@
         <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
         <result property="poi" column="poi" jdbcType="VARCHAR"/>
         <result property="storeId" column="store_id" jdbcType="VARCHAR"/>
+        <result property="dyMobile" column="dy_mobile" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -40,6 +41,6 @@
         settler_bank_name,
         account,store_positioning_url,authorization_url,
         create_time,update_time,create_user,
-        update_user,poi,store_id
+        update_user,poi,store_id,dy_mobile
     </sql>
 </mapper>

coolstore-partner-dao/src/main/resources/mapper/PosAndOrderInfoMapper.xml

@@ -26,4 +26,15 @@
             values (#{item.shopId},#{item.type},#{item.account},#{item.password},#{item.remark},#{item.createTime},#{item.createUser})
         </foreach>
     </insert>
+    <update id="batchUpdateYlsRemarkByShopCode">
+        UPDATE xfsg_pos_and_order_info a LEFT JOIN xfsg_shop_info b on a.`shop_id` = b.id
+        SET
+        a.remark = #{remark}
+        WHERE
+        b.`shop_code` in(
+        <foreach collection="list" item="item" separator=",">
+            #{item}
+        </foreach>
+        ) AND a.type = 2
+    </update>
 </mapper>