|
|
package com.yohoufo.order.service.deposit;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.yoho.error.ServiceError;
|
|
|
import com.yoho.error.exception.ServiceException;
|
...
|
...
|
@@ -19,6 +20,7 @@ import com.yohoufo.common.exception.UfoServiceException; |
|
|
import com.yohoufo.common.utils.*;
|
|
|
import com.yohoufo.dal.order.*;
|
|
|
import com.yohoufo.dal.order.model.*;
|
|
|
import com.yohoufo.order.constants.MetaKey;
|
|
|
import com.yohoufo.order.controller.DepositOrderController;
|
|
|
import com.yohoufo.order.convert.GoodsInfoConvertor;
|
|
|
import com.yohoufo.order.model.response.AppraiseAddressResp;
|
...
|
...
|
@@ -30,7 +32,9 @@ import com.yohoufo.order.service.IExpressInfoService; |
|
|
import com.yohoufo.order.service.impl.DepositHelpService;
|
|
|
import com.yohoufo.order.service.impl.MetaConfigService;
|
|
|
import com.yohoufo.order.service.seller.SellerOrderCancelService;
|
|
|
import com.yohoufo.order.service.seller.deposit.AppraiseOrderMetaService;
|
|
|
import com.yohoufo.order.service.support.codegenerator.OrderCodeGenerator;
|
|
|
import com.yohoufo.order.service.support.codegenerator.bean.CodeMeta;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
...
|
...
|
@@ -97,6 +101,9 @@ public class DepositOrderService { |
|
|
@Autowired
|
|
|
private AppraiseOrderStorageMapper appraiseOrderStorageMapper;
|
|
|
|
|
|
@Autowired
|
|
|
private AppraiseOrderMetaService appraiseOrderMetaService;
|
|
|
|
|
|
/**
|
|
|
* 根据库存货号,计算需要召回的费用
|
|
|
* @param req
|
...
|
...
|
@@ -115,7 +122,14 @@ public class DepositOrderService { |
|
|
|
|
|
GoodsInfo goodsInfo = getGoodsInfo(storageDeposit); // 查询购买商品的详细信息
|
|
|
|
|
|
AddressInfo addressInfo = buyerOrderMetaService.getHiddenAddressInfo(req.getUid(), orderCode); // 获取用户的地址
|
|
|
|
|
|
CodeMeta codeMeta = orderCodeGenerator.expId(orderCode);
|
|
|
AddressInfo addressInfo = null;
|
|
|
if (OrderCodeType.BUYER_TYPE.getType() == codeMeta.getType()) {
|
|
|
addressInfo = buyerOrderMetaService.getHiddenAddressInfo(req.getUid(), orderCode); // 获取用户的地址
|
|
|
} else {
|
|
|
addressInfo = appraiseOrderMetaService.getHidderUserAddress(orderCode);
|
|
|
}
|
|
|
|
|
|
addressInfo.setAddress_id_str(AddressUtil.getEncryptStr(String.valueOf(addressInfo.getAddress_id())));// 加密addressId
|
|
|
|
...
|
...
|
|