|
...
|
...
|
@@ -130,7 +130,7 @@ public class BuyerOrderCancelService { |
|
|
|
int targetGoodsStatus = SkupStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode();
|
|
|
|
int targetSellerOrderStatus = SellerOrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode();
|
|
|
|
//重新上架标志
|
|
|
|
boolean reSellAfterCancel=(OrderAssist.skupIsCommonInStock(psog.getAttributes())||OrderAssist.skupIsAdvance(psog.getAttributes()))?true:false;
|
|
|
|
boolean reSellAfterCancel=(OrderAssist.skupIsCommonInStock(psog.getAttributes())||OrderAssist.skupIsAdvance(psog.getAttributes()));
|
|
|
|
if(reSellAfterCancel){
|
|
|
|
targetGoodsStatus = SkupStatus.CAN_SELL.getCode();
|
|
|
|
targetSellerOrderStatus = SellerOrderStatus.HAS_PAYED.getCode();
|
|
...
|
...
|
@@ -147,7 +147,7 @@ public class BuyerOrderCancelService { |
|
|
|
if(reSellAfterCancel){
|
|
|
|
// 恢复product skup的库存
|
|
|
|
boolean isReturnSuccess = productProxyService.returnStorage(skup);
|
|
|
|
logger.info("in buyer cancel BeforeSellerDeliver returnStorage {} reSellAfterCancel {}, buyerUid {}, orderCode {}, skup {} buyerOrder {}",isReturnSuccess,
|
|
|
|
logger.info("in buyer cancel BeforeSellerDeliver returnStorage {} reSellAfterCancel {}, buyerUid {}, orderCode {}, skup {} buyerOrder {}",isReturnSuccess,
|
|
|
|
reSellAfterCancel, buyerUid, orderCode, buyerOrder );
|
|
|
|
}else{
|
|
|
|
SellerOrder soc = new SellerOrder();
|
|
...
|
...
|
@@ -168,7 +168,7 @@ public class BuyerOrderCancelService { |
|
|
|
TransferCase transferCase = TransferCase.PART_GOODS_MONEY_TO_SELLER;
|
|
|
|
//（退费）扣除赔偿款，计算剩余的货款，退给买家
|
|
|
|
BuyerCancelAfterProcessTask bcapt = new BuyerCancelAfterProcessTask(buyerOrder, skup,
|
|
|
|
bpcr, transferCase,reSellAfterCancel);
|
|
|
|
bpcr, transferCase, reSellAfterCancel);
|
|
|
|
bcapt.targetOrderStatus = targetOrderStatus;
|
|
|
|
bcapt.setSwdType(SellerWalletDetail.Type.BUYER_CANCEL_NO_DELIVERY);
|
|
|
|
Future<PayRefundBo> future = ThreadPoolFactory.getBuyerCancelThreadPool().submit(bcapt);
|
...
|
...
|
|
