ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit e046fba5996832907585758a843ca69763ab1482 1 parent c8cbe014

鉴定服务

Inline Side-by-side
Showing 10 changed files with 315 additions and 12 deletions
1 package com.yoho.ufo.service.impl; 1 package com.yoho.ufo.service.impl;
2 2
  3 +import java.util.Collections;
3 import java.util.List; 4 import java.util.List;
4 import java.util.Map; 5 import java.util.Map;
5 import java.util.Objects; 6 import java.util.Objects;
@@ -44,6 +45,9 @@ public class UserProxyService { @@ -44,6 +45,9 @@ public class UserProxyService {
44 @Value("${uic.url:http://uic.yohoops.org/uic}") 45 @Value("${uic.url:http://uic.yohoops.org/uic}")
45 private String uicUrl; 46 private String uicUrl;
46 47
  48 + @Value("${ip.port.uic.server}")
  49 + private String uicServerIpAndPort;
  50 +
47 /** 51 /**
48 * 获取用户信息 52 * 获取用户信息
49 * @param uid 53 * @param uid
@@ -117,6 +121,9 @@ public class UserProxyService { @@ -117,6 +121,9 @@ public class UserProxyService {
117 public static final String PRFILE_API = "/profile/getProfile"; 121 public static final String PRFILE_API = "/profile/getProfile";
118 122
119 public static final String GET_USER_PROFILES_BY_UIDS = "/profile/getUserProfilesByUids"; 123 public static final String GET_USER_PROFILES_BY_UIDS = "/profile/getUserProfilesByUids";
  124 +
  125 + private static final String UIC_GETUSERPROFILE_URL = "/uic/profile/getUserProfile";
  126 +
120 public String getMobile(int uid){ 127 public String getMobile(int uid){
121 String url = uicUrl + PRFILE_API; 128 String url = uicUrl + PRFILE_API;
122 Map<String,Object> params = Maps.newHashMap(); 129 Map<String,Object> params = Maps.newHashMap();
@@ -166,6 +173,24 @@ public class UserProxyService { @@ -166,6 +173,24 @@ public class UserProxyService {
166 173
167 } 174 }
168 175
  176 + public String getUserNameByUid(Integer uid) {
  177 + Map<String,Integer> request = Collections.singletonMap("uid", uid);
  178 + String url = "http://" + uicServerIpAndPort + UIC_GETUSERPROFILE_URL;
  179 + JSONObject jsonObject;
  180 + try {
  181 + jsonObject = serviceCaller.post("uic.getUserProfileAction", url, request, JSONObject.class, null).get(1);
  182 + } catch (Exception e) {
  183 + logger.error("call"+ url + " fail!!! uid is {}", uid);
  184 + return "";
  185 + }
  186 +
  187 + if(null != jsonObject) {
  188 + return jsonObject.getString("profile_name");
  189 + }
  190 +
  191 + return "";
  192 + }
  193 +
169 private String getUidStrs(List<Integer> uidList) { 194 private String getUidStrs(List<Integer> uidList) {
170 List<String> uidStrList = Lists.newArrayList(); 195 List<String> uidStrList = Lists.newArrayList();
171 for(Integer uid : uidList) { 196 for(Integer uid : uidList) {
  1 +package com.yoho.order.dal;
  2 +
  3 +import org.apache.ibatis.annotations.Param;
  4 +
  5 +import com.yoho.order.model.AppraiseOrderMeta;
  6 +
  7 +/**
  8 + * Created by caoyan on 2019/8/7.
  9 + */
  10 +public interface AppraiseOrderMetaMapper {
  11 +
  12 + AppraiseOrderMeta selectByOrderCodeAndMetaKey(@Param("orderCode") String orderCode, @Param("metaKey") String metaKey);
  13 +
  14 +}
  1 +package com.yoho.order.model;
  2 +import java.io.Serializable;
  3 +
  4 +import lombok.ToString;
  5 +
  6 +/**
  7 + * @author caoyan
  8 + * @date 2019/8/7
  9 + */
  10 +@ToString
  11 +public class AppraiseOrderMeta implements Serializable {
  12 +
  13 + private static final long serialVersionUID = 2607922995706119816L;
  14 +
  15 + private Integer id;
  16 +
  17 + private Integer uid;
  18 +
  19 + private String orderCode;
  20 +
  21 + private Integer storageId;
  22 +
  23 + private String metaKey;
  24 +
  25 + private String metaValue;
  26 +
  27 + public Integer getId() {
  28 + return id;
  29 + }
  30 +
  31 + public void setId(Integer id) {
  32 + this.id = id;
  33 + }
  34 +
  35 + public Integer getUid() {
  36 + return uid;
  37 + }
  38 +
  39 + public void setUid(Integer uid) {
  40 + this.uid = uid;
  41 + }
  42 +
  43 + public String getOrderCode() {
  44 + return orderCode;
  45 + }
  46 +
  47 + public void setOrderCode(String orderCode) {
  48 + this.orderCode = orderCode;
  49 + }
  50 +
  51 + public Integer getStorageId() {
  52 + return storageId;
  53 + }
  54 +
  55 + public void setStorageId(Integer storageId) {
  56 + this.storageId = storageId;
  57 + }
  58 +
  59 + public String getMetaKey() {
  60 + return metaKey;
  61 + }
  62 +
  63 + public void setMetaKey(String metaKey) {
  64 + this.metaKey = metaKey;
  65 + }
  66 +
  67 + public String getMetaValue() {
  68 + return metaValue;
  69 + }
  70 +
  71 + public void setMetaValue(String metaValue) {
  72 + this.metaValue = metaValue;
  73 + }
  74 +
  75 +}
@@ -35,4 +35,26 @@ public class AppraiseOrderResp extends PageRequestBO{ @@ -35,4 +35,26 @@ public class AppraiseOrderResp extends PageRequestBO{
35 35
36 private String attributesStr; 36 private String attributesStr;
37 37
  38 + private String createTimeStr;
  39 +
  40 + private String platformWaybillCode;
  41 +
  42 + private Integer payMethod;
  43 +
  44 + private String sellerName;
  45 +
  46 + private String sellerRebackAddressDetail;
  47 +
  48 + private String sellerRebackAddress;
  49 +
  50 + private String sellerRebackMobile;
  51 +
  52 + private String depositCode;
  53 +
  54 + private String shelfCode;
  55 +
  56 + private Integer depositStatus;
  57 +
  58 + private String abnormalTypeStr;
  59 +
38 } 60 }
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
  3 +<mapper namespace="com.yoho.order.dal.AppraiseOrderMetaMapper">
  4 + <resultMap id="BaseResultMap" type="com.yoho.order.model.AppraiseOrderMeta">
  5 + <result column="id" property="id" jdbcType="INTEGER" />
  6 + <result column="uid" property="uid" jdbcType="INTEGER" />
  7 + <result column="order_code" property="orderCode" jdbcType="BIGINT" />
  8 + <result column="storage_id" property="storageId" jdbcType="INTEGER" />
  9 + <result column="meta_key" property="metaKey" jdbcType="VARCHAR" />
  10 + <result column="meta_value" property="metaValue" jdbcType="VARCHAR" />
  11 + </resultMap>
  12 +
  13 + <sql id="Base_Column_List">
  14 + id, uid, order_code, storage_id, meta_key, meta_value
  15 + </sql>
  16 +
  17 + <select id="selectByOrderCodeAndMetaKey" resultMap="BaseResultMap">
  18 + select <include refid="Base_Column_List" />
  19 + from appraise_order_goods where order_code =#{orderCode} and meta_key=#{metaKey}
  20 + </select>
  21 +
  22 +</mapper>
@@ -15,6 +15,7 @@ import com.yoho.ufo.order.service.IAppraiseOrderService; @@ -15,6 +15,7 @@ import com.yoho.ufo.order.service.IAppraiseOrderService;
15 import com.yoho.ufo.service.model.ApiResponse; 15 import com.yoho.ufo.service.model.ApiResponse;
16 import com.yoho.ufo.service.model.PageResponseBO; 16 import com.yoho.ufo.service.model.PageResponseBO;
17 import com.yohobuy.ufo.model.order.resp.BuyerOrderResp; 17 import com.yohobuy.ufo.model.order.resp.BuyerOrderResp;
  18 +import com.yohobuy.ufo.model.order.resp.QcOrderDetailResp;
18 19
19 @RestController 20 @RestController
20 @RequestMapping(value = "/appraiseOrder") 21 @RequestMapping(value = "/appraiseOrder")
@@ -43,5 +44,12 @@ public class AppraiseOrderController { @@ -43,5 +44,12 @@ public class AppraiseOrderController {
43 PageResponseBO<AppraiseOrderResp> result = appraiseOrderService.queryOrderListByStatus(req); 44 PageResponseBO<AppraiseOrderResp> result = appraiseOrderService.queryOrderListByStatus(req);
44 return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(null == result ? new PageResponseBO<BuyerOrderResp>() : result).build(); 45 return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(null == result ? new PageResponseBO<BuyerOrderResp>() : result).build();
45 } 46 }
  47 +
  48 + @RequestMapping(value = "/getOrderDetail")
  49 + public ApiResponse getOrderDetail(AppraiseOrderReq req) {
  50 + LOGGER.info("getOrderDetail in. param is {}", req);
  51 + AppraiseOrderResp result = appraiseOrderService.getOrderDetail(req.getOrderCode());
  52 + return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(result).build();
  53 + }
46 54
47 } 55 }
@@ -10,5 +10,7 @@ public interface IAppraiseOrderService { @@ -10,5 +10,7 @@ public interface IAppraiseOrderService {
10 Map<String, Integer> getCountByStatus(AppraiseOrderReq req); 10 Map<String, Integer> getCountByStatus(AppraiseOrderReq req);
11 11
12 PageResponseBO<AppraiseOrderResp> queryOrderListByStatus(AppraiseOrderReq req); 12 PageResponseBO<AppraiseOrderResp> queryOrderListByStatus(AppraiseOrderReq req);
  13 +
  14 + AppraiseOrderResp getOrderDetail(String orderCode);
13 15
14 } 16 }
@@ -13,23 +13,34 @@ import org.slf4j.LoggerFactory; @@ -13,23 +13,34 @@ import org.slf4j.LoggerFactory;
13 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
15 15
  16 +import com.alibaba.fastjson.JSONObject;
  17 +import com.yoho.order.dal.AbnormalOrderMapper;
