Authored by chenchao

no show when goods is quick deliver

... ... @@ -146,15 +146,14 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen
}
SkupType skupType = SkupType.getSkupType(sellerOrderGoods.getAttributes());
boolean isQuickDeliverDepositOrder = BuyerOrderUtils.isQuickDeliverDeposit(skupType, buyerOrder);
//buyer_order_meta 批量查询
List<BuyerOrderMeta> buyerOrderMetas = null;
if (isBuyer){
buyerOrderMetas = getBuyerOrderMetas(uid, orderCode, Lists.newArrayList(MetaKey.AMOUNT_DETAIL));
}
boolean showAddress = isBuyer || (isSeller && !isQuickDeliverDepositOrder);
boolean isQuickDeliver = SellerGoodsHelper.isQuickDeliver(skupType);
boolean showAddress = isBuyer || (isSeller && !isQuickDeliver);
AddressInfo userAddress = null;
if(showAddress) {
// 收货地址 and 用户信息
... ...
... ... @@ -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);
... ...