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

修改PC审核接口

Browse Source
This commit is contained in:
shuo.wang
2024-04-30 17:16:53 +08:00
parent 008a5013ae
commit e218ccc200
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanAuditRequest.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.request;
import com.cool.store.entity.ShopAuditInfoDO;
import com.cool.store.enums.AuditResultTypeEnum;
import com.cool.store.enums.AuditStatusEnum;
import com.cool.store.enums.AuditTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -31,15 +32,18 @@ public class OpeningOperationPlanAuditRequest {
public ShopAuditInfoDO toShopAuditInfoDO() {
ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO();
shopAuditInfoDO.setShopId(shopId);
shopAuditInfoDO.setShopId(this.shopId);
shopAuditInfoDO.setAuditType(AuditTypeEnum.OPENING_OPERATION_PLAN.getCode());
shopAuditInfoDO.setResultType(resultType);
if (this.resultType.equals(AuditStatusEnum.PASS.getCode())) {
shopAuditInfoDO.setResultType(AuditResultTypeEnum.PASS.getCode());
}else {
shopAuditInfoDO.setResultType(AuditResultTypeEnum.REJECT.getCode());
}
if (AuditResultTypeEnum.PASS.getCode().equals(resultType) )
shopAuditInfoDO.setPassReason(passReason);
shopAuditInfoDO.setPassReason(this.passReason);
else
shopAuditInfoDO.setRejectReason(rejectReason);
shopAuditInfoDO.setRejectReason(this.rejectReason);
shopAuditInfoDO.setCreateTime(new Date());
shopAuditInfoDO.setUpdateTime(new Date());
return shopAuditInfoDO;
}
}

5
coolstore-partner-service/src/main/java/com/cool/store/service/AuditOpeningOperationPlanService.java
View File

@@ -1,5 +1,7 @@
package com.cool.store.service;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.OpeningOperationPlanAuditRequest;
/**
@@ -16,7 +18,8 @@ public interface AuditOpeningOperationPlanService {
* @Date: 2024/4/23
* @description:审核方案
*/
Boolean auditPlan(OpeningOperationPlanAuditRequest openingOperationPlanAuditRequest);
Boolean auditPlan(OpeningOperationPlanAuditRequest openingOperationPlanAuditRequest, LoginUserInfo user);
}

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java
View File

@@ -3,10 +3,12 @@ package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.*;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.OpeningOperationPlanDO;
import com.cool.store.entity.ShopAuditInfoDO;
import com.cool.store.enums.AuditResultTypeEnum;
import com.cool.store.enums.AuditTypeEnum;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.OpeningOperationPlanResultTypeEnum;
@@ -43,13 +45,16 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean auditPlan(OpeningOperationPlanAuditRequest request) {
public Boolean auditPlan(OpeningOperationPlanAuditRequest request, LoginUserInfo user) {
log.info("auditPlan request:{}", JSONObject.toJSONString(request));
if (Objects.isNull(request)) {
log.error("auditPlan request is null");
throw new ServiceException("auditPlan request is null");
}
try {
ShopAuditInfoDO shopAuditInfoDO = request.toShopAuditInfoDO();
shopAuditInfoDO.setSubmittedUserId(user.getUserId());
shopAuditInfoDO.setSubmittedUserName(user.getName());
Long auditId = shopAuditInfoDAO.addAuditInfo(request.toShopAuditInfoDO());
OpeningOperationPlanDO openingOperationPlanDO = new OpeningOperationPlanDO();
openingOperationPlanDO.setShopId(request.getShopId());

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

@@ -72,12 +72,9 @@ public class OpenPreparationController {
@PostMapping("/openingOperationPlan/audit")
@ApiOperation("审核运营方案")
public ResponseResult auditPlan(@RequestBody OpeningOperationPlanAuditRequest request) {
return ResponseResult.success(auditOpeningOperationPlanService.auditPlan(request));
return ResponseResult.success(auditOpeningOperationPlanService.auditPlan(request,CurrentUserHolder.getUser()));
}
@GetMapping("/firstOrder/get")
@ApiOperation("查询订货金")
public ResponseResult<FirstOrderDTO> get(@RequestParam("shopId") Long shopId) {