16 import com.yoho.order.dal.AppraiseOrderGoodsMapper; 18 import com.yoho.order.dal.AppraiseOrderGoodsMapper;
17 import com.yoho.order.dal.AppraiseOrderMapper; 19 import com.yoho.order.dal.AppraiseOrderMapper;
  20 +import com.yoho.order.dal.AppraiseOrderMetaMapper;
18 import com.yoho.order.dal.AppraiseOrderStorageMapper; 21 import com.yoho.order.dal.AppraiseOrderStorageMapper;
19 import com.yoho.order.dal.ExpressRecordMapper; 22 import com.yoho.order.dal.ExpressRecordMapper;
  23 +import com.yoho.order.dal.StorageDepositMapper;
  24 +import com.yoho.order.model.AbnormalOrder;
20 import com.yoho.order.model.AppraiseOrder; 25 import com.yoho.order.model.AppraiseOrder;
21 import com.yoho.order.model.AppraiseOrderGoods; 26 import com.yoho.order.model.AppraiseOrderGoods;
  27 +import com.yoho.order.model.AppraiseOrderMeta;
22 import com.yoho.order.model.AppraiseOrderReq; 28 import com.yoho.order.model.AppraiseOrderReq;
23 import com.yoho.order.model.AppraiseOrderResp; 29 import com.yoho.order.model.AppraiseOrderResp;
24 import com.yoho.order.model.AppraiseOrderStorage; 30 import com.yoho.order.model.AppraiseOrderStorage;
25 import com.yoho.order.model.ExpressRecord; 31 import com.yoho.order.model.ExpressRecord;
  32 +import com.yoho.order.model.StorageDeposit;
