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

Merge branch 'master' into cc_20250613_fix

Browse Source
This commit is contained in:
shuo.wang
2025-06-13 18:04:36 +08:00
parent 1dd7394258 dea98ee193
commit 8f484d39fc
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,6 +378,7 @@
<if test="shopId != null and shopId != ''"> <if test="shopId != null and shopId != ''">
and shop_id = #{shopId} and shop_id = #{shopId}
</if> </if>
limit 1
</where> </where>
</select> </select>

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -268,6 +268,9 @@ public class DeskServiceImpl implements DeskService {
if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) {
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()); subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus());
} }
if(userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode())||userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())){
subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus());
}
if (!subStageStatusList.isEmpty()) { if (!subStageStatusList.isEmpty()) {
pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7,
subStageStatusList, Boolean.TRUE,keyword); subStageStatusList, Boolean.TRUE,keyword);