修改请求金融接口

src/main/java/cn/quantgroup/xyqb/repository/IUserHashMappingRepository.java

@@ -16,5 +16,4 @@ public interface IUserHashMappingRepository extends JpaRepository<UserHashMappin
 
     @Transactional
     void deleteByUserId(Long userId);
-
 }

src/main/java/cn/quantgroup/xyqb/service/http/IHttpService.java

@@ -63,4 +63,6 @@ public interface IHttpService {
     String post(String uri, Map<String, String> headers, Map<String, String> parameters);
 
     String postJson(String uri, Map<String, String> parameters);
+
+    String postJson(String uri, Map<String, String> headers, Map<String, String> parameters);
 }

src/main/java/cn/quantgroup/xyqb/service/http/impl/HttpServiceImpl.java

@@ -6,15 +6,6 @@ import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Maps;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import javax.net.ssl.SSLContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.Charsets;
 import org.apache.commons.collections.MapUtils;
@@ -53,6 +44,12 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.springframework.stereotype.Service;
 
+import javax.net.ssl.SSLContext;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+
 /**
  * @author mengfan.feng
  * @time 2015-08-13 10:19
@@ -90,8 +87,8 @@ public class HttpServiceImpl implements IHttpService {
     }
 
     @Override
-    public String post(String uri, Map<String, String> headers, Map<String, String> parameters) {
-        return doHttp(RequestBuilder.post(), uri, headers, parameters, BodyType.FORM);
+    public String postJson(String uri, Map<String, String> headers, Map<String, String> parameters) {
+        return doHttp(RequestBuilder.post(), uri, headers, parameters, BodyType.JSON);
     }
 
     @Override
@@ -99,6 +96,11 @@ public class HttpServiceImpl implements IHttpService {
         return doHttp(RequestBuilder.post(), uri, null, parameters, BodyType.JSON);
     }
 
+    @Override
+    public String post(String uri, Map<String, String> headers, Map<String, String> parameters) {
+        return doHttp(RequestBuilder.post(), uri, headers, parameters, BodyType.FORM);
+    }
+
     /**
      * Send Http
      *

src/main/java/cn/quantgroup/xyqb/service/user/impl/ModifyPhoneNoServiceImpl.java

@@ -23,7 +23,6 @@ import cn.quantgroup.xyqb.util.RedisLock;
 import cn.quantgroup.xyqb.util.TenantUtil;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.google.common.collect.Lists;
 import com.qiniu.util.Auth;
 import lombok.extern.slf4j.Slf4j;
@@ -270,16 +269,15 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
                 parameters.put("remark", modifyPhoneRecord.getRemark());
                 // todo: 记得映射
                 parameters.put("changeRecord", modifyPhoneRecord.getReason().toString());
-                String resultStr = httpService.post(userHost + "/operation/finance-gateway/finance-user/changePhoneNo", headers, parameters);
-                JsonResult<JsonResult> tokenExchangeResult = JSONObject.parseObject(resultStr, new TypeReference<JsonResult<JsonResult>>(){});
+                String resultStr = httpService.postJson(userHost + "/api/finance-gateway/finance-user/shop/notify/changePhoneNo", headers, parameters);
+                JsonResult resultStrJson = JSONObject.parseObject(resultStr, JsonResult.class);
                 // 如果有返回值
-                JsonResult tokenExchange = tokenExchangeResult.getData();
-                if (tokenExchange != null) {
+                if ("0000".equals(resultStrJson.getCode())) {
                     // 同步金融修改电商
                     userService.submitModifyPhone(modifyPhoneRecord.getPrevPhoneNo(), modifyPhoneRecord.getCurPhoneNo());
                     UserModifyPhoneRecord record = new UserModifyPhoneRecord();
                     BeanUtils.copyProperties(modifyPhoneRecord, record);
-                    record.setFinancialResponse(JSONObject.toJSONString(modifyPhoneRecord));
+                    record.setFinancialResponse(JSONObject.toJSONString(resultStrJson));
                     modifyPhoneRecordRepository.saveAndFlush(record);
                 } else {
                     throw new DataException("金融返回失败");