26 import com.yoho.ufo.order.constant.Constant; 33 import com.yoho.ufo.order.constant.Constant;
  34 +import com.yoho.ufo.order.constant.OrderAbnormalTypeEnum;
27 import com.yoho.ufo.order.constant.OrderConfigConstant; 35 import com.yoho.ufo.order.constant.OrderConfigConstant;
28 import com.yoho.ufo.order.service.IAppraiseOrderService; 36 import com.yoho.ufo.order.service.IAppraiseOrderService;
  37 +import com.yoho.ufo.service.impl.UserProxyService;
29 import com.yoho.ufo.service.model.PageResponseBO; 38 import com.yoho.ufo.service.model.PageResponseBO;
  39 +import com.yoho.ufo.util.DateUtil;
30 import com.yoho.ufo.util.ImagesConstant; 40 import com.yoho.ufo.util.ImagesConstant;
31 import com.yoho.ufo.util.ImagesHelper; 41 import com.yoho.ufo.util.ImagesHelper;
32 import com.yohobuy.ufo.model.order.common.EnumExpressType; 42 import com.yohobuy.ufo.model.order.common.EnumExpressType;
  43 +import com.yohobuy.ufo.model.order.constants.DepositOutTypeEnum;
33 import com.yohobuy.ufo.model.order.constants.RegionEnum; 44 import com.yohobuy.ufo.model.order.constants.RegionEnum;
34 45
35 @Service 46 @Service
@@ -46,8 +57,20 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService{ @@ -46,8 +57,20 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService{
46 private AppraiseOrderStorageMapper appraiseOrderStorageMapper; 57 private AppraiseOrderStorageMapper appraiseOrderStorageMapper;
47 58
48 @Autowired 59 @Autowired
  60 + private AppraiseOrderMetaMapper appraiseOrderMetaMapper;
  61 +
  62 + @Autowired
49 private ExpressRecordMapper expressRecordMapper; 63 private ExpressRecordMapper expressRecordMapper;
50 64
  65 + @Autowired
  66 + private StorageDepositMapper storageDepositMapper;
  67 +
  68 + @Autowired
  69 + private AbnormalOrderMapper abnormalOrderMapper;
  70 +
  71 + @Autowired
  72 + private UserProxyService userProxyService;
  73 +
51 //已收货 74 //已收货
52 private static final Byte QC_STATUS_RECEIVED = 0; 75 private static final Byte QC_STATUS_RECEIVED = 0;
53 76
@@ -57,26 +80,25 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService{ @@ -57,26 +80,25 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService{
57 //已发货 80 //已发货
58 private static final Byte QC_STATUS_ALREADY_DELIVER = 2; 81 private static final Byte QC_STATUS_ALREADY_DELIVER = 2;
59 82
  83 + private static final Integer PAY_METHOD_MONTHLY = 1;//寄付月结
  84 +
  85 + private static final Integer PAY_METHOD_FREIGHT_COLLECT = 2;//到付
  86 +
  87 + private static final String SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS = "back_delivery_address";
  88 +
60 //待处理 89 //待处理
61 private static final List<Byte> receivedList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal(),//卖家已发货 90 private static final List<Byte> receivedList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal(),//卖家已发货
62 - Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal(),//平台质检中  
63 - Constant.BUYER_ORDER_STATUS_JUDGE_PASS_WAIT_WAREHOUSE.getByteVal()); //鉴定通过待寄存 91 + Constant.BUYER_ORDER_STATUS_JUDGING.getByteVal());//平台鉴定中
64 92
65 //待发货 93 //待发货
66 - private static final List<Byte> processingList = Lists.newArrayList(Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal(),//已取消（商品质检不通过）  
67 - Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal(),//平台鉴定通过 94 + private static final List<Byte> processingList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal(),//平台鉴定通过
68 Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal(),//已取消（商品鉴定不通过） 95 Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal(),//已取消（商品鉴定不通过）
69 - Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal(),//无法鉴定  
70 - Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal());//已取消（买家在卖家发货后取消） 96 + Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal());//无法鉴定
71 97
72 //已发货 98 //已发货
73 - private static final List<Byte> alreadyDeliverList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal(),//平台已发货 99 + private static final List<Byte> alreadyDeliverList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal(),//平台鉴定通过
74 Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal(),//已取消（鉴定不通过） 100 Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal(),//已取消（鉴定不通过）
75 - Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal(),//已取消（质检不通过）  
76 - Constant.CANCEL_MINI_FAULT_REJECT.getByteVal(),//已取消（瑕疵确认不通过）  
77 - Constant.CANCEL_MINI_FAULT_OUT_TIME_REJECT.getByteVal(),//已取消（瑕疵确认超时）  
78 - Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal(),//无法鉴定  
79 - Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal());//已取消（买家在卖家发货后取消） 101 + Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal());//无法鉴定
80 102
81 103
82 public Map<String, Integer> getCountByStatus(AppraiseOrderReq req){ 104 public Map<String, Integer> getCountByStatus(AppraiseOrderReq req){
@@ -144,6 +166,115 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService{ @@ -144,6 +166,115 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService{
144 return result; 166 return result;
145 } 167 }
146 168
  169 + @Override
  170 + public AppraiseOrderResp getOrderDetail(String orderCode) {
  171 + AppraiseOrder order = appraiseOrderMapper.selectByOrderCode(orderCode);
  172 + if(null == order) {
  173 + return null;
  174 + }
  175 + AppraiseOrderResp resp = new AppraiseOrderResp();
  176 + resp.setOrderCode(order.getOrderCode());
  177 + resp.setStatus(order.getStatus());
  178 + resp.setStatusStr(Constant.convertOrderStatusStr(order.getStatus()));
  179 + resp.setCreateTimeStr(DateUtil.int2DateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
  180 + resp.setAttributes(order.getAttributes());
  181 +
  182 + //卖家物流单号
  183 + ExpressRecord sellerExpressRecord = expressRecordMapper.selectByOrderCodeAndType(order.getOrderCode(),
  184 + order.getUid(), EnumExpressType.EXPRESS_TYPE_1.getCode());
  185 + if(null != sellerExpressRecord) {
  186 + resp.setSellerWaybillCode(sellerExpressRecord.getWaybillCode());
  187 + }
  188 +
  189 + //查询平台快递单号
  190 + List<ExpressRecord> platformExpressList = expressRecordMapper.selectByOrderCodeListAndType(Lists.newArrayList(order.getOrderCode()),
  191 + Lists.newArrayList(EnumExpressType.EXPRESS_TYPE_3.getCode(),EnumExpressType.EXPRESS_TYPE_REBACK.getCode()));
  192 + if(CollectionUtils.isNotEmpty(platformExpressList)){
  193 + resp.setPlatformWaybillCode(platformExpressList.get(0).getWaybillCode());
  194 + }
  195 + //查询appraise_order_goods
  196 + AppraiseOrderGoods goods = appraiseOrderGoodsMapper.selectByOrderCode(Long.valueOf(order.getOrderCode()));
  197 + if(null == goods) {
  198 + return resp;
  199 + }
  200 +
  201 + //查询appraise_order_storage
  202 + List<AppraiseOrderStorage> storageList = appraiseOrderStorageMapper.selectByOrderCodes(Lists.newArrayList(order.getOrderCode()));
  203 + if(CollectionUtils.isEmpty(storageList)) {
  204 + return resp;
  205 + }
  206 +
  207 + AppraiseOrderStorage storage = storageList.get(0);
  208 +
  209 + //商品信息
  210 + resp.setProductImage(ImagesHelper.getImageAbsoluteUrl(goods.getImageUrl(), ImagesConstant.BUCKET_GOODS_IMG));
  211 + resp.setProductName(goods.getProductName());
  212 + resp.setSizeName(storage.getSizeName());
  213 + resp.setProductCode(goods.getProductCode());
  214 +
  215 + rebuildOrderDetailResp(order, resp);
  216 +
  217 + queryStorageDeposit(resp, order.getOrderCode()); //查询寄存信息
  218 +
  219 + queryAbnormalOrder(resp, order.getOrderCode());//查询异常订单信息
  220 +
  221 + resp.setAttributesStr(OrderConfigConstant.getOrderAttributeStr(order.getAttributes(), RegionEnum.MAINLAND.getCode()));
  222 +
  223 + return resp;
  224 + }
  225 +
  226 + private void queryAbnormalOrder(AppraiseOrderResp resp, String orderCode) { // 查询异常订单信息
  227 + AbnormalOrder order = abnormalOrderMapper.selectByOrderCode(orderCode);
  228 + if(null == order) {
  229 + return;
  230 + }
  231 +
  232 + resp.setAbnormalTypeStr(OrderAbnormalTypeEnum.convertAbnormalTypeStr(order.getType().byteValue()));
  233 + }
  234 +
  235 + private void queryStorageDeposit(AppraiseOrderResp resp, String orderCode) { // 查询寄存信息
  236 + StorageDeposit deposit = storageDepositMapper.selectByOrderCode(orderCode);
  237 + if(null == deposit) {
  238 + return;
  239 + }
  240 +
  241 + resp.setDepositCode(deposit.getDepositCode());
  242 + resp.setShelfCode(deposit.getShelfCode());
  243 + resp.setDepositStatus(deposit.getStatus());
  244 + String extraInfo = "";
  245 + resp.setPayMethod(PAY_METHOD_MONTHLY);
  246 + if(null != deposit.getOutType()) {
  247 + if(deposit.getOutType().equals(DepositOutTypeEnum.OUTTYPE_DEPOSIT_RECALL.getCode())) {
  248 + extraInfo = "（召回出库）";
  249 + }else if(deposit.getOutType().equals(DepositOutTypeEnum.OUTTYPE_DEPOSIT_FLASH_PURCHASE.getCode())) {
  250 + extraInfo = "（闪购出库）";
  251 + }else if(deposit.getOutType().equals(DepositOutTypeEnum.OUTTYPE_EXPIRED.getCode())) {
  252 + extraInfo = "（逾期出库）";
  253 + resp.setPayMethod(PAY_METHOD_FREIGHT_COLLECT);
  254 + }
  255 + }
  256 + resp.setStatusStr(resp.getStatusStr() + extraInfo);
  257 + }
  258 +
  259 + private void rebuildOrderDetailResp(AppraiseOrder order, AppraiseOrderResp resp) {
  260 + //卖家信息
  261 + resp.setSellerName(userProxyService.getUserNameByUid(order.getUid()));
  262 + AppraiseOrderMeta meta = appraiseOrderMetaMapper.selectByOrderCodeAndMetaKey(order.getOrderCode(), SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS);
  263 + if(meta != null){
  264 + JSONObject metaValue = JSONObject.parseObject(meta.getMetaValue());
  265 + resp.setSellerRebackAddressDetail(metaValue.getString("address"));
  266 + resp.setSellerRebackAddress(metaValue.getString("area"));
  267 + resp.setSellerRebackMobile(metaValue.getString("mobile"));
  268 + }
  269 +
  270 + //快递结算方式
  271 + if(order.getStatus().equals(Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE)) {//寄付月结
  272 + resp.setPayMethod(PAY_METHOD_MONTHLY);
  273 + }else {
  274 + resp.setPayMethod(PAY_METHOD_FREIGHT_COLLECT);//到付
  275 + }
  276 + }
  277 +
147 private PageResponseBO<AppraiseOrderResp> queryOrderListByStatusAndQueryStr(String queryStr, Integer depotNo, 278 private PageResponseBO<AppraiseOrderResp> queryOrderListByStatusAndQueryStr(String queryStr, Integer depotNo,
148 List<Byte> checkStatusList, String platformExpressInfoFlag, String sortRule){ 279 List<Byte> checkStatusList, String platformExpressInfoFlag, String sortRule){
149 //先按订单号来查 280 //先按订单号来查
@@ -65,6 +65,8 @@ datasources: @@ -65,6 +65,8 @@ datasources:
65 - com.yoho.order.dal.AbnormalOrderMapper 65 - com.yoho.order.dal.AbnormalOrderMapper
66 - com.yoho.order.dal.AppraiseOrderMapper 66 - com.yoho.order.dal.AppraiseOrderMapper
67 - com.yoho.order.dal.AppraiseOrderGoodsMapper 67 - com.yoho.order.dal.AppraiseOrderGoodsMapper
  68 + - com.yoho.order.dal.AppraiseOrderStorageMapper
  69 + - com.yoho.order.dal.AppraiseOrderMetaMapper
68 70
69 ufo_resource: 71 ufo_resource:
70 servers: 72 servers:
@@ -66,6 +66,8 @@ datasources: @@ -66,6 +66,8 @@ datasources:
66 - com.yoho.order.dal.AbnormalOrderMapper 66 - com.yoho.order.dal.AbnormalOrderMapper
67 - com.yoho.order.dal.AppraiseOrderMapper 67 - com.yoho.order.dal.AppraiseOrderMapper
68 - com.yoho.order.dal.AppraiseOrderGoodsMapper 68 - com.yoho.order.dal.AppraiseOrderGoodsMapper
  69 + - com.yoho.order.dal.AppraiseOrderStorageMapper
  70 + - com.yoho.order.dal.AppraiseOrderMetaMapper
69 71
70 ufo_resource: 72 ufo_resource:
71 servers: 73 servers: