...
|
...
|
@@ -165,13 +165,12 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
BuyerOrder pbo = buildNode.buyerOrder;
|
|
|
SkupType skupType = SkupType.getSkupType(sellerOrderGoods.getAttributes());
|
|
|
Integer pboa = pbo.getAttributes();
|
|
|
boolean isQuickDeliverDepositOrder = BuyerOrderUtils.isQuickDeliverDeposit(skupType, pbo);
|
|
|
boolean isQuickDeliver = SellerGoodsHelper.isQuickDeliver(skupType);
|
|
|
boolean isInstockDepositOrder = BuyerOrderUtils.isInstockDeposit(skupType, pboa);
|
|
|
boolean isQuickDeliverOrder = BuyerOrderUtils.isQuickDeliver(pboa);
|
|
|
boolean isSpecialDepot = isInstockDepositOrder || isQuickDeliverOrder;
|
|
|
boolean isSpecialDepot = isInstockDepositOrder;
|
|
|
AppraiseAddressInfo aai = null;
|
|
|
//big prepare condition : not isQuickDeliverDepositOrder
|
|
|
if(!isQuickDeliverDepositOrder){
|
|
|
//big prepare condition : not isQuickDeliver
|
|
|
if(!isQuickDeliver){
|
|
|
if (isSpecialDepot) {
|
|
|
AppraiseAddressResp aaResp = appraiseAddressService.findByDepotType(DepotType.NJ.getCode());
|
|
|
aai = AppraiseAddressService.convert2AppraiseAddressInfo(aaResp);
|
...
|
...
|
@@ -179,7 +178,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
// 收货地址 and 用户信息
|
|
|
if (Objects.nonNull(buildNode.userAddress)) {
|
|
|
//卖家订单详情里才会有,买家没有
|
|
|
aai= appraiseAddressService.findAppraiseAddress(sellerOrderGoods.getDepotNo(), buildNode.userAddress.getAreaCode());
|
|
|
aai = appraiseAddressService.findAppraiseAddress(sellerOrderGoods.getDepotNo(), buildNode.userAddress.getAreaCode());
|
|
|
}
|
|
|
}
|
|
|
orderDetailInfo.setAppraiseAddress(aai);
|
...
|
...
|
|