diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index 73709444a..3270b200c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java @@ -9,6 +9,7 @@ import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; +import com.cool.store.request.PartnerIntentInfoRequest; import com.cool.store.request.PartnerUserInfoRequest; import com.cool.store.request.PartnerWantShopInfoRequest; import com.cool.store.service.HyPartnerBaseInfoService; @@ -112,9 +113,9 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { applyBaseInfoVO.setProvinceHasOpenArea(true); } applyBaseInfoVO.setLineStatus(hyPartnerLineInfoDO.getLineStatus()); - String cacheKey = MessageFormat.format(RedisConstant.PARTNER_WANTSHOPINFO_CACHE_KEY, partnerUserInfoRequest.getPartnerId(), hyPartnerLineInfoDO.getId()); + String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, partnerUserInfoRequest.getPartnerId(), hyPartnerLineInfoDO.getId()); if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { - PartnerWantShopInfoRequest request = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerWantShopInfoRequest.class); + PartnerIntentInfoRequest request = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoRequest.class); if(!partnerUserInfoRequest.getWantShopArea().equals(request.getWantShopArea())){ request.setWantShopArea(partnerUserInfoRequest.getWantShopArea()); } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java index 67079730c..f0562b9c6 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java @@ -110,6 +110,12 @@ public class PartnerController { return ResponseResult.success(hyPartnerClerkService.submitPartnerClerkInfo(partnerClerkInfoRequest)); } + @PostMapping(path = "/submitPartnerIntentInfo") + @ApiOperation("提意向书意向信息/行业认知") + public ResponseResult submitPartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){ + return ResponseResult.success(hyPartnerIntentInfoService.submitPartnerIntentInfo(partnerIntentInfoRequest)); + } + @PostMapping(path = "/submitWantShopInfo") @ApiOperation("提意向书意向信息") public ResponseResult submitWantShopInfo(@RequestBody PartnerWantShopInfoRequest request){ @@ -176,6 +182,15 @@ public class PartnerController { return ResponseResult.success(hyPartnerClerkService.queryPartnerClerkInfo(userInfoVO.getPartnerId(), lineId)); } + @GetMapping(path = "/queryPartnerIntentInfo") + @ApiOperation("查看意向申请书-意向信息/行业信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), + }) + public ResponseResult queryPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){ + PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); + return ResponseResult.success(hyPartnerIntentInfoService.queryPartnerIntentInfo(userInfoVO, lineId)); + } @GetMapping(path = "/queryWantShopInfo") @ApiOperation("查看意向申请书-意向信息")