ufo / ufo-platform · Commits

Go to a project

Authored by qinchao
Commit a52d1d69dabadb5022976e7ac6043e11f2a11aac 1 parent d9819ca6

fix

Inline Side-by-side
Showing 1 changed file with 6 additions and 3 deletions
... ... @@ -1407,7 +1407,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
||buyerOrder.getStatus().byteValue() == Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal()
||buyerOrder.getStatus().byteValue() == Constant.CANCEL_MINI_FAULT_REJECT.getByteVal()
||buyerOrder.getStatus().byteValue() == Constant.CANCEL_MINI_FAULT_OUT_TIME_REJECT.getByteVal()
||buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal()){
||buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal()
||buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal()){
//卖家地址
LOGGER.info("getDeliveryAddressByOrderCode call seller address ,req is {}", req);
return this.getSendBackInfoByOrderCode(req);
... ... @@ -1470,7 +1471,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
Integer expressType=EXPRESS_TYPE_JUDGE_TO_SELLER;
//已取消的订单，状态不会再变了
if(buyerOrder.getStatus().byteValue()==Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal()){
if(buyerOrder.getStatus().byteValue()==Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal()
||buyerOrder.getStatus().byteValue()==Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal()){
expressType =EXPRESS_TYPE_RETURN_BACK_TO_SELLER;
}
... ... @@ -1966,7 +1968,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
||buyerOrder.getStatus().byteValue() == Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal()
||buyerOrder.getStatus().byteValue() == Constant.CANCEL_MINI_FAULT_REJECT.getByteVal()
||buyerOrder.getStatus().byteValue() == Constant.CANCEL_MINI_FAULT_OUT_TIME_REJECT.getByteVal()
||buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal()){
||buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal()
||buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal()){
List<BuyerOrderGoods> buyerGoodsList = buyerOrderGoodsMapper.selectByOrderCode(Arrays.asList(orderCode));
if(CollectionUtils.isNotEmpty(buyerGoodsList)) {
BuyerOrderReq reqTmp=new BuyerOrderReq();
... ...