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{ @@ -1039,7 +1039,7 @@ public class InBoxFacade extends BaseNoticeFacade{
1039 1039
1040 1040
1041 1041
1042 - public void sellerDepositOrderNotice(int uid,long orderCode, AppraiseOrderStatus targetStatus){ 1042 + public void sellerDepositOrderNotice(int uid,long orderCode, AppraiseOrderStatus targetStatus, boolean isParent){
1043 log.info("enter sellerDepositOrderNotice uid {} orderCode {} targetStatus {}", uid, orderCode, targetStatus); 1043 log.info("enter sellerDepositOrderNotice uid {} orderCode {} targetStatus {}", uid, orderCode, targetStatus);
1044 try { 1044 try {
1045 // 1045 //
@@ -1089,9 +1089,16 @@ public class InBoxFacade extends BaseNoticeFacade{ @@ -1089,9 +1089,16 @@ public class InBoxFacade extends BaseNoticeFacade{
1089 smsParams = new Object[]{orderCode}; 1089 smsParams = new Object[]{orderCode};
1090 break; 1090 break;
1091 case SHAM_SEND_OUT: 1091 case SHAM_SEND_OUT:
1092 - inboxType = InboxBusinessTypeEnum.NOTICE_SELLER_DEPOSIT_ORDER_MISS_GOODS;  
1093 - // get product info 「商品名称」「尺码」「货号」  
1094 - inboxParams = buildParams4SellerDepositOrder(orderCode); 1092 + if(isParent){
  1093 + inboxType = InboxBusinessTypeEnum.NOTICE_SELLER_DEPOSIT_ORDER_SHAM_DELIVER;
  1094 + inboxParams = new Object[]{orderCode};
  1095 + smsType = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_DEPOSIT_ORDER_SHAM_DELIVER;
  1096 + smsParams = inboxParams;
  1097 + }else {
  1098 + inboxType = InboxBusinessTypeEnum.NOTICE_SELLER_DEPOSIT_ORDER_MISS_GOODS;
  1099 + // get product info 「商品名称」「尺码」「货号」
  1100 + inboxParams = buildParams4SellerDepositOrder(orderCode);
  1101 + }
1095 break; 1102 break;
1096 case QUALITY_CHECK_FAKE: 1103 case QUALITY_CHECK_FAKE:
1097 inboxType = InboxBusinessTypeEnum.NOTICE_SELLER_DEPOSIT_ORDER_FIND_FLAW_OR_BIGGER; 1104 inboxType = InboxBusinessTypeEnum.NOTICE_SELLER_DEPOSIT_ORDER_FIND_FLAW_OR_BIGGER;
@@ -212,12 +212,12 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -212,12 +212,12 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
212 case WAITING_PAY: 212 case WAITING_PAY:
213 targetOrderStatus = AppraiseOrderStatus.CANCEL_BEFORE_PAY; 213 targetOrderStatus = AppraiseOrderStatus.CANCEL_BEFORE_PAY;
214 super.triggerStatusChange(orderCode, targetOrderStatus, appraiseOrderStatus); 214 super.triggerStatusChange(orderCode, targetOrderStatus, appraiseOrderStatus);
215 - inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetOrderStatus); 215 + inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetOrderStatus, true);
216 break; 216 break;
217 case HAS_PAYED: 217 case HAS_PAYED:
218 targetOrderStatus = AppraiseOrderStatus.CANCEL_BEFORE_DELIVER; 218 targetOrderStatus = AppraiseOrderStatus.CANCEL_BEFORE_DELIVER;
219 super.triggerStatusChange(orderCode, targetOrderStatus , appraiseOrderStatus); 219 super.triggerStatusChange(orderCode, targetOrderStatus , appraiseOrderStatus);
220 - inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetOrderStatus); 220 + inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetOrderStatus, true);
221 //refund amount 221 //refund amount
222 new GoodsServiceRefundHandler() 222 new GoodsServiceRefundHandler()
223 .loadLogger(logger) 223 .loadLogger(logger)
@@ -292,7 +292,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -292,7 +292,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
292 Long orderCode = req.getOrderCode(); 292 Long orderCode = req.getOrderCode();
293 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.SELLER_SEND_OUT; 293 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.SELLER_SEND_OUT;
294 // 294 //
295 - inBoxFacade.sellerDepositOrderNotice(req.getUid(), orderCode, targetOrderStatus); 295 + inBoxFacade.sellerDepositOrderNotice(req.getUid(), orderCode, targetOrderStatus, true);
296 //split sku 2 order 296 //split sku 2 order
297 List<AppraiseOrderGoods> paogList = appraiseOrderGoodsMapper.selectByOrderCode(orderCode); 297 List<AppraiseOrderGoods> paogList = appraiseOrderGoodsMapper.selectByOrderCode(orderCode);
298 SellerDepositOrderListService.OrderDataNode node = sellerDepositOrderListService.buildDataSourceOfParentOrder(orderCode, paogList); 298 SellerDepositOrderListService.OrderDataNode node = sellerDepositOrderListService.buildDataSourceOfParentOrder(orderCode, paogList);
@@ -344,7 +344,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -344,7 +344,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
344 triggerStatusConsistencyCheck(orderCode); 344 triggerStatusConsistencyCheck(orderCode);
345 345
346 Long paidCode = pao.getParentOrderCode(); 346 Long paidCode = pao.getParentOrderCode();
347 - inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetStatus); 347 + inBoxFacade.sellerDepositOrderNotice(pao.getUid(), orderCode, targetStatus, false);
348 BigDecimal left = calLeftMoney(pao.getAmount(), orderCode); 348 BigDecimal left = calLeftMoney(pao.getAmount(), orderCode);
349 if (left.compareTo(BigDecimal.ZERO)>0){ 349 if (left.compareTo(BigDecimal.ZERO)>0){
350 350
@@ -410,7 +410,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -410,7 +410,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
410 triggerStatusConsistencyCheck(orderCode); 410 triggerStatusConsistencyCheck(orderCode);
411 // 411 //
412 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.CHECKING_FAKE; 412 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.CHECKING_FAKE;
413 - inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), targetOrderStatus); 413 + inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), orderCode, targetOrderStatus, false);
414 depositService.insertFakeDeposit(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode()); 414 depositService.insertFakeDeposit(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode());
415 return rows; 415 return rows;
416 } 416 }
@@ -438,7 +438,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -438,7 +438,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
438 .refund(); 438 .refund();
439 439
440 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE; 440 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE;
441 - inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), targetOrderStatus); 441 + inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), targetOrderStatus, false);
442 depositService.insertFakeDeposit(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode()); 442 depositService.insertFakeDeposit(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode());
443 return rows; 443 return rows;
444 } 444 }
@@ -456,10 +456,19 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -456,10 +456,19 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
456 } 456 }
457 // 457 //
458 Long orderCode = appraiseOrder.getOrderCode(); 458 Long orderCode = appraiseOrder.getOrderCode();
459 - triggerStatusConsistencyCheck(orderCode);  
460 - // 459 + boolean isParent = Objects.isNull(appraiseOrder.getParentOrderCode());
461 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.SHAM_SEND_OUT; 460 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.SHAM_SEND_OUT;
462 - inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), targetOrderStatus); 461 + if(isParent){
  462 +
  463 + }else {
  464 + //no parent
  465 + triggerStatusConsistencyCheck(orderCode);
  466 +
  467 + }
  468 + inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), orderCode, targetOrderStatus, isParent);
  469 +
  470 + //
  471 +
