修改电销綁定用戶先关接口bug修復

src/main/java/com/ydtech/core/page/HttpResult.java

@@ -4,6 +4,8 @@ package com.ydtech.core.page;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * HTTP结果封装
  *
@@ -11,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @date Jun 29, 2019
  */
 @ApiModel("HTTP结果")
-public class HttpResult<T> {
+public class HttpResult<T> implements Serializable {
 
     @ApiModelProperty("状态码")
     private int code = 200;

src/main/java/com/ydtech/modules/admin/model/po/Uuser.java

@@ -2,13 +2,15 @@ package com.ydtech.modules.admin.model.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @TableName(value ="u_user")
 @Data
-public class Uuser {
+public class Uuser implements Serializable {
 
     @TableField(value = "id")
     private Integer id;
@@ -55,13 +57,12 @@ public class Uuser {
     @TableField(value = "remarks")
     private String  remarks;
 
-    @TableField(value = "userfield")
-    private String  userfield;
 
     @TableField(value = "ico")
     private String  ico;
 
     @TableField(value = "heart_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private  Date   heartTime;
 
     @TableField(value = "ec_name")

src/main/java/com/ydtech/modules/admin/service/impl/SysUserLinkDxUserIdServiceImpl.java

@@ -15,6 +15,7 @@ import com.ydtech.modules.admin.service.SysUserLinkDxUserIdService;
 import com.ydtech.modules.admin.utils.DxApiConfigurationProperties;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.*;
@@ -90,8 +91,12 @@ public class SysUserLinkDxUserIdServiceImpl extends ServiceImpl<SysUserLinkDxUse
         List<SysUserLinkUserDto> newRecords =  new ArrayList<>();
         if(records!=null && records.size()>0){
             for(SysUserLinkUserDto  sysUserLinkUserDto : records){
-                Uuser uuser = getDataByGet(sysUserLinkUserDto.getUserId(), dxApiConfigurationProperties.getFindUserById());
-                sysUserLinkUserDto.setLinkUserName(uuser ==null? "":uuser.getName());
+                if(StringUtils.isBlank(sysUserLinkUserDto.getLinkUserId())){
+                    sysUserLinkUserDto.setLinkUserName("");
+                }else{
+                    Uuser uuser = getDataByGet(sysUserLinkUserDto.getLinkUserId(), dxApiConfigurationProperties.getFindUserById());
+                    sysUserLinkUserDto.setLinkUserName(uuser ==null? "":uuser.getNickname());
+                }
                 newRecords.add(sysUserLinkUserDto);
             }
         }
@@ -131,13 +136,14 @@ public class SysUserLinkDxUserIdServiceImpl extends ServiceImpl<SysUserLinkDxUse
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
         HttpEntity<UserQueryVo> requestEntity = new HttpEntity<>(userQueryVo,httpHeaders);
-        ResponseEntity<HttpResult<BasePageResult<Uuser>>> response =null;
-        ParameterizedTypeReference<HttpResult<BasePageResult<Uuser>>> typeRef = new ParameterizedTypeReference<HttpResult<BasePageResult<Uuser>>>() {};
-        try{
-            response = restTemplate.exchange(url, HttpMethod.POST, requestEntity, typeRef);
-        }catch(Exception e){
-
-        }
+        ParameterizedTypeReference<HttpResult<BasePageResult<Uuser>>> responseType =
+                new ParameterizedTypeReference<HttpResult<BasePageResult<Uuser>>>() {};
+        ResponseEntity<HttpResult<BasePageResult<Uuser>>> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                requestEntity,
+                responseType
+        );
         if(response!=null) {
             HttpResult<BasePageResult<Uuser>> body =  response.getBody();
             if (body.getCode() == 200) {
@@ -176,12 +182,11 @@ public class SysUserLinkDxUserIdServiceImpl extends ServiceImpl<SysUserLinkDxUse
      *  @Description:  根据用户id查询用户数据
      */
     public Uuser getDataByGet(String userId, String  url){
-        HttpHeaders httpHeaders = new HttpHeaders();
-        HttpEntity<String> requestEntity = new HttpEntity<>(userId,httpHeaders);
+        url = url + "?userId=" + userId;
         ResponseEntity<HttpResult<Uuser>> response =null;
         ParameterizedTypeReference<HttpResult<Uuser>> typeRef = new ParameterizedTypeReference<HttpResult<Uuser>>() {};
         try{
-            response = restTemplate.exchange(url, HttpMethod.GET, requestEntity, typeRef);
+            response = restTemplate.exchange(url, HttpMethod.GET, null, typeRef);
         }catch(Exception e){
 
         }

src/main/java/com/ydtech/modules/order/entity/BasePageResult.java

@@ -4,12 +4,13 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.List;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class BasePageResult<T> {
+public class BasePageResult<T> implements Serializable {
     /**
      * 当前页码
      */