suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
苏竹红
2025-04-08 15:23:26 +08:00
parent c08905399c d7869f39da
commit 4469c44ebb
43 changed files with 970 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml
View File

@@ -36,6 +36,8 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="createUser" column="create_user" jdbcType="VARCHAR"/>
<result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
<result property="cShopName" column="c_shop_name" jdbcType="VARCHAR"/>
<result property="settlerBankBackPhotoUrl" column="settler_bank_back_photo_url" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
@@ -47,6 +49,6 @@
settler_id_card_front,settler_id_card_reverse,settler_in_hand_front_picture,settler_in_hand_back_picture,settler_id_card_no,
settler_bank_number,settler_bank_mobile,settler_bank_name,
create_time,update_time,create_user,
update_user
update_user,c_shop_name,settler_bank_back_photo_url
</sql>
</mapper>

3
coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
View File

@@ -171,7 +171,8 @@
<select id="getAllUser" resultType="com.cool.store.dto.UserDTO">
select
user_id as userId,
name
name,
mobile
from enterprise_user_${eid}
where active = true
<if test="keyword!=null and keyword!=''">

20
coolstore-partner-dao/src/main/resources/mapper/HomeTemplateMapper.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!--mybatis-3-mapper.dtd:约束文件的名称，限制和检查在当前文件中出现的标签和属性符合mybatis的要求-->
<!--namespace：命名空间，要有唯一的值，要求使用dao接口的权限定名称（一个dao接口对应一个mapper，namespace指明对应哪个dao接口）-->
<mapper namespace="com.cool.store.mapper.HomeTemplateMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.HomeTemplateDO">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="template_name" jdbcType="VARCHAR" property="templateName" />
<result column="template_description" jdbcType="VARCHAR" property="templateDescription" />
<result column="is_default" jdbcType="BIT" property="isDefault" />
<result column="deleted" jdbcType="BIT" property="deleted" />
<result column="mini_open_components_json" jdbcType="VARCHAR" property="miniOpenComponentsJson" />
<result column="create_id" jdbcType="VARCHAR" property="createId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_id" jdbcType="VARCHAR" property="updateId" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
</mapper>

16
coolstore-partner-dao/src/main/resources/mapper/HomeTemplateUserMappingMapper.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!--mybatis-3-mapper.dtd:约束文件的名称，限制和检查在当前文件中出现的标签和属性符合mybatis的要求-->
<!--namespace：命名空间，要有唯一的值，要求使用dao接口的权限定名称（一个dao接口对应一个mapper，namespace指明对应哪个dao接口）-->
<mapper namespace="com.cool.store.mapper.HomeTemplateUserMappingMapper">
<resultMap id="BaseResultMapper" type="com.cool.store.entity.HomeTemplateUserMappingDO">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="template_id" jdbcType="BIGINT" property="templateId" />
<result column="user_id" jdbcType="VARCHAR" property="userId" />
<result column="create_id" jdbcType="VARCHAR" property="createId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_id" jdbcType="VARCHAR" property="updateId" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
</mapper>

17
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -413,10 +413,11 @@
#{item}
</foreach>
</select>
<select id="getShopIdByShopStatus" resultType="com.cool.store.entity.ShopInfoDO">
select id ,partner_id as partnerId
from xfsg_shop_info
where shop_status = #{shopStatus}
<select id="getShopIdBySuccessOpen" resultType="com.cool.store.entity.ShopInfoDO">
select a.id as id, a.partner_id as partnerId
from xfsg_shop_info a
inner join store_${eid} b on a.shop_code = b.store_num
</select>
<select id="getShopListSuccessOpen" resultType="com.cool.store.response.MiniShopsResponse">
select a.shop_name as shopName,
@@ -432,6 +433,11 @@
inner join store_${eid} b on a.shop_code = b.store_num
where a.id = #{shopId}
</select>
<select id="getShopCodeList" resultType="java.lang.String">
select shop_code
from xfsg_shop_info
where deleted = 0 and line_id = #{lineId} and shop_code is not null
</select>
<update id="batchUpdate" parameterType="list">
<foreach collection="list" item="item" index="index" open="" close="" separator=";">
@@ -446,4 +452,7 @@
WHERE id = #{item.id}
</foreach>
</update>
<update id="updateShopCode">
update xfsg_shop_info set shop_code = #{shopCode} where id = #{shopId}
</update>
</mapper>