意向书修改

coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java

@@ -38,7 +38,7 @@ public interface HyPartnerIntentInfoService {
      */
     Boolean updatePartnerIntentInfo(BaseUserInfoRequest baseUserInfoRequest);
 
-    Boolean submitPartnerIntentInfo(PartnerIntentInfoRequest partnerIntentInfoRequest);
+    String submitPartnerIntentInfo(PartnerIntentInfoRequest partnerIntentInfoRequest);
 
     PartnerIntentInfoVO queryPartnerIntentInfo(String partnerId, Long lineId);
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java

@@ -23,6 +23,7 @@ import com.cool.store.vo.PartnerIntentInfoVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -122,15 +123,15 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
     }
 
     @Override
-    public Boolean submitPartnerIntentInfo(PartnerIntentInfoRequest request) {
+    public String submitPartnerIntentInfo(PartnerIntentInfoRequest request) {
+        if (StringUtil.isBlank(request.getPartnerId()) || Objects.isNull(request.getPartnerLineId())){
+            throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
+        }
         String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, request.getPartnerId(), request.getPartnerLineId());
         if(!request.getSubmitFlag()){
             // 自动保存时
             redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS);
-            return Boolean.TRUE;
+            return "";
-        }
-        if (StringUtil.isBlank(request.getPartnerId()) || Objects.isNull(request.getPartnerLineId())){
-            throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
         }
         HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId());
         if(intentInfoDO == null){
@@ -142,7 +143,11 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
             hyPartnerIntentInfoDAO.updateByPrimaryKeySelective(intentInfoDO);
         }
         redisUtilPool.delKey(cacheKey);
-        return true;
+        if(StringUtils.isNotBlank(request.getWantShopArea())){
+            HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(request.getWantShopArea()));
+            return hyOpenAreaInfoDO != null ? hyOpenAreaInfoDO.getAreaStatus() : null;
+        }
+        return null;
     }
 
     @Override
@@ -170,7 +175,9 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         intentInfoDO.setWantShopInfo(request.getWantShopInfo());
         intentInfoDO.setMaxBudget(request.getMaxBudget());
         intentInfoDO.setMoneySource(request.getMoneySource());
-        intentInfoDO.setMoneyProve(String.join(",", request.getMoneyProve()));
+        if(CollectionUtils.isNotEmpty(request.getMoneyProve())){
+            intentInfoDO.setMoneyProve(String.join(",", request.getMoneyProve()));
+        }
         intentInfoDO.setEducation(request.getEducation());
         intentInfoDO.setWorkYear(request.getWorkYear());
         intentInfoDO.setIsHaveWorkExp(request.getIsHaveWorkExp());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java

@@ -380,6 +380,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         String value = redisUtilPool.getString(coolingPeriodFirstLoginCacheKey);
         lineBaseInfoVO.setCoolDownFirstLoginFlag(StringUtils.isNotBlank(value));
         lineBaseInfoVO.setPartnerLineId(lineInfoDO.getId());
+        lineBaseInfoVO.setCause(lineInfoDO.getRejectPublicReason());
         return lineBaseInfoVO;
     }
 

coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java

@@ -257,7 +257,7 @@ public class DeskController {
 
     @PostMapping(path = "/updatePartnerIntentInfo")
     @ApiOperation("修改加盟商意向信息/行业认知")
-    public ResponseResult<Boolean> updatePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
+    public ResponseResult<String> updatePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
         return ResponseResult.success(hyPartnerIntentInfoService.submitPartnerIntentInfo(partnerIntentInfoRequest));
     }
 

coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java

@@ -108,23 +108,19 @@ public class PartnerController {
 
     @PostMapping(path = "/submitPartnerIntentInfo")
     @ApiOperation("提意向书意向信息/行业认知")
-    public ResponseResult<Boolean> submitPartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
+    public ResponseResult<String> submitPartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
         return ResponseResult.success(hyPartnerIntentInfoService.submitPartnerIntentInfo(partnerIntentInfoRequest));
     }
 
-
-
     @PostMapping(path = "/changePartnerClerkInfo")
     @ApiOperation("修改意向书店员信息")
     public ResponseResult<Boolean> changePartnerClerkInfo(@RequestBody PartnerClerkInfoRequest partnerClerkInfoRequest){
-
         return ResponseResult.success(hyPartnerClerkService.submitPartnerClerkInfo(partnerClerkInfoRequest));
     }
 
-
     @PostMapping(path = "/changePartnerIntentInfo")
     @ApiOperation("修改意向书意向信息/行业认知")
-    public ResponseResult<Boolean> changePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
+    public ResponseResult<String> changePartnerIntentInfo(@RequestBody PartnerIntentInfoRequest partnerIntentInfoRequest){
 
         return ResponseResult.success(hyPartnerIntentInfoService.submitPartnerIntentInfo(partnerIntentInfoRequest));
     }