Merge branch 'feature-licancan' into 'develop'

订单对接问题调试

See merge request fangxinjiang/yifu!229

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpOrderReplyParam.java

@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.ekp.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * @author licancan
@@ -19,7 +20,7 @@ public class EkpOrderReplyParam implements Serializable {
 	/**
 	 * 回复人 (人员账号)
 	 **/
-	private String fd_3ac904badcaa06;
+	private Map<String,Object> fd_3ac904badcaa06;
 	/**
 	 * 回复时间
 	 **/

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java

@@ -39,9 +39,7 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.net.URL;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * @author licancan
@@ -272,7 +270,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		//同步推送ekp
 		EkpOrderReplyParam param = new EkpOrderReplyParam();
 		param.setFd_3ac904bbaf972a(orderNo);
-		param.setFd_3ac904badcaa06(user.getUsername());
+		Map<String,Object> map = new HashMap<>();
+		map.put("LoginName",user.getUsername());
+		param.setFd_3ac904badcaa06(map);
 		param.setFd_3ac904b8590598(reply.getCreateTime().toString());
 		param.setFd_3ac904c7798e5c(replyContent);
 		ekpOrderUtil.sendReplyToEKP(param,file);