Merge branch 'feature-modify-phone-no-20230510' into 'master'

Feature modify phone no 20230510

See merge request !15

src/main/java/cn/quantgroup/customer/rest/UserModifyPhoneController.java

@@ -39,4 +39,9 @@ public class UserModifyPhoneController {
                                         @RequestParam(defaultValue = "10", required = false) int pageSize) {
         return userService.modifyPhoneNolist(userId, pageNo, pageSize);
     }
+
+    @GetMapping("/modifyRecord")
+    public JsonResult modifyRecord(@RequestParam("prevPhoneNo") String prevPhoneNo){
+        return userService.modifyRecord(prevPhoneNo);
+    }
 }

src/main/java/cn/quantgroup/customer/rest/vo/phone/ModifyPhoneNo.java

 package cn.quantgroup.customer.rest.vo.phone;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.persistence.Column;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -75,4 +76,8 @@ public class ModifyPhoneNo implements Serializable {
      * 处理状态 0待人工处理 1待用户反馈结果 2已反馈
      */
     private Integer processingStatus;
+    /**
+     * 申请来源
+     */
+    private Integer applySource;
 }

src/main/java/cn/quantgroup/customer/rest/vo/phone/UserModifyPhoneRecord.java

+package cn.quantgroup.customer.rest.vo.phone;
+
+import lombok.Data;
+
+@Data
+public class UserModifyPhoneRecord {
+    private Long id;
+
+    private Long userId;
+
+    private String prevPhoneNo;
+
+    private String curPhoneNo;
+
+    private String reason;
+
+    private String operator;
+
+    private String remark;
+
+    private String financialResponse;
+
+    private String createdAt;
+
+    private String updatedAt;
+
+    private String operationAt;
+
+    private Integer applySource;
+
+    private Integer applyStatus;
+
+    private String applyStatusReason;
+}

src/main/java/cn/quantgroup/customer/service/IUserService.java

@@ -122,4 +122,6 @@ public interface IUserService extends UserDetailsService {
     JsonResult submitModiyPhoneNo(ModifyPhoneRecord modifyPhoneRecord);
 
     JsonResult modifyPhoneNolist(Long userId, int pageNo, int pageSize);
+
+    JsonResult modifyRecord(String prevPhoneNo);
 }

src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java

@@ -23,6 +23,7 @@ import cn.quantgroup.customer.rest.param.user.UserQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.rest.vo.MoResult;
 import cn.quantgroup.customer.rest.vo.phone.ModifyPhoneNo;
+import cn.quantgroup.customer.rest.vo.phone.UserModifyPhoneRecord;
 import cn.quantgroup.customer.service.IIceService;
 import cn.quantgroup.customer.service.IKaService;
 import cn.quantgroup.customer.service.IUserService;
@@ -36,11 +37,13 @@ import cn.quantgroup.user.retbean.XUserDetail;
 import cn.quantgroup.user.vo.UserSysResult;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1339,6 +1342,39 @@ public class UserServiceImpl implements IUserService {
         }
     }
 
+    @Override
+    public JsonResult modifyRecord(String prevPhoneNo) {
+        String url = userSysUrl + "/v1/user/modify/phone_no/modifyRecord";
+        ImmutableMap<String, String> param = ImmutableMap.of("prevPhoneNo", prevPhoneNo);
+        JSONObject userJsonObject = null;
+        try {
+            String response = httpService.get(url, param);
+//            log.info("[user][query modify phone list] 请求业务系统返回值,modifyPhoneQuery:{},response={}", modifyPhoneQuery, response);
+            if(response != null){
+                userJsonObject = JSONObject.parseObject(response);
+                String userBusinessCode = userJsonObject.getString("businessCode");
+                if("0000".equals(userBusinessCode)){
+                    String data = userJsonObject.getString("data");
+                    if (StringUtils.isBlank(data)){
+                        return JsonResult.buildSuccessResult(userJsonObject.getString("msg"), null);
+                    }
+                    UserModifyPhoneRecord userModifyPhoneRecord = JSONTools.deserialize(data,
+                        UserModifyPhoneRecord.class);
+                    userModifyPhoneRecord.setPrevPhoneNo(DesensitizeUtil.mobileDesensitization(userModifyPhoneRecord.getPrevPhoneNo()));
+                    userModifyPhoneRecord.setCurPhoneNo(DesensitizeUtil.mobileDesensitization(userModifyPhoneRecord.getCurPhoneNo()));
+                    return JsonResult.buildSuccessResult(userJsonObject.getString("msg"), userModifyPhoneRecord);
+                }else{
+                    return JsonResult.buildErrorStateResult(userJsonObject.getString("msg"),userJsonObject.get("data"));
+                }
+            }else{
+                return JsonResult.buildErrorStateResult(userJsonObject.getString("msg"),userJsonObject.get("data"));
+            }
+        } catch (Exception e) {
+            log.error("[user][query modify phone record] 网络通讯异常,modifyPhoneQuery:{},ex:{}", prevPhoneNo, ExceptionUtils.getStackTrace(e));
+            throw new BusinessException(ErrorCodeEnum.NET_ERROR);
+        }
+    }
+
     /**
      *根据userid和phoneNo获取基本信息
      * @param xUserUserSysResult