ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit 075b61ddc484252c3ecf183ee3a926ec72688e75 1 parent a8c633c7

no show when goods is quick deliver

Inline Side-by-side
Showing 2 changed files with 7 additions and 9 deletions
@@ -146,15 +146,14 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen @@ -146,15 +146,14 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen
146 } 146 }
147 147
148 SkupType skupType = SkupType.getSkupType(sellerOrderGoods.getAttributes()); 148 SkupType skupType = SkupType.getSkupType(sellerOrderGoods.getAttributes());
149 - boolean isQuickDeliverDepositOrder = BuyerOrderUtils.isQuickDeliverDeposit(skupType, buyerOrder);  
150 149
151 //buyer_order_meta 批量查询 150 //buyer_order_meta 批量查询
152 List<BuyerOrderMeta> buyerOrderMetas = null; 151 List<BuyerOrderMeta> buyerOrderMetas = null;
153 if (isBuyer){ 152 if (isBuyer){
154 buyerOrderMetas = getBuyerOrderMetas(uid, orderCode, Lists.newArrayList(MetaKey.AMOUNT_DETAIL)); 153 buyerOrderMetas = getBuyerOrderMetas(uid, orderCode, Lists.newArrayList(MetaKey.AMOUNT_DETAIL));
155 } 154 }
156 -  
157 - boolean showAddress = isBuyer || (isSeller && !isQuickDeliverDepositOrder); 155 + boolean isQuickDeliver = SellerGoodsHelper.isQuickDeliver(skupType);
  156 + boolean showAddress = isBuyer || (isSeller && !isQuickDeliver);
158 AddressInfo userAddress = null; 157 AddressInfo userAddress = null;
159 if(showAddress) { 158 if(showAddress) {
160 // 收货地址 and 用户信息 159 // 收货地址 and 用户信息
@@ -165,13 +165,12 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -165,13 +165,12 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
165 BuyerOrder pbo = buildNode.buyerOrder; 165 BuyerOrder pbo = buildNode.buyerOrder;
166 SkupType skupType = SkupType.getSkupType(sellerOrderGoods.getAttributes()); 166 SkupType skupType = SkupType.getSkupType(sellerOrderGoods.getAttributes());
167 Integer pboa = pbo.getAttributes(); 167 Integer pboa = pbo.getAttributes();
168 - boolean isQuickDeliverDepositOrder = BuyerOrderUtils.isQuickDeliverDeposit(skupType, pbo); 168 + boolean isQuickDeliver = SellerGoodsHelper.isQuickDeliver(skupType);
169 boolean isInstockDepositOrder = BuyerOrderUtils.isInstockDeposit(skupType, pboa); 169 boolean isInstockDepositOrder = BuyerOrderUtils.isInstockDeposit(skupType, pboa);
170 - boolean isQuickDeliverOrder = BuyerOrderUtils.isQuickDeliver(pboa);  
171 - boolean isSpecialDepot = isInstockDepositOrder || isQuickDeliverOrder; 170 + boolean isSpecialDepot = isInstockDepositOrder;
172 AppraiseAddressInfo aai = null; 171 AppraiseAddressInfo aai = null;
173 - //big prepare condition : not isQuickDeliverDepositOrder  
174 - if(!isQuickDeliverDepositOrder){ 172 + //big prepare condition : not isQuickDeliver
  173 + if(!isQuickDeliver){
175 if (isSpecialDepot) { 174 if (isSpecialDepot) {
176 AppraiseAddressResp aaResp = appraiseAddressService.findByDepotType(DepotType.NJ.getCode()); 175 AppraiseAddressResp aaResp = appraiseAddressService.findByDepotType(DepotType.NJ.getCode());
177 aai = AppraiseAddressService.convert2AppraiseAddressInfo(aaResp); 176 aai = AppraiseAddressService.convert2AppraiseAddressInfo(aaResp);
@@ -179,7 +178,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -179,7 +178,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
179 // 收货地址 and 用户信息 178 // 收货地址 and 用户信息
180 if (Objects.nonNull(buildNode.userAddress)) { 179 if (Objects.nonNull(buildNode.userAddress)) {
181 //卖家订单详情里才会有，买家没有 180 //卖家订单详情里才会有，买家没有
182 - aai= appraiseAddressService.findAppraiseAddress(sellerOrderGoods.getDepotNo(), buildNode.userAddress.getAreaCode()); 181 + aai = appraiseAddressService.findAppraiseAddress(sellerOrderGoods.getDepotNo(), buildNode.userAddress.getAreaCode());
183 } 182 }
184 } 183 }
185 orderDetailInfo.setAppraiseAddress(aai); 184 orderDetailInfo.setAppraiseAddress(aai);