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

Merge #47 into master from cc_20250922_closeStore_w

Browse Source 
闭店

* cc_20250922_closeStore_w: (67 commits squashed)

  - feat:闭店流程init

  - feat:闭店流程接口

  - feat:闭店

  - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w

  - fix:闭店材料模块

  - fix:账号关闭流程

  - feat:闭店审批流程（未测）；字典表

  - fix:闭店审批流程完善

  - Merge branch 'master' into cc_20250922_closeStore_w

  - fix:闭店流程流转补充

  - feat:闭店退款

  - fix:字典表接口

  - Merge branch 'master' into cc_20250922_closeStore_w

  - fix:闭店原因接口新增闭店发起方式字段

  - fix:修改审批记录返回数据类型
    feat:新增退款流程跳过

  - fix

  - fix:新增字段

  - feat:新增闭店退款提交人列表接口

  - fix:闭店初始化数据来源修改；小程序闭店材料详情新增模板url字段

  - fix:新增接口返回字段

  - fix:闭店管理、审批待办类别所属品牌筛选改为多选

  - fix:闭店管理列表新增完成阶段数量字段

  - feat:新增第三方闭店申请接口

  - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-common/src/main/java/com/cool/store/utils/BeanUtil.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml

  - fix:自动发起闭店申请定时任务

  - feat:火码账号关闭

  - fix:闭店流程修改

  - Merge branch 'master' into cc_20250922_closeStore_w
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java

  - fix:删除云流水发起闭店接口

  - fix:取消闭店申请入参修改

  - fix:闭店申请列表赋值异常问题

  - fix:闭店审批通过异常

  - fix:普通方法参数校验

  - fix:账号关闭时校验阶段状态

  - fix:初始化

  - fix:字段新增

  - fix:接口补充

  - fix

  - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java

  - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/common/InsertGroup.java
    #	coolstore-partner-common/src/main/java/com/cool/store/common/UpdateGroup.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/dao/dict/SysDictColumnDAO.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/dict/SysDictColumnMapper.java
    #	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #	coolstore-partner-dao/src/main/resources/mapper/dict/SysDictColumnMapper.xml
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DictManagerController.java
    #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - fix:闭店流程修改

  - fix:闭店流程修改

  - fix:修改三方付款状态接口

  - fix:闭店申请测试接口

  - fix:退款供应商接口补充

  - fix:支行列表接口

  - fix:错误信息修改

  - Merge branch 'master' into cc_20250922_closeStore_w
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-model/src/main/java/com/cool/store/request/close/refund/CloseStoreRefundAddRequest.java
    #	coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjPartnerAccountRequest.java
    #	coolstore-partner-model/src/main/java/com/cool/store/request/xgj/XgjSavePartnerRequest.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/close/CloseStoreRefundService.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreRefundServiceImpl.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseStoreRefundController.java
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
    #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

  - fix:闭店材料详情接口新增字段

  - fix:闭店材料修改单个材料时，去除审批状态

  - Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w

  - fix:闭店材料详情接口新增模板链接字段

  - fix:闭店材料详情新增材料状态转义字段

  - Merge remote-tracking branch 'origin/cc_20250922_closeStore_w' into cc_20250922_closeStore_w

  - fix:新管家应退实退金额字段修改

  - fix:闭店支行测试环境mock

  - fix:redis报错修复

  - fix:新管家关店原因字段补充

  - fix:新增字段

  - fix:字段补充

  - fix:小程序新增接口根据闭店申请id获取闭店申请简单信息

  - fix:小程序退款信息列表修改

  - fix:闭店审批允许管理员审批

  - fix:阶段名称修改

  - Merge branch 'refs/heads/master' into cc_20250922_closeStore_w
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/close/CloseStoreSubStageStatusEnum.java

  - fix:闭店记录列表补充审批id；仅在营门店允许发起闭店

  - fix:提交新管家字段取值逻辑修改

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/47
This commit is contained in:
王非凡
2026-03-03 10:48:32 +00:00
committed by 正新
parent 0da8efbeaa
commit f006fea2c2
25 changed files with 394 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,12 @@ import com.cool.store.request.close.refund.CloseStoreRefundAddRequest;
import com.cool.store.request.close.refund.CloseStoreRefundQueryRequest;
import com.cool.store.request.close.refund.CloseStoreRefundSkipRequest;
import com.cool.store.request.close.refund.CloseStoreRefundUpdateRequest;
import com.cool.store.dto.xgj.XgjBranchBankDTO;
import com.cool.store.dto.xgj.XgjPartnerPageDTO;
import com.cool.store.request.close.refund.*;
import com.cool.store.request.xgj.XgjBankQueryRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ThirdXgjService;
import com.cool.store.service.close.CloseStoreRefundService;
import com.cool.store.vo.close.refund.CloseStoreRefundDetailVO;
import com.cool.store.vo.close.refund.CloseStoreRefundListVO;
@@ -19,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* <p>
@@ -35,6 +41,7 @@ import javax.validation.constraints.NotNull;
@Validated
public class CloseStoreRefundController {
private final CloseStoreRefundService closeStoreRefundService;
private final ThirdXgjService thirdXgjService;
@ApiOperation("获取当前用户的每刻用户信息")
@GetMapping("/getCurrentMkUser")
@@ -79,4 +86,22 @@ public class CloseStoreRefundController {
public ResponseResult<Boolean> refresh(@RequestBody @Validated CloseStoreRefundQueryRequest request) {
return ResponseResult.success(closeStoreRefundService.refreshRefundOrderStatus(request));
}
@ApiOperation("同步供应商")
@PostMapping("/savePartner")
public ResponseResult<Boolean> savePartner(@RequestBody @Validated CloseStorePartnerRequest request) {
return ResponseResult.success(closeStoreRefundService.savePartner(request));
}
@ApiOperation("供应商列表")
@PostMapping("/queryPartnerPage")
public ResponseResult<XgjPartnerPageDTO> queryPartnerPage(@RequestBody CloseStorePartnerQueryRequest request) {
return ResponseResult.success(closeStoreRefundService.queryPartnerPage(request));
}
@ApiOperation("支行列表")
@PostMapping("/queryBranchBankList")
public ResponseResult<List<XgjBranchBankDTO>> queryBranchBankList(@RequestBody XgjBankQueryRequest request) {
return ResponseResult.success(closeStoreRefundService.queryBranchBankList(request));
}
}

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

@@ -75,4 +75,11 @@ public class MiniCloseStoreController {
public ResponseResult<Boolean> cancelCloseStore(@RequestBody @Valid CloseStoreCancelRequest request) {
return ResponseResult.success(closeStoreService.cancelApply(request.getCloseStoreId()));
}
@ApiOperation("根据闭店申请id获取闭店申请简单信息")
@GetMapping("/simple")
@ApiImplicitParam(name = "closeStoreId", value = "闭店申请id", required = true, dataType = "Long", paramType = "query")
public ResponseResult<CloseStoreSimpleVO> getCloseStoreSimple(@NotNull(message = "闭店申请id不能为空") Long closeStoreId) {
return ResponseResult.success(closeStoreService.getCloseStoreSimpleInfo(closeStoreId));
}
}

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

@@ -1,8 +1,10 @@
package com.cool.store.controller.webc;
import com.cool.store.request.close.refund.CloseStoreRefundQueryRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.close.CloseStoreRefundService;
import com.cool.store.vo.close.refund.CloseStoreRefundSimpleVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -32,7 +34,7 @@ public class MiniCloseStoreRefundController {
@ApiOperation("退款信息列表")
@GetMapping("/list")
@ApiImplicitParam(name = "closeStoreId", value = "闭店申请id", required = true, dataType = "Long")
public ResponseResult<List<CloseStoreRefundSimpleVO>> list(@NotNull(message = "闭店申请id不能为空") Long closeStoreId) {
return ResponseResult.success(closeStoreRefundService.getRefundSimpleList(closeStoreId));
public ResponseResult<PageInfo<CloseStoreRefundSimpleVO>> list(@Validated CloseStoreRefundQueryRequest request) {
return ResponseResult.success(closeStoreRefundService.getRefundSimpleList(request));
}
}

25
coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
View File

@@ -588,30 +588,7 @@ public class XxlJobHandler {
break;
}
hasNext = list.size() >= pageSize;
for (CloseStoreRefundInfoDO refundInfoDO : list) {
try {
if (StringUtils.isNotBlank(refundInfoDO.getRefundOrderNo())) {
XgjPayResultDTO xgjPayResultDTO = thirdXgjService.queryOrderStatus(new XgjPaymentRequest(refundInfoDO.getRefundOrderNo()));
String xgjStatus = xgjPayResultDTO.getStatus();
String refundStatus = XgjRefundPayStatusEnum.REJECTED.getStatus().equals(xgjStatus) ? RefundPayStatusEnum.APPROVING.getStatus() : xgjStatus;
if (!refundInfoDO.getRefundStatus().equals(refundStatus)) {
CloseStoreRefundInfoDO update = CloseStoreRefundInfoDO.builder()
.id(refundInfoDO.getId())
.refundStatus(refundStatus)
.refundTime(CoolDateUtils.parseDate(xgjPayResultDTO.getPaySuccessTime(), "yyyy-MM-dd HH:mm:ss"))
.build();
if (refundStatus.equals(RefundPayStatusEnum.PAY_SUCCESS.getStatus())) {
completeList.add(update);
} else {
updateList.add(update);
}
}
}
} catch (Exception e) {
log.info("退款状态查询失败, refundId:{}", refundInfoDO.getId());
log.info("退款状态查询失败", e);
}
}
closeStoreRefundService.refreshRefund(list, updateList, completeList);
pageNum++;
}
if (CollectionUtils.isNotEmpty(updateList)) {