ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit 54c50d15e59424aea54f21c12350a3022b702c65 1 parent 8e93413d

optimized

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
@@ -130,7 +130,7 @@ public class BuyerOrderCancelService { @@ -130,7 +130,7 @@ public class BuyerOrderCancelService {
130 int targetGoodsStatus = SkupStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(); 130 int targetGoodsStatus = SkupStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode();
131 int targetSellerOrderStatus = SellerOrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(); 131 int targetSellerOrderStatus = SellerOrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode();
132 //重新上架标志 132 //重新上架标志
133 - boolean reSellAfterCancel=(OrderAssist.skupIsCommonInStock(psog.getAttributes())||OrderAssist.skupIsAdvance(psog.getAttributes()))?true:false; 133 + boolean reSellAfterCancel=(OrderAssist.skupIsCommonInStock(psog.getAttributes())||OrderAssist.skupIsAdvance(psog.getAttributes()));
134 if(reSellAfterCancel){ 134 if(reSellAfterCancel){
135 targetGoodsStatus = SkupStatus.CAN_SELL.getCode(); 135 targetGoodsStatus = SkupStatus.CAN_SELL.getCode();
136 targetSellerOrderStatus = SellerOrderStatus.HAS_PAYED.getCode(); 136 targetSellerOrderStatus = SellerOrderStatus.HAS_PAYED.getCode();
@@ -147,7 +147,7 @@ public class BuyerOrderCancelService { @@ -147,7 +147,7 @@ public class BuyerOrderCancelService {
147 if(reSellAfterCancel){ 147 if(reSellAfterCancel){
148 // 恢复product skup的库存 148 // 恢复product skup的库存
149 boolean isReturnSuccess = productProxyService.returnStorage(skup); 149 boolean isReturnSuccess = productProxyService.returnStorage(skup);
150 - logger.info("in buyer cancel BeforeSellerDeliver returnStorage {} reSellAfterCancel {}, buyerUid {}, orderCode {}, skup {} buyerOrder {}",isReturnSuccess, 150 + logger.info("in buyer cancel BeforeSellerDeliver returnStorage {} reSellAfterCancel {}, buyerUid {}, orderCode {}, skup {} buyerOrder {}",isReturnSuccess,
151 reSellAfterCancel, buyerUid, orderCode, buyerOrder ); 151 reSellAfterCancel, buyerUid, orderCode, buyerOrder );
152 }else{ 152 }else{
153 SellerOrder soc = new SellerOrder(); 153 SellerOrder soc = new SellerOrder();
@@ -168,7 +168,7 @@ public class BuyerOrderCancelService { @@ -168,7 +168,7 @@ public class BuyerOrderCancelService {
168 TransferCase transferCase = TransferCase.PART_GOODS_MONEY_TO_SELLER; 168 TransferCase transferCase = TransferCase.PART_GOODS_MONEY_TO_SELLER;
169 //（退费）扣除赔偿款，计算剩余的货款，退给买家 169 //（退费）扣除赔偿款，计算剩余的货款，退给买家
170 BuyerCancelAfterProcessTask bcapt = new BuyerCancelAfterProcessTask(buyerOrder, skup, 170 BuyerCancelAfterProcessTask bcapt = new BuyerCancelAfterProcessTask(buyerOrder, skup,
171 - bpcr, transferCase,reSellAfterCancel); 171 + bpcr, transferCase, reSellAfterCancel);
172 bcapt.targetOrderStatus = targetOrderStatus; 172 bcapt.targetOrderStatus = targetOrderStatus;
173 bcapt.setSwdType(SellerWalletDetail.Type.BUYER_CANCEL_NO_DELIVERY); 173 bcapt.setSwdType(SellerWalletDetail.Type.BUYER_CANCEL_NO_DELIVERY);
174 Future<PayRefundBo> future = ThreadPoolFactory.getBuyerCancelThreadPool().submit(bcapt); 174 Future<PayRefundBo> future = ThreadPoolFactory.getBuyerCancelThreadPool().submit(bcapt);