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

Merge #17 into master from cc_20251218_opening

Browse Source 
Merge branch 'master' into cc_20251218_opening

* cc_20251218_opening: (11 commits squashed)

  - fix:信发查询bug

  - fix:信发查询bug

  - fix:测试

  - fix:老店新开不需要开业验收

  - feat:开业验收数据处理

  - fix:开业验收bug修复

  - fix:开业验收bug修复

  - fix:云流水权限开通

  - feat:开业验收数据处理

  - feat:开业验收数据处理

  - Merge branch 'master' into cc_20251218_opening

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/17
This commit is contained in:
苏竹红
2025-12-25 10:50:38 +00:00
parent 32ae1b7315
commit e97c147fac
31 changed files with 824 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
coolstore-partner-dao/src/main/resources/mapper/OpeningAcceptanceMapper.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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">
<mapper namespace="com.cool.store.mapper.OpeningAcceptanceMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.OpeningAcceptanceDO">
<!--
WARNING - @mbg.generated
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="shop_id" jdbcType="BIGINT" property="shopId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="create_user" jdbcType="VARCHAR" property="createUser" />
<result column="update_user" jdbcType="VARCHAR" property="updateUser" />
<result column="storefront_photo" jdbcType="LONGVARCHAR" property="storefrontPhoto" />
<result column="interior_photo" jdbcType="LONGVARCHAR" property="interiorPhoto" />
<result column="monitor_photo" jdbcType="LONGVARCHAR" property="monitorPhoto" />
<result column="cash_register_photo" jdbcType="LONGVARCHAR" property="cashRegisterPhoto" />
<result column="info_screen_photo" jdbcType="LONGVARCHAR" property="infoScreenPhoto" />
</resultMap>
<select id="getOpeningAcceptanceByShopId" resultMap="BaseResultMap">
select * from zxjp_opening_acceptance where shop_id = #{shopId}
</select>
</mapper>

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

@@ -269,6 +269,7 @@
and id = #{shopId}
</if>
</where>
order by id desc
</select>
<select id="getShopAndStoreList" resultType="com.cool.store.dto.LicenseSyncDTO">