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

Merge branch 'refs/heads/master' into cc_20250529_franchise_fee

Browse Source
This commit is contained in:
shuo.wang
2025-05-30 15:14:56 +08:00
parent 1e323efe7c abc6dd137d
commit 20fcd02ac2
20 changed files with 506 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
View File

@@ -297,4 +297,14 @@ public class ShopInfoDAO {
example.createCriteria().andIn("partnerId", partnerIds).andEqualTo("deleted", false);
return shopInfoMapper.selectByExample(example);
}
/**
* @Auther: wangshuo
* @Date: 2025/5/29
* @description: 获取门店列表，根据门店状态
*/
public List<ShopInfoDO> selectByShopStatus(Long lineId,List<Integer> shopStatus){
Example example = new Example(ShopInfoDO.class);
example.createCriteria().andEqualTo("lineId", lineId).andIn("shopStatus", shopStatus).andEqualTo("deleted", false);
return shopInfoMapper.selectByExample(example);
}
}

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

@@ -19,6 +19,12 @@
<result column="user_status" jdbcType="TINYINT" property="userStatus"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="third_oa_unique_flag" jdbcType="VARCHAR" property="thirdOaUniqueFlag"/>
<result column="departments" jdbcType="VARCHAR" property="departments"/>
<result column="roles" jdbcType="VARCHAR" property="roles"/>
<result column="language" jdbcType="VARCHAR" property="language"/>
<result column="position" jdbcType="VARCHAR" property="position"/>
<result column="active" jdbcType="BIT" property="active"/>
<result column="userType" jdbcType="BIT" property="userType"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.cool.store.entity.EnterpriseUserDO">
<result column="user_region_ids" jdbcType="LONGVARCHAR" property="userRegionIds"/>
@@ -134,7 +140,7 @@
</select>
<select id="selectByMobile" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"/> FROM enterprise_user_${enterpriseId} WHERE mobile =#{mobile} and active = true LIMIT 1
SELECT * FROM enterprise_user_${enterpriseId} WHERE mobile =#{mobile} and active = true LIMIT 1
</select>
<select id="selectByInvestmentManager" resultMap="BaseResultMap">

2
coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml
View File

@@ -76,7 +76,7 @@
</foreach>
</select>
<select id="getSignType" resultType="com.cool.store.entity.SignFranchiseDO">
select shop_id as shopId, sign_type as signType from xfsg_sign_franchise
select shop_id as shopId, sign_type as signType,partnership_signatory_second as partnershipSignatorySecond from xfsg_sign_franchise
where
shop_id in
<foreach collection="list" separator="," item="item" index="index" open="(" close=")">