ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit fc5f04b97c1254d2e6a14f222a3446ff7836da7b 1 parent 26dad59c

rename 

catch redis exception
Inline Side-by-side
Showing 1 changed file with 12 additions and 7 deletions
... ... @@ -146,7 +146,7 @@ public class SellerOrderCancelService {
SellerOrderStatusNode statusNode = SellerOrderStatusNode.builder()
.exceptStatus(SellerOrderStatus.WAITING_PAY).targetStatus(targetSOStatus).build();
result = cancelBeforePayAction(uid, orderCode, skup, statusNode);
result = cancelBeforeBuyerPayAction(uid, orderCode, skup, statusNode);
}
//case 2: 支付完成，没有买家下单
... ... @@ -180,7 +180,7 @@ public class SellerOrderCancelService {
SellerOrderStatusNode statusNode = SellerOrderStatusNode.builder()
.exceptStatus(SellerOrderStatus.WAITING_PAY)
.targetStatus(targetSOStatus).build();
result = cancelBeforePayAction(uid, orderCode, sellerOrder.getSkup(), statusNode);
result = cancelBeforeBuyerPayAction(uid, orderCode, sellerOrder.getSkup(), statusNode);
}
return result;
... ... @@ -192,7 +192,7 @@ public class SellerOrderCancelService {
SellerOrderStatus exceptStatus;
}
private int cancelBeforePayAction(int uid, long orderCode, Integer skup, SellerOrderStatusNode statusNode){
private int cancelBeforeBuyerPayAction(int uid, long orderCode, Integer skup, SellerOrderStatusNode statusNode){
SellerOrderStatus targetSOStatus = statusNode.targetStatus;
SellerOrderStatus exceptStatus = statusNode.exceptStatus;
logger.info("in seller cancel before Buy Action, uid {} skup {} orderCode {} targetSOStatus {}, exceptStatus {}",
... ... @@ -236,9 +236,14 @@ public class SellerOrderCancelService {
logger.warn("in seller cancel before Buy Action syncSkup fail, uid {}, skup {}", uid, skup, ex);
}
cacheCleaner.cleanList(uid, TabType.SELL.getValue());
SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
cacheCleaner.cleanSellerDetail(psog);
try{
cacheCleaner.cleanList(uid, TabType.SELL.getValue());
SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
cacheCleaner.cleanSellerDetail(psog);
}catch (Exception ex){
logger.warn("in seller cancel before Buy Action clean cache of list and detail fail, uid {}, skup {}",
uid, skup, ex);
}
}
return result;
... ... @@ -263,7 +268,7 @@ public class SellerOrderCancelService {
SellerOrderStatusNode statusNode = SellerOrderStatusNode.builder().targetStatus(targetSOStatus)
.exceptStatus(expectStatus).build();
int result = cancelBeforePayAction(sellerUid, orderCode, skup, statusNode);
int result = cancelBeforeBuyerPayAction(sellerUid, orderCode, skup, statusNode);
if(result > 0 ){
double earnestMoney = sellerOrder.getEarnestMoney().doubleValue();
... ...