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

Merge #121 into master from cc_20260511_fix

Browse Source 
feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

* cc_20260511_fix: (3 commits squashed)

  - feat:待采购确认 审批流程

  - feat:问题修复

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/121
This commit is contained in:
正新
2026-05-11 04:15:31 +00:00
parent 162674c0b2
commit fd43c2c4b2
10 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
View File

@@ -270,11 +270,11 @@ public class ShopStageInfoDAO {
return shopStageInfoMapper.updateShopStageAndAuditInfo(shopId, shopStageInfo.getShopSubStageEnum().getShopSubStage(), shopStageInfo.getShopSubStageStatus(), isTerminated, remark, auditId);
}
public Page<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize,List<String> authRegionIds) {
public Page<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize,List<String> authRegionIds,String keyword) {
PageHelper.startPage(pageNum, pageSize);
ShopSubStageStatusEnum shopSubStageStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21;
return shopStageInfoMapper.getRentContractToDoPage(userId, shopSubStageStatus.getShopSubStageEnum().getShopSubStage(),
shopSubStageStatus.getShopSubStageStatus(),authRegionIds);
shopSubStageStatus.getShopSubStageStatus(),authRegionIds,keyword);
}
public List<ShopStageInfoDO> getShopIdListByStageStatus(Integer shopSubStageStatus) {

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
View File

@@ -119,7 +119,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
Page<RentInfoToDoVO> getRentContractToDoPage(@Param("userId") String userId,
@Param("shopSubStage")Integer shopSubStage,
@Param("shopSubStageStatus") Integer shopSubStageStatus,
@Param("authRegionIds") List<String> authRegionIds);
@Param("authRegionIds") List<String> authRegionIds, @Param("keyword") String keyword);
List<ShopStageInfoDO> getShopIdListByStageStatus(@Param("shopSubStageStatus") Integer shopSubStageStatus);

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

@@ -254,6 +254,9 @@
#{regionId}
</foreach>
</if>
<if test="keyword !=null and keyword !=''">
and (b.username like concat('%',#{keyword},'%') or b.mobile like concat('%',#{keyword},'%'))
</if>
order by a.id desc
</select>