ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit 4f4c3b58da31bd307a0e1b8a32dba95a5ca5c920 1 parent 27ca7ebd

fix sham deliver

Inline Side-by-side
Showing 2 changed files with 34 additions and 18 deletions
... ... @@ -1039,7 +1039,7 @@ public class InBoxFacade extends BaseNoticeFacade{
public void sellerDepositOrderNotice(int uid,long orderCode, AppraiseOrderStatus targetStatus){
public void sellerDepositOrderNotice(int uid,long orderCode, AppraiseOrderStatus targetStatus, boolean isParent){
log.info("enter sellerDepositOrderNotice uid {} orderCode {} targetStatus {}", uid, orderCode, targetStatus);
try {
//
... ... @@ -1089,9 +1089,16 @@ public class InBoxFacade extends BaseNoticeFacade{
smsParams = new Object[]{orderCode};
break;
case SHAM_SEND_OUT:
inboxType = InboxBusinessTypeEnum.NOTICE_SELLER_DEPOSIT_ORDER_MISS_GOODS;
// get product info 「商品名称」「尺码」「货号」
inboxParams = buildParams4SellerDepositOrder(orderCode);
if(isParent){
inboxType = InboxBusinessTypeEnum.NOTICE_SELLER_DEPOSIT_ORDER_SHAM_DELIVER;
inboxParams = new Object[]{orderCode};
smsType = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_DEPOSIT_ORDER_SHAM_DELIVER;
smsParams = inboxParams;
}else {
inboxType = InboxBusinessTypeEnum.NOTICE_SELLER_DEPOSIT_ORDER_MISS_GOODS;
// get product info 「商品名称」「尺码」「货号」
inboxParams = buildParams4SellerDepositOrder(orderCode);
}
break;
case QUALITY_CHECK_FAKE:
inboxType = InboxBusinessTypeEnum.NOTICE_SELLER_DEPOSIT_ORDER_FIND_FLAW_OR_BIGGER;
... ...
... ... @@ -212,12 +212,12 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
case WAITING_PAY:
targetOrderStatus = AppraiseOrderStatus.CANCEL_BEFORE_PAY;
super.triggerStatusChange(orderCode, targetOrderStatus, appraiseOrderStatus);
inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetOrderStatus);
inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetOrderStatus, true);
break;
case HAS_PAYED:
targetOrderStatus = AppraiseOrderStatus.CANCEL_BEFORE_DELIVER;
super.triggerStatusChange(orderCode, targetOrderStatus , appraiseOrderStatus);
inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetOrderStatus);
inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetOrderStatus, true);
//refund amount
new GoodsServiceRefundHandler()
.loadLogger(logger)
... ... @@ -292,7 +292,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
Long orderCode = req.getOrderCode();
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.SELLER_SEND_OUT;
//
inBoxFacade.sellerDepositOrderNotice(req.getUid(), orderCode, targetOrderStatus);
inBoxFacade.sellerDepositOrderNotice(req.getUid(), orderCode, targetOrderStatus, true);
//split sku 2 order
List<AppraiseOrderGoods> paogList = appraiseOrderGoodsMapper.selectByOrderCode(orderCode);
SellerDepositOrderListService.OrderDataNode node = sellerDepositOrderListService.buildDataSourceOfParentOrder(orderCode, paogList);
... ... @@ -344,7 +344,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
triggerStatusConsistencyCheck(orderCode);
Long paidCode = pao.getParentOrderCode();
inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetStatus);
inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetStatus, false);
BigDecimal left = calLeftMoney(pao.getAmount(), orderCode);
if (left.compareTo(BigDecimal.ZERO)>0){
... ... @@ -410,7 +410,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
triggerStatusConsistencyCheck(orderCode);
//
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.CHECKING_FAKE;
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), targetOrderStatus);
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), orderCode, targetOrderStatus, false);
depositService.insertFakeDeposit(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode());
return rows;
}
... ... @@ -438,7 +438,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
.refund();
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE;
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), targetOrderStatus);
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), targetOrderStatus, false);
depositService.insertFakeDeposit(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode());
return rows;
}
... ... @@ -456,10 +456,19 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
}
//
Long orderCode = appraiseOrder.getOrderCode();
triggerStatusConsistencyCheck(orderCode);
//
boolean isParent = Objects.isNull(appraiseOrder.getParentOrderCode());
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.SHAM_SEND_OUT;
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), targetOrderStatus);
if(isParent){
}else {
//no parent
triggerStatusConsistencyCheck(orderCode);
}
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), orderCode, targetOrderStatus, isParent);
//
//refund amount
new GoodsServiceRefundHandler()
.loadLogger(logger)
... ... @@ -581,7 +590,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
Long orderCode = appraiseOrder.getOrderCode();
triggerStatusConsistencyCheck(orderCode);
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.QUALITY_CHECK_FAKE;
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), orderCode, targetOrderStatus);
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), orderCode, targetOrderStatus, false);
new GoodsServiceRefundHandler()
.loadLogger(logger)
.loadUser(appraiseOrder.getUid())
... ... @@ -611,7 +620,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
Long orderCode = orderInfo.getOrderCode();
Integer uid = orderInfo.getUid();
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.HAS_PAYED;
inBoxFacade.sellerDepositOrderNotice(orderInfo.getUid(), orderInfo.getOrderCode(), targetOrderStatus);
inBoxFacade.sellerDepositOrderNotice(uid, orderInfo.getOrderCode(), targetOrderStatus, true);
SellerCancelDeliverEvent cancelDeliverEvent =
... ... @@ -724,7 +733,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
if(rows>0){
AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.PLATFORM_RECEIVE;
inBoxFacade.sellerDepositOrderNotice(uid, parentCode, targetOrderStatus);
inBoxFacade.sellerDepositOrderNotice(uid, parentCode, targetOrderStatus, true);
}
return rows;
... ... @@ -752,7 +761,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
orderCode, parentOrderCode, prows);
if (prows>0){
AppraiseOrderStatus targetStatus = AppraiseOrderStatus.FINISH;
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), parentOrderCode, targetStatus);
inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), parentOrderCode, targetStatus, true);
}
return prows;
}
... ... @@ -802,7 +811,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
.loadOrder(orderCode, orderCode, pao.getPayment(), pao.getAmount())
.refund();
//notice
inBoxFacade.sellerDepositOrderNotice(uid, orderCode, targetOrderStatus);
inBoxFacade.sellerDepositOrderNotice(uid, orderCode, targetOrderStatus, true);
}
... ...