Merge branch 'cc_2250513_api' into 'master'

Cc 2250513 api

See merge request hangzhou/java/custom_zxjp!89

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

@@ -63,5 +63,9 @@ public class StoreDao {
         return storeMapper.listByMobile(mobile);
     }
 
+    public List<StoreDO> list() {
+        return storeMapper.list();
+    }
+
 
 }

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

@@ -31,4 +31,10 @@ public interface StoreMapper {
      */
     List<StoreDO> listByMobile(@Param("mobile") String mobile);
 
+    /**
+     * 分页查询门店数据
+     * @return
+     */
+    List<StoreDO> list();
+
 }

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

@@ -83,10 +83,16 @@
         select *
         from store_${enterpriseId}
         <where>
+            and is_delete = 'effective'
             <if test="mobile!=null and mobile !=''">
                 and `extend_field` like concat('%', #{mobile}, '%')
             </if>
         </where>
     </select>
 
+    <select id="list" resultMap="BaseResultMap">
+        select *
+        from store_${enterpriseId} where is_delete = 'effective' order by id asc
+    </select>
+
 </mapper>