Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init
This commit is contained in:
@@ -26,4 +26,6 @@ public interface IntentAgreementService {
|
||||
ResponseResult initiating(InitiatingRequest request);
|
||||
|
||||
ResponseResult save(FranchiseeSaveRequest request);
|
||||
|
||||
InitiatingRequest getOaDetail(String mobile, String idCardNo);
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ import com.cool.store.response.InitiatingResponse;
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.response.SigningBaseInfoResponse;
|
||||
import com.cool.store.service.IntentAgreementService;
|
||||
import com.cool.store.utils.RedisUtilPool;
|
||||
import com.cool.store.utils.SecureUtil;
|
||||
import com.cool.store.utils.StringUtil;
|
||||
import com.cool.store.utils.poi.constant.Constants;
|
||||
@@ -68,6 +69,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
|
||||
@Resource
|
||||
HyOpenAreaInfoMapper openAreaInfoMapper;
|
||||
|
||||
@Resource
|
||||
RedisUtilPool redisUtilPool;
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@@ -195,12 +199,25 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
|
||||
if (initiatingResponse.getCode() != 0L){
|
||||
return new ResponseResult(500,initiatingResponse.getMsg(),initiatingResponse.getData());
|
||||
}else {
|
||||
String redisKey = "OA:"+request.getMobile()+request.getIdCardNo();
|
||||
redisUtilPool.setString(redisKey,JSONObject.toJSONString(request));
|
||||
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_75.getCode());
|
||||
lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO);
|
||||
return new ResponseResult(200000,initiatingResponse.getMsg(),initiatingResponse.getData());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public InitiatingRequest getOaDetail(String mobile, String idCardNo) {
|
||||
String redisKey = "OA:"+mobile+idCardNo;
|
||||
String responseString = redisUtilPool.getString(redisKey);
|
||||
if (StringUtils.isNotBlank(responseString)){
|
||||
InitiatingRequest initiatingRequest = JSONObject.parseObject(responseString, InitiatingRequest.class);
|
||||
return initiatingRequest;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResponseResult save(FranchiseeSaveRequest request) {
|
||||
log.info("save request:{}", JSONObject.toJSONString(request));
|
||||
|
||||
@@ -45,5 +45,14 @@ public class PCIntentAgreementController {
|
||||
|
||||
|
||||
|
||||
@GetMapping(path = "/getOaDetail")
|
||||
@ApiOperation("oa数据回显")
|
||||
public ResponseResult<InitiatingRequest> getOaDetail(@RequestParam("mobile") String mobile,
|
||||
@RequestParam("idCardNo") String idCardNo) {
|
||||
return ResponseResult.success(intentAgreementService.getOaDetail(mobile,idCardNo));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user