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

Merge #140 into master from cc_20260513_minor_req

Browse Source 
闭店H5新增闭店接口&私域二维码缓存时间延长

* cc_20260513_minor_req: (2 commits squashed)

  - fix:私域二维码新增SN反向映射关系

  - fix:新增pc闭店申请发起接口

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/140
This commit is contained in:
王非凡
2026-05-18 09:30:59 +00:00
committed by 正新
parent 451b95f909
commit e6bcfac086
9 changed files with 61 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseStoreController.java
View File

@@ -1,11 +1,16 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.enums.close.CloseTypeEnum;
import com.cool.store.request.close.store.CloseStoreApplyRequest;
import com.cool.store.request.close.store.CloseStoreCancelRequest;
import com.cool.store.request.close.store.CloseStoreQueryRequest;
import com.cool.store.request.close.store.CloseStoreAuditRequest;
import com.cool.store.response.AuditInfoResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.close.CloseStoreService;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.vo.close.store.*;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
@@ -105,4 +110,14 @@ public class CloseStoreController {
public ResponseResult<Boolean> suspendApply(@RequestBody @Valid CloseStoreCancelRequest request) {
return ResponseResult.success(closeStoreService.suspendApply(request.getCloseStoreId()));
}
@ApiOperation("申请闭店")
@PostMapping("/apply")
public ResponseResult<Boolean> applyCloseStore(@RequestBody @Valid CloseStoreApplyRequest request) {
request.setCloseType(CloseTypeEnum.INITIATE.getCloseType());
LoginUserInfo user = CurrentUserHolder.getUser();
request.setUserId(user.getUserId());
request.setUserName(StringUtils.isNotBlank(user.getName()) ? user.getName() : user.getMobile());
return ResponseResult.success(closeStoreService.applyCloseStore(request));
}
}

7
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
View File

@@ -3,6 +3,8 @@ package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.annotation.Debounce;
import com.cool.store.constants.CommonConstants;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.*;
import com.cool.store.dao.closeup.CloseUpApplyFormDAO;
import com.cool.store.dao.closeup.CloseUpPlatformDAO;
@@ -22,6 +24,7 @@ import com.cool.store.entity.closeup.CloseUpPlatformDO;
import com.cool.store.entity.bonus.BonusDistributionRuleDO;
import com.cool.store.entity.fees.WalletPayInfoDO;
import com.cool.store.enums.*;
import com.cool.store.enums.close.CloseTypeEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.enums.wechat.WechatTemplateEnum;
import com.cool.store.handler.WeChatHandler;
@@ -254,6 +257,10 @@ public class PCTestController {
@PostMapping("/applyCloseStore")
public ResponseResult<Boolean> applyCloseStore(@RequestBody @Valid CloseStoreApplyRequest request) {
request.setCloseType(CloseTypeEnum.INITIATE.getCloseType());
LoginUserInfo user = CurrentUserHolder.getUser();
request.setUserId(user.getUserId());
request.setUserName(StringUtils.isNotBlank(user.getName()) ? user.getName() : user.getMobile());
return ResponseResult.success(closeStoreService.applyCloseStore(request));
}

9
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniCloseStoreController.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.controller.webc;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.enums.close.CloseTypeEnum;
import com.cool.store.request.close.store.CloseStoreApplyRequest;
import com.cool.store.request.close.store.CloseStoreCancelRequest;
@@ -8,12 +9,14 @@ import com.cool.store.request.close.store.ReCloseStoreApplyRequest;
import com.cool.store.response.AuditInfoResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.close.CloseStoreService;
import com.cool.store.vo.PartnerUserInfoVO;
import com.cool.store.vo.close.store.*;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -41,12 +44,18 @@ public class MiniCloseStoreController {
@PostMapping("/apply")
public ResponseResult<Boolean> applyCloseStore(@RequestBody @Valid CloseStoreApplyRequest request) {
request.setCloseType(CloseTypeEnum.INITIATE.getCloseType());
PartnerUserInfoVO user = PartnerUserHolder.getUser();
request.setUserId(user.getPartnerId());
request.setUserName(StringUtils.isNotBlank(user.getUsername()) ? user.getUsername() : user.getMobile());
return ResponseResult.success(closeStoreService.applyCloseStore(request));
}
@ApiOperation("拒绝后重新提交申请闭店")
@PostMapping("/reapply")
public ResponseResult<Boolean> reApplyCloseStore(@RequestBody @Valid ReCloseStoreApplyRequest request) {
PartnerUserInfoVO user = PartnerUserHolder.getUser();
request.setUserId(user.getPartnerId());
request.setUserName(StringUtils.isNotBlank(user.getUsername()) ? user.getUsername() : user.getMobile());
return ResponseResult.success(closeStoreService.reApplyCloseStore(request));
}