订单退款 如果是买书的订单,部分发货,不显示申请退款按钮
This commit is contained in:
@@ -472,7 +472,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
|
|||||||
boolean refundableStatusProduct = false;
|
boolean refundableStatusProduct = false;
|
||||||
if(b1.getProduct()!=null && b1.getProduct().getGoodsType().equals("05") && (paymentDateTime > timestamp-7*24*60*60*1000 || isHT)){
|
if(b1.getProduct()!=null && b1.getProduct().getGoodsType().equals("05") && (paymentDateTime > timestamp-7*24*60*60*1000 || isHT)){
|
||||||
refundableStatusProduct = true;
|
refundableStatusProduct = true;
|
||||||
}else if(b1.getProduct()!=null && !b1.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals("1")){
|
}else if(b1.getProduct()!=null && !b1.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals("1") && b1.getExpressOrderId()==0){
|
||||||
refundableStatusProduct = true;
|
refundableStatusProduct = true;
|
||||||
}
|
}
|
||||||
refundableStatusArr[i] = refundableStatusProduct;
|
refundableStatusArr[i] = refundableStatusProduct;
|
||||||
@@ -581,7 +581,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
|
|||||||
boolean refundableStatusProduct = false;
|
boolean refundableStatusProduct = false;
|
||||||
if (bb.getProduct()!=null && bb.getProduct().getGoodsType().equals("05") && paymentDateTime > timestamp - 7 * 24 * 60 * 60 * 1000) {
|
if (bb.getProduct()!=null && bb.getProduct().getGoodsType().equals("05") && paymentDateTime > timestamp - 7 * 24 * 60 * 60 * 1000) {
|
||||||
refundableStatusProduct = true;
|
refundableStatusProduct = true;
|
||||||
} else if (bb.getProduct()!=null && !bb.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals(Constants.ORDER_STATUS_TO_BE_SHIPPED)){
|
} else if (bb.getProduct()!=null && !bb.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals(Constants.ORDER_STATUS_TO_BE_SHIPPED) && bb.getExpressOrderId()==0){
|
||||||
refundableStatusProduct = true;
|
refundableStatusProduct = true;
|
||||||
}
|
}
|
||||||
refundableStatusArr[i] = refundableStatusProduct;
|
refundableStatusArr[i] = refundableStatusProduct;
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
|
|||||||
boolean refundableStatusProduct = false;
|
boolean refundableStatusProduct = false;
|
||||||
if(bb.getProduct()!=null && bb.getProduct().getGoodsType().equals("05") && (paymentDateTime > timestamp-7*24*60*60*1000)){
|
if(bb.getProduct()!=null && bb.getProduct().getGoodsType().equals("05") && (paymentDateTime > timestamp-7*24*60*60*1000)){
|
||||||
refundableStatusProduct = true;
|
refundableStatusProduct = true;
|
||||||
}else if(bb.getProduct()!=null && !bb.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals("1")){
|
}else if(bb.getProduct()!=null && !bb.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals("1") && bb.getExpressOrderId()==0){
|
||||||
refundableStatusProduct = true;
|
refundableStatusProduct = true;
|
||||||
}
|
}
|
||||||
refundableStatusArr[i] = refundableStatusProduct;
|
refundableStatusArr[i] = refundableStatusProduct;
|
||||||
|
|||||||
Reference in New Issue
Block a user