463 //refund amount 472 //refund amount
464 new GoodsServiceRefundHandler() 473 new GoodsServiceRefundHandler()
465 .loadLogger(logger) 474 .loadLogger(logger)
@@ -581,7 +590,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -581,7 +590,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
581 Long orderCode = appraiseOrder.getOrderCode(); 590 Long orderCode = appraiseOrder.getOrderCode();
582 triggerStatusConsistencyCheck(orderCode); 591 triggerStatusConsistencyCheck(orderCode);
583 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.QUALITY_CHECK_FAKE; 592 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.QUALITY_CHECK_FAKE;
584 - inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), orderCode, targetOrderStatus); 593 + inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), orderCode, targetOrderStatus, false);
585 new GoodsServiceRefundHandler() 594 new GoodsServiceRefundHandler()
586 .loadLogger(logger) 595 .loadLogger(logger)
587 .loadUser(appraiseOrder.getUid()) 596 .loadUser(appraiseOrder.getUid())
@@ -611,7 +620,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -611,7 +620,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
611 Long orderCode = orderInfo.getOrderCode(); 620 Long orderCode = orderInfo.getOrderCode();
612 Integer uid = orderInfo.getUid(); 621 Integer uid = orderInfo.getUid();
613 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.HAS_PAYED; 622 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.HAS_PAYED;
614 - inBoxFacade.sellerDepositOrderNotice(orderInfo.getUid(), orderInfo.getOrderCode(), targetOrderStatus); 623 + inBoxFacade.sellerDepositOrderNotice(uid, orderInfo.getOrderCode(), targetOrderStatus, true);
615 624
616 625
617 SellerCancelDeliverEvent cancelDeliverEvent = 626 SellerCancelDeliverEvent cancelDeliverEvent =
@@ -724,7 +733,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -724,7 +733,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
724 733
725 if(rows>0){ 734 if(rows>0){
726 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.PLATFORM_RECEIVE; 735 AppraiseOrderStatus targetOrderStatus = AppraiseOrderStatus.PLATFORM_RECEIVE;
727 - inBoxFacade.sellerDepositOrderNotice(uid, parentCode, targetOrderStatus); 736 + inBoxFacade.sellerDepositOrderNotice(uid, parentCode, targetOrderStatus, true);
728 737
729 } 738 }
730 return rows; 739 return rows;
@@ -752,7 +761,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -752,7 +761,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
752 orderCode, parentOrderCode, prows); 761 orderCode, parentOrderCode, prows);
753 if (prows>0){ 762 if (prows>0){
754 AppraiseOrderStatus targetStatus = AppraiseOrderStatus.FINISH; 763 AppraiseOrderStatus targetStatus = AppraiseOrderStatus.FINISH;
755 - inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), parentOrderCode, targetStatus); 764 + inBoxFacade.sellerDepositOrderNotice(appraiseOrder.getUid(), parentOrderCode, targetStatus, true);
756 } 765 }
757 return prows; 766 return prows;
758 } 767 }
@@ -802,7 +811,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -802,7 +811,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
802 .loadOrder(orderCode, orderCode, pao.getPayment(), pao.getAmount()) 811 .loadOrder(orderCode, orderCode, pao.getPayment(), pao.getAmount())
803 .refund(); 812 .refund();
804 //notice 813 //notice
805 - inBoxFacade.sellerDepositOrderNotice(uid, orderCode, targetOrderStatus); 814 + inBoxFacade.sellerDepositOrderNotice(uid, orderCode, targetOrderStatus, true);
806 } 815 }
807 816
808 817