商城订单优化

src/main/java/com/mmc/oms/feign/UserAppApi.java

@@ -47,4 +47,13 @@ public interface UserAppApi {
     @PostMapping("/fdd/contract/listContractInfoByOrderNo")
     List<ContractInfoDTO> listContractInfoByOrderNo(@RequestBody List<String> orderNos, @RequestHeader("token") String token);
 
+    /**
+     * 根据用户id获取基本信息
+     *
+     * @param userAccountId
+     * @return
+     */
+    @RequestMapping(value = "/userapp/user-account/feignGetUserSimpleInfo", method = RequestMethod.GET)
+    public UserAccountSimpleDTO feignGetUserSimpleInfo(@RequestParam Integer userAccountId, @RequestHeader("token") String token);
+
 }

src/main/java/com/mmc/oms/feign/hystrix/UserAppApiHystrix.java

@@ -55,4 +55,10 @@ public class UserAppApiHystrix implements UserAppApi {
         log.error("熔断：UserAppApiHystrix.listContractInfoByOrderNo==error==>param:{}", JSONObject.toJSONString(orderNos));
         return null;
     }
+
+    @Override
+    public UserAccountSimpleDTO feignGetUserSimpleInfo(Integer userAccountId, String token) {
+        log.error("熔断：UserAppApiHystrix.feignGetUserSimpleInfo==error==>param:{}", JSONObject.toJSONString(userAccountId));
+        return null;
+    }
 }

src/main/java/com/mmc/oms/model/dto/uav/UavOrderDTO.java

 package com.mmc.oms.model.dto.uav;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mmc.oms.model.dto.ContractInfoDTO;
 import com.mmc.oms.model.dto.kdn.KdnExpDTO;
 import io.swagger.annotations.ApiModel;
@@ -56,6 +57,7 @@ public class UavOrderDTO implements Serializable {
     @ApiModelProperty("订单类型，0正常订单、1意向订单")
     private Integer orderType;
     @ApiModelProperty("订单交期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date deliveryTime;
     @ApiModelProperty("收货地址id")
     private Integer userAddressId;
@@ -64,16 +66,20 @@ public class UavOrderDTO implements Serializable {
     @ApiModelProperty("卖家备注")
     private String sellerRemark;
     @ApiModelProperty("下单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date createTime;
     @ApiModelProperty("支付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date payTime;
     @ApiModelProperty("确认收货时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date confirmReceiptTime;
     @ApiModelProperty("修改版本")
     private Integer version;
     @ApiModelProperty("评价状态")
     private Integer remarkStatus;
     @ApiModelProperty("最近修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date updateTime;
     @ApiModelProperty("用户收货地址信息")
     private UavOrderExpressDTO uavOrderExpressDTO;

src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java

@@ -244,6 +244,13 @@ public class UavOrderServiceImpl implements UavOrderService {
         if (CollectionUtils.isNotEmpty(contractInfoDTOS)) {
             uavOrderDTO.setContractInfoDTO(contractInfoDTOS.get(0));
         }
+        // 设置个人信息
+        UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(uavOrderDO.getUserAccountId(), baseAccountDTO.getToken());
+        if (userAccountSimpleDTO != null) {
+            uavOrderDTO.setUserName(userAccountSimpleDTO.getUserName());
+            uavOrderDTO.setNickname(userAccountSimpleDTO.getNickName());
+            uavOrderDTO.setPhoneNum(userAccountSimpleDTO.getPhoneNum());
+        }
         return ResultBody.success(uavOrderDTO);
     }