diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java index 8d4718820..bbc4d8aa0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.LicenseListRequest; import com.cool.store.request.SubmitLicenseRequest; import com.cool.store.response.LicenseListResponse; @@ -12,7 +13,7 @@ public interface ApplyLicenseService { * @param request * @return */ - Boolean submitLicense(SubmitLicenseRequest request); + Boolean submitLicense(SubmitLicenseRequest request, LoginUserInfo user); /** * 获取默认值 @@ -34,5 +35,5 @@ public interface ApplyLicenseService { * @param status 0通过 1不通过 * @return */ - Boolean licenseExamine(Long shopId, Integer status,String result); + Boolean licenseExamine(Long shopId, Integer status,String result,LoginUserInfo user); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java index 3c8839c13..75737a3f2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/AuditStatusService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; import com.cool.store.entity.AuditStatusDO; import com.cool.store.request.AuditCheckRequest; import com.cool.store.request.AuditDetailRequest; @@ -17,7 +18,7 @@ public interface AuditStatusService { * 稽核 * @return */ - Boolean audit(AuditCheckRequest request); + Boolean audit(AuditCheckRequest request, LoginUserInfo user); /** *插入数据 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/FranchiseFeeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/FranchiseFeeService.java index b40d6a7ac..8703ace06 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/FranchiseFeeService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/FranchiseFeeService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.AuditFranchiseFeeRequest; import com.cool.store.request.FranchiseFeeRequest; import com.cool.store.response.FranchiseFeeResponse; @@ -19,5 +20,5 @@ public interface FranchiseFeeService { */ FranchiseFeeResponse getDetail(Long shopId); - Boolean auditFranchiseFee(AuditFranchiseFeeRequest request); + Boolean auditFranchiseFee(AuditFranchiseFeeRequest request, LoginUserInfo user); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java index 6d47b0d94..e6e018c46 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.FranchiseeSaveRequest; import com.cool.store.request.InitiatingRequest; import com.cool.store.request.IntentAgreementSubmitRequest; @@ -25,7 +26,7 @@ public interface IntentAgreementService { ResponseResult initiating(InitiatingRequest request); - ResponseResult save(FranchiseeSaveRequest request); + ResponseResult save(FranchiseeSaveRequest request, LoginUserInfo user); InitiatingRequest getOaDetail(String mobile, String idCardNo); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java index 97580ab67..fa144a7a4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.AddSignFranchiseRequest; import com.cool.store.response.AddSignFranchiseResponse; import com.cool.store.response.ResponseResult; @@ -11,7 +12,7 @@ public interface SignFranchiseService { * @param request * @return */ - ResponseResult submitSignFranchise(AddSignFranchiseRequest request); + ResponseResult submitSignFranchise(AddSignFranchiseRequest request, LoginUserInfo user); AddSignFranchiseResponse getSignFranchise(Long shopId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/SysStoreAppService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/SysStoreAppService.java index 5ea4f5154..422ae267b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/SysStoreAppService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/SysStoreAppService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.SysStoreAppRequest; import com.cool.store.response.ResponseResult; import com.cool.store.response.SysStoreAppResponse; @@ -11,8 +12,8 @@ public interface SysStoreAppService { * @param request * @return */ - ResponseResult submitSysBuildStore(SysStoreAppRequest request); + ResponseResult submitSysBuildStore(SysStoreAppRequest request,LoginUserInfo user); - SysStoreAppResponse getDefaultValueSysBuildStore(Long lineId, Long shopId); + SysStoreAppResponse getDefaultValueSysBuildStore(Long lineId, Long shopId, LoginUserInfo user); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index a17330024..d4bc3ce04 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -78,7 +78,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean submitLicense(SubmitLicenseRequest request) { + public Boolean submitLicense(SubmitLicenseRequest request,LoginUserInfo user) { log.info("submitLicense request：{}", JSONObject.toJSONString(request)); if (Objects.isNull(request)) { return false; @@ -94,7 +94,6 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); shopAuditInfoDO.setShopId(request.getShopId()); shopAuditInfoDO.setAuditType(AuditTypeEnum.LICENSE_APPROVAL.getCode()); - LoginUserInfo user = CurrentUserHolder.getUser(); shopAuditInfoDO.setSubmittedUserId(user.getUserId()); shopAuditInfoDO.setSubmittedUserName(user.getName()); shopAuditInfoDO.setDataType(0); @@ -176,12 +175,11 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean licenseExamine(Long shopId, Integer status, String result) { + public Boolean licenseExamine(Long shopId, Integer status, String result,LoginUserInfo user) { ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); shopAuditInfoDO.setShopId(shopId); ShopSubStageStatusEnum shopSubStageStatusEnum = null; shopAuditInfoDO.setAuditType(AuditTypeEnum.LICENSE_APPROVAL.getCode()); - LoginUserInfo user = CurrentUserHolder.getUser(); shopAuditInfoDO.setSubmittedUserId(user.getUserId()); shopAuditInfoDO.setSubmittedUserName(user.getName()); shopAuditInfoDO.setDataType(1); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java index b1520413d..5847b0a96 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java @@ -53,8 +53,7 @@ public class AuditStatusServiceImpl implements AuditStatusService { @Override - public Boolean audit(AuditCheckRequest request) { - LoginUserInfo user = CurrentUserHolder.getUser(); + public Boolean audit(AuditCheckRequest request,LoginUserInfo user) { //稽核信息 AuditStatusDO auditStatusDO = auditStatusMapper.selectByPrimaryKey(request.getCheckId()); //线索审核信息 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index 98f2e8bad..aba4e6db9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -84,12 +84,11 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { } @Override - public Boolean auditFranchiseFee(AuditFranchiseFeeRequest request) { + public Boolean auditFranchiseFee(AuditFranchiseFeeRequest request,LoginUserInfo user) { ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); shopAuditInfoDO.setShopId(request.getShopId()); ShopSubStageStatusEnum shopSubStageStatusEnum = null; shopAuditInfoDO.setAuditType(AuditTypeEnum.PAY_FRANCHISE_FEE.getCode()); - LoginUserInfo user = CurrentUserHolder.getUser(); shopAuditInfoDO.setSubmittedUserId(user.getUserId()); shopAuditInfoDO.setSubmittedUserName(user.getName()); shopAuditInfoDO.setDataType(1); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index 6b3b21530..4df901a49 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -180,7 +180,6 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten fillSignatureInfo(requestMap); String url = xfsgUrl + Constants.INTENTION_CONTRACT_URL + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature"); InitiatingDO initiatingDO = request.toInitiatingDO(); -// LoginUserInfo user = CurrentUserHolder.getUser(); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); initiatingDO.setKdzBusinessId(AuditEnum.CONTRACT_INTENTION.getCode() + "_" + lineInfoDO.getId() + "_" + lineInfoDO.getWorkflowSubStageStatus()); InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class); @@ -208,7 +207,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten } @Override - public ResponseResult save(FranchiseeSaveRequest request) { + public ResponseResult save(FranchiseeSaveRequest request,LoginUserInfo user) { log.info("save request:{}", JSONObject.toJSONString(request)); if (Objects.isNull(request)) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); @@ -237,7 +236,6 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten franchiseeDO.setProvinceCode(String.valueOf(openAreaInfoDO.getParentId())); franchiseeDO.setCityCode(String.valueOf(openAreaInfoDO.getId())); //todo 操作人工号 暂时写死 - LoginUserInfo user = CurrentUserHolder.getUser(); franchiseeDO.setOperator("22090043"); InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, franchiseeDO, InitiatingResponse.class); //更新线索(进入蓄水池并回填加盟商编码) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index c0c67f63d..38f327fbf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -90,13 +90,11 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } else if (request.getAuditResult() == 0) { shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85; } - shopStageInfoDAO.updateShopStageInfo(shopId, shopSubStageStatusEnum); ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); shopAuditInfoDO.setShopId(shopId); shopAuditInfoDO.setAuditType(AuditTypeEnum.SIGN_FRANCHISE.getCode()); - LoginUserInfo user = CurrentUserHolder.getUser(); - shopAuditInfoDO.setSubmittedUserId(user.getUserId()); - shopAuditInfoDO.setSubmittedUserName(user.getName()); + shopAuditInfoDO.setSubmittedUserId(""); + shopAuditInfoDO.setSubmittedUserName(""); if (request.getAuditResult() == Constants.ZERO_INTEGER){ shopAuditInfoDO.setResultType(Constants.ONE_INTEGER); shopAuditInfoDO.setRejectReason(request.getCause()); @@ -108,8 +106,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } shopAuditInfoMapper.insertSelective(shopAuditInfoDO); Long auditId = shopAuditInfoDO.getId(); + shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, shopSubStageStatusEnum,auditId); systemBuildingShopMapper.updateAuditByShopId(auditId,shopId); - return null; + return true; } private Long getShopId(String kdzBusinessId) { @@ -119,7 +118,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu @Override @Transactional(rollbackFor = Exception.class) - public ResponseResult submitSignFranchise(AddSignFranchiseRequest request) { + public ResponseResult submitSignFranchise(AddSignFranchiseRequest request,LoginUserInfo user) { log.info("submitSignFranchise request:{}", JSONObject.toJSONString(request)); if (Objects.isNull(request)) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); @@ -135,7 +134,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu } //店铺信息 ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); - FranchiseAgreementRequest franchiseAgreementRequest = convertFranchiseAgreement(request, shopInfoDO); + FranchiseAgreementRequest franchiseAgreementRequest = convertFranchiseAgreement(request, shopInfoDO,user); MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(shopInfoDO.getLineId()); ResponseResult responseResult = coolStoreStartFlowService.franchiseAgreement(franchiseAgreementRequest, memberQuestionDO.getJoinType()); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83); @@ -144,9 +143,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu public FranchiseAgreementRequest convertFranchiseAgreement(AddSignFranchiseRequest request, - ShopInfoDO shopInfoDO) { + ShopInfoDO shopInfoDO, + LoginUserInfo user) { - LoginUserInfo user = CurrentUserHolder.getUser(); //shopId Long shopId = request.getShopId(); //线索信息 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index a30d22521..5c40574d7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -78,7 +78,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer @Override @Transactional(rollbackFor = Exception.class) - public ResponseResult submitSysBuildStore(SysStoreAppRequest request) { + public ResponseResult submitSysBuildStore(SysStoreAppRequest request,LoginUserInfo user) { log.info("submitSysBuildStore request :{}", JSONObject.toJSONString(request)); if (Objects.isNull(request)) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); @@ -95,7 +95,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId());//线索信息 PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(request.getLineId(), request.getShopId());//查铺位信息确定铺位所在大区、战区、门店所在省市区街道地址 //3.请求鲜丰接口 - NewStoreRequest apiRequest = convertToNewStoreRequest(request,lineInfoDO,pointInfoDO); + NewStoreRequest apiRequest = convertToNewStoreRequest(request,lineInfoDO,pointInfoDO,user); //todo 暂时去掉 // return coolStoreStartFlowService.newStore(apiRequest,request.getShopId()); shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_31,null); @@ -103,7 +103,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer } @Override - public SysStoreAppResponse getDefaultValueSysBuildStore(Long lineId, Long shopId) { + public SysStoreAppResponse getDefaultValueSysBuildStore(Long lineId, Long shopId,LoginUserInfo user) { SysStoreAppResponse sysStoreAppResponse = new SysStoreAppResponse(); //1.查找数据 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(lineId); @@ -257,7 +257,8 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer public NewStoreRequest convertToNewStoreRequest( SysStoreAppRequest sysStoreAppRequest, LineInfoDO lineInfoDO, - PointInfoDO pointInfoDO) { + PointInfoDO pointInfoDO, + LoginUserInfo user) { //用户信息map List userIdList = new ArrayList<>(); userIdList.add(sysStoreAppRequest.getSupervisorDetail().getSupervisorId());//督导 @@ -273,7 +274,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer // accessory_address newStoreRequest.setAccessory_address(objects); // apply_user - //todo LoginUserInfo user = CurrentUserHolder.getUser(); + //todo LoginUserInfo user newStoreRequest.setApply_user("19110026"); // city1 newStoreRequest.setCity1(pointInfoDO.getCity()); @@ -410,9 +411,8 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer try { shopAuditInfoDO.setShopId(shopId); shopAuditInfoDO.setAuditType(AuditTypeEnum.SYS_BUILD.getCode()); - LoginUserInfo user = CurrentUserHolder.getUser(); - shopAuditInfoDO.setSubmittedUserId(user.getUserId()); - shopAuditInfoDO.setSubmittedUserName(user.getName()); + shopAuditInfoDO.setSubmittedUserId(""); + shopAuditInfoDO.setSubmittedUserName(""); if (request.getAuditResult() == Constants.ZERO_INTEGER){ shopAuditInfoDO.setResultType(Constants.ONE_INTEGER); shopAuditInfoDO.setRejectReason(request.getCause()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java index 475dc5c47..50e95d9b2 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AuditStatusController.java @@ -1,6 +1,8 @@ package com.cool.store.controller.webb; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.AuditCheckRequest; import com.cool.store.request.AuditDetailRequest; import com.cool.store.response.AuditDetailResponse; @@ -26,7 +28,8 @@ public class AuditStatusController { @ApiOperation("稽核") @PostMapping("/check") public ResponseResult check(@RequestBody AuditCheckRequest request) { - return ResponseResult.success(auditStatusService.audit(request)); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(auditStatusService.audit(request,user)); } @ApiOperation("查看/稽核按钮") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java index 6d1631391..571d52f3a 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java @@ -1,20 +1,20 @@ package com.cool.store.controller.webb; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.LicenseListRequest; -import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.response.LicenseListResponse; import com.cool.store.response.ResponseResult; import com.cool.store.response.SubmitLicenseResponse; import com.cool.store.service.ApplyLicenseService; -import com.cool.store.service.CoolStoreStartFlowService; -import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -29,15 +29,15 @@ public class PCApplyLicenseController { @GetMapping(path = "/licenseList") @ApiOperation("证照审批列表") - public ResponseResult> licenseList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize, - @RequestParam(value = "storeName",required = false)String storeName, - @RequestParam(value = "submitStartTime",required = false)Long submitStartTime, - @RequestParam(value = "submitEndTime",required = false)Long submitEndTime, - @RequestParam(value = "regionId",required = false)String regionId, - @RequestParam(value = "status",required = false)Integer status) { + public ResponseResult> licenseList(@RequestParam(value = "pageNumber", required = true, defaultValue = "1") Integer pageNumber, + @RequestParam(value = "pageSize", required = true, defaultValue = "10") Integer pageSize, + @RequestParam(value = "storeName", required = false) String storeName, + @RequestParam(value = "submitStartTime", required = false) Long submitStartTime, + @RequestParam(value = "submitEndTime", required = false) Long submitEndTime, + @RequestParam(value = "regionId", required = false) String regionId, + @RequestParam(value = "status", required = false) Integer status) { LicenseListRequest request = - new LicenseListRequest(pageNumber,pageSize, storeName, submitStartTime, submitEndTime, regionId, status); + new LicenseListRequest(pageNumber, pageSize, storeName, submitStartTime, submitEndTime, regionId, status); return ResponseResult.success(applyLicenseService.licenseList(request)); } @@ -48,7 +48,6 @@ public class PCApplyLicenseController { } /** - * * @param * @param status 0通过 1不通过 * @return @@ -58,6 +57,7 @@ public class PCApplyLicenseController { public ResponseResult licenseExamine(@RequestParam("id") Long shopId, @RequestParam("status") Integer status, @RequestParam("result") String result) { - return ResponseResult.success(applyLicenseService.licenseExamine(shopId,status,result)); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(applyLicenseService.licenseExamine(shopId, status, result, user)); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java index b137e4e01..b88078018 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java @@ -1,5 +1,7 @@ package com.cool.store.controller.webb; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.AuditFranchiseFeeRequest; import com.cool.store.request.FranchiseFeeRequest; import com.cool.store.response.FranchiseFeeResponse; @@ -38,7 +40,8 @@ public class PCFranchiseFeeController { @ApiOperation("缴纳加盟费/保证金审核接口") @PostMapping("/audit") public ResponseResult auditFranchiseFee(@RequestBody AuditFranchiseFeeRequest request) { - return ResponseResult.success(franchiseFeeService.auditFranchiseFee(request)); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(franchiseFeeService.auditFranchiseFee(request,user)); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java index c3c879077..af6dc737b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java @@ -1,5 +1,7 @@ package com.cool.store.controller.webb; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.FranchiseeSaveRequest; import com.cool.store.request.InitiatingRequest; import com.cool.store.response.InitiatingResponse; @@ -40,7 +42,8 @@ public class PCIntentAgreementController { @PostMapping(path = "/franchisee/save") @ApiOperation("kdz -> xfsg 加盟商新增") public ResponseResult save(@RequestBody FranchiseeSaveRequest request) { - return intentAgreementService.save(request); + LoginUserInfo user = CurrentUserHolder.getUser(); + return intentAgreementService.save(request,user); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java index 0badf23ce..8166ad912 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java @@ -1,6 +1,8 @@ package com.cool.store.controller.webb; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.AddSignFranchiseRequest; import com.cool.store.response.AddSignFranchiseResponse; import com.cool.store.response.ResponseResult; @@ -21,7 +23,8 @@ public class PCSignFranchiseController { @ApiOperation("提交(更新)加盟合同签约") @PostMapping("/submitOrUpdate") public ResponseResult submitSignFranchise(@RequestBody AddSignFranchiseRequest request) { - return signFranchiseService.submitSignFranchise(request); + LoginUserInfo user = CurrentUserHolder.getUser(); + return signFranchiseService.submitSignFranchise(request,user); } @ApiOperation("获取默认值") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysStoreAppController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysStoreAppController.java index 98965b1c4..ebdb20071 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysStoreAppController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysStoreAppController.java @@ -1,6 +1,8 @@ package com.cool.store.controller.webb; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.SysStoreAppRequest; import com.cool.store.response.ResponseResult; import com.cool.store.response.SysStoreAppResponse; @@ -25,14 +27,16 @@ public class SysStoreAppController { @PostMapping(path = "/submit") @ApiOperation("提交(更新) 系统建店申请") public ResponseResult submitSysBuildStore(@RequestBody SysStoreAppRequest request) { - return sysStoreAppService.submitSysBuildStore(request); + LoginUserInfo user = CurrentUserHolder.getUser(); + return sysStoreAppService.submitSysBuildStore(request,user); } @GetMapping(path = "/default/get") @ApiOperation("获取系统建店默认值") public ResponseResult getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId, @RequestParam("shopId") Long shopId) { - return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId)); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId,user)); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java index 8736bcac6..b86d9a5a3 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java @@ -1,5 +1,7 @@ package com.cool.store.controller.webc; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.SubmitLicenseRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.ApplyLicenseService; @@ -27,7 +29,8 @@ public class ApplyLicenseController { @ApiOperation("证照办理提交") @PostMapping("/submit") public ResponseResult submitLicense(@RequestBody SubmitLicenseRequest request) { - return ResponseResult.success(applyLicenseService.submitLicense(request)); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(applyLicenseService.submitLicense(request,user)); } @@ -48,6 +51,7 @@ public class ApplyLicenseController { public ResponseResult licenseExamine(@RequestParam("id") Long shopId, @RequestParam("status") Integer status, @RequestParam("result") String result) { - return ResponseResult.success(applyLicenseService.licenseExamine(shopId,status,result)); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(applyLicenseService.licenseExamine(shopId,status,result,user)); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniFranchiseFeeController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniFranchiseFeeController.java index aa8f9b073..bda8e655f 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniFranchiseFeeController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniFranchiseFeeController.java @@ -1,5 +1,7 @@ package com.cool.store.controller.webc; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.AuditFranchiseFeeRequest; import com.cool.store.request.FranchiseFeeRequest; import com.cool.store.response.FranchiseFeeResponse; @@ -38,7 +40,8 @@ public class MiniFranchiseFeeController { @ApiOperation("缴纳加盟费/保证金审核接口") @PostMapping("/audit") public ResponseResult auditFranchiseFee(@RequestBody AuditFranchiseFeeRequest request) { - return ResponseResult.success(franchiseFeeService.auditFranchiseFee(request)); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(franchiseFeeService.auditFranchiseFee(request,user)); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java index 1c9b82c0f..d0619d63e 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java @@ -1,6 +1,8 @@ package com.cool.store.controller.webc; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.AddSignFranchiseRequest; import com.cool.store.response.AddSignFranchiseResponse; import com.cool.store.response.ResponseResult; @@ -21,7 +23,8 @@ public class MiniSignFranchiseController { @ApiOperation("提交(更新)加盟合同签约") @PostMapping("/submitOrUpdate") public ResponseResult submitSignFranchise(@RequestBody AddSignFranchiseRequest request) { - return signFranchiseService.submitSignFranchise(request); + LoginUserInfo user = CurrentUserHolder.getUser(); + return signFranchiseService.submitSignFranchise(request,user); } @ApiOperation("获取默认值") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java index d068f00fc..186523cc2 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java @@ -1,5 +1,7 @@ package com.cool.store.controller.webc; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.SysStoreAppRequest; import com.cool.store.response.ResponseResult; import com.cool.store.response.SysStoreAppResponse; @@ -23,13 +25,15 @@ public class MiniSysStoreAppController { @PostMapping(path = "/submit") @ApiOperation("提交(更新) 系统建店申请") public ResponseResult submitSysBuildStore(@RequestBody SysStoreAppRequest request) { - return sysStoreAppService.submitSysBuildStore(request); + LoginUserInfo user = CurrentUserHolder.getUser(); + return sysStoreAppService.submitSysBuildStore(request,user); } @GetMapping(path = "/default/get") @ApiOperation("获取系统建店默认值") public ResponseResult getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId, @RequestParam("shopId") Long shopId) { - return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId)); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId,user)); } }