ResponseResult

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

@@ -4,6 +4,7 @@ import com.cool.store.request.FranchiseeSaveRequest;
 import com.cool.store.request.InitiatingRequest;
 import com.cool.store.request.IntentAgreementSubmitRequest;
 import com.cool.store.response.InitiatingResponse;
+import com.cool.store.response.ResponseResult;
 import com.cool.store.response.SigningBaseInfoResponse;
 
 public interface IntentAgreementService {
@@ -22,7 +23,7 @@ public interface IntentAgreementService {
      */
     SigningBaseInfoResponse getMiniIntentAgreement(String partnerId, Long lineId);
 
-    InitiatingResponse initiating(InitiatingRequest request);
+    ResponseResult initiating(InitiatingRequest request);
 
-    InitiatingResponse save(FranchiseeSaveRequest request);
+    ResponseResult save(FranchiseeSaveRequest request);
 }

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

@@ -17,6 +17,7 @@ import com.cool.store.request.FranchiseeSaveRequest;
 import com.cool.store.request.InitiatingRequest;
 import com.cool.store.request.IntentAgreementSubmitRequest;
 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.SecureUtil;
@@ -176,7 +177,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
     }
 
     @Override
-    public InitiatingResponse initiating(InitiatingRequest request) {
+    public ResponseResult initiating(InitiatingRequest request) {
         log.info("initiating request:{}", JSONObject.toJSONString(request));
         if (Objects.isNull(request)) {
             throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
@@ -191,12 +192,15 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
         InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class);
         lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_75.getCode());
         lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO);
-        return initiatingResponse;
+        if (initiatingResponse.getCode() != 0){
-
+            return new ResponseResult(500,initiatingResponse.getMsg(),initiatingResponse.getData());
+        }else {
+            return new ResponseResult(200000,initiatingResponse.getMsg(),initiatingResponse.getData());
+        }
     }
 
     @Override
-    public InitiatingResponse save(FranchiseeSaveRequest request) {
+    public ResponseResult save(FranchiseeSaveRequest request) {
         log.info("save request:{}", JSONObject.toJSONString(request));
         if (Objects.isNull(request)) {
             throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
@@ -231,8 +235,11 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
             lineInfoParam.setPartnerNum(initiatingResponse.getData());
             lineInfoMapper.updateByPrimaryKeySelective(lineInfoParam);
         }
-
+        if (initiatingResponse.getCode() != 0){
-        return initiatingResponse;
+            return new ResponseResult(500,initiatingResponse.getMsg(),initiatingResponse.getData());
+        }else {
+            return new ResponseResult(200000,initiatingResponse.getMsg(),initiatingResponse.getData());
+        }
     }
 
     private void fillSignatureInfo(Map<String, Object> requestMap) {

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

@@ -33,13 +33,13 @@ public class PCIntentAgreementController {
 
     @PostMapping(path = "/initiating")
     @ApiOperation("kdz -> xfsg 发起意向协议流程")
-    public InitiatingResponse initiating(@RequestBody InitiatingRequest request) {
+    public ResponseResult initiating(@RequestBody InitiatingRequest request) {
         return intentAgreementService.initiating(request);
     }
 
     @PostMapping(path = "/franchisee/save")
     @ApiOperation("kdz -> xfsg 加盟商新增")
-    public InitiatingResponse save(@RequestBody FranchiseeSaveRequest request) {
+    public ResponseResult save(@RequestBody FranchiseeSaveRequest request) {
         return intentAgreementService.save(request);
     }