ufo / yohoufo-fore · Commits

Go to a project

Authored by qinchao
Commit ddeed26421e9148971d95b86f439beb272bb6ab0 1 parent 4de14928

加货号

Inline Side-by-side
Showing 6 changed files with 84 additions and 47 deletions
@@ -94,14 +94,18 @@ public class SellerOrderPaymentService extends AbstractOrderPaymentService { @@ -94,14 +94,18 @@ public class SellerOrderPaymentService extends AbstractOrderPaymentService {
94 public void processAfterPay(OrderInfo orderInfo) { 94 public void processAfterPay(OrderInfo orderInfo) {
95 logger.info("method com.yohoufo.order.service.SellerOrderPaymentService.processAfterPay in, orderInfo is {}", orderInfo); 95 logger.info("method com.yohoufo.order.service.SellerOrderPaymentService.processAfterPay in, orderInfo is {}", orderInfo);
96 String prdName = null; 96 String prdName = null;
  97 + String sizeName = null;
  98 + Integer productId = null;
97 int sellerUid; 99 int sellerUid;
98 SellerOrder sellerOrder = sellerOrderMapper.selectByOrderCode(orderInfo.getOrderCode()); 100 SellerOrder sellerOrder = sellerOrderMapper.selectByOrderCode(orderInfo.getOrderCode());
99 SellerOrderGoods sellerOrderGoods = null; 101 SellerOrderGoods sellerOrderGoods = null;
100 if (Objects.nonNull(sellerOrder)){ 102 if (Objects.nonNull(sellerOrder)){
101 sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(sellerOrder.getSkup()); 103 sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(sellerOrder.getSkup());
102 prdName = sellerOrderGoods.getProductName(); 104 prdName = sellerOrderGoods.getProductName();
  105 + sizeName = sellerOrderGoods.getSizeName();
  106 + productId = sellerOrderGoods.getProductId();
103 } 107 }
104 - inBoxFacade.sellerPaidEarnestMoney(sellerUid=orderInfo.getUid(), prdName); 108 + inBoxFacade.sellerPaidEarnestMoney(sellerUid=orderInfo.getUid(), prdName,sizeName,productId);
105 109
106 cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(sellerUid, TabType.SELL.getValue()), 110 cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(sellerUid, TabType.SELL.getValue()),
107 CacheKeyBuilder.sellerOrderDetailKey(sellerOrderGoods), 111 CacheKeyBuilder.sellerOrderDetailKey(sellerOrderGoods),
@@ -149,8 +149,8 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<Map<In @@ -149,8 +149,8 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<Map<In
149 149
150 private void inboxNotify(int uid, Map<Integer, SkupDto> skupDtoMap) { 150 private void inboxNotify(int uid, Map<Integer, SkupDto> skupDtoMap) {
151 try { 151 try {
152 - String productName = skupDtoMap.values().iterator().next().getSellerOrderGoods().getProductName();  
153 - inBoxFacade.sellerPlaySelf(uid, productName); 152 + SellerOrderGoods psog = skupDtoMap.values().iterator().next().getSellerOrderGoods();
  153 + inBoxFacade.sellerPlaySelf(uid, psog);
154 } catch (Exception ex) { 154 } catch (Exception ex) {
155 log.error("[{}-{}] exception happened when inboxNotify", uid, ex); 155 log.error("[{}-{}] exception happened when inboxNotify", uid, ex);
156 } 156 }
@@ -404,7 +404,7 @@ public class SellerOrderCancelService { @@ -404,7 +404,7 @@ public class SellerOrderCancelService {
404 .skup(skup); 404 .skup(skup);
405 //TODO 1. cache goods 2. async execute msg 405 //TODO 1. cache goods 2. async execute msg
406 SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(skup); 406 SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
407 - inBoxFacade.sellerPlaySelf(sellerUid, psog.getProductName()); 407 + inBoxFacade.sellerPlaySelf(sellerUid, psog);
408 408
409 new RefundEarnestMoneyHandler() 409 new RefundEarnestMoneyHandler()
410 .loadRefundAction(payRefundService::refund) 410 .loadRefundAction(payRefundService::refund)
@@ -739,7 +739,7 @@ public class SellerOrderCancelService { @@ -739,7 +739,7 @@ public class SellerOrderCancelService {
739 PayRefundBo payRefundBo = payRefundService.refund(refundReq, bleb); 739 PayRefundBo payRefundBo = payRefundService.refund(refundReq, bleb);
740 logger.info("in yoho Off Shelve Cancel , refund earnestMoney finish, seller {}, order code {}, skup {}, earnestMoney {}", 740 logger.info("in yoho Off Shelve Cancel , refund earnestMoney finish, seller {}, order code {}, skup {}, earnestMoney {}",
741 sellerUid, orderCode, skup, earnestMoney); 741 sellerUid, orderCode, skup, earnestMoney);
742 - inBoxFacade.notifyUnshelfCauseBySpecialReason(sellerUid, psog.getProductName()); 742 + inBoxFacade.notifyUnshelfCauseBySpecialReason(sellerUid, psog);
743 }catch (Exception ex){ 743 }catch (Exception ex){
744 logger.warn("in yoho Off Shelve Cancel, refund earnestMoney fail, seller {}, order code {}, skup {}, earnestMoney {}", 744 logger.warn("in yoho Off Shelve Cancel, refund earnestMoney fail, seller {}, order code {}, skup {}, earnestMoney {}",
745 sellerUid, orderCode, skup, earnestMoney, ex); 745 sellerUid, orderCode, skup, earnestMoney, ex);
@@ -322,7 +322,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi @@ -322,7 +322,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
322 ForkJoinTask<SellerOrderSubmitHandler.ForkJoinResult> fjt = ThreadPoolFactory.getForkJoinPool().submit(batchProcessTask); 322 ForkJoinTask<SellerOrderSubmitHandler.ForkJoinResult> fjt = ThreadPoolFactory.getForkJoinPool().submit(batchProcessTask);
323 taskList.add(fjt); 323 taskList.add(fjt);
324 } 324 }
325 - inBoxFacade.sellerPaidEarnestMoney(uid, ctx.getSoldProduct().getProductName()); 325 + inBoxFacade.sellerPaidEarnestMoney(uid, ctx.getSoldProduct().getProductName(),ctx.getSoldProduct().getSizeName(),ctx.getSoldProduct().getProductId());
326 return OrderSubmitResp.builder().build(); 326 return OrderSubmitResp.builder().build();
327 } 327 }
328 328
@@ -402,7 +402,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi @@ -402,7 +402,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
402 } 402 }
403 SkupDto skupDto = tskupMap.values().iterator().next(); 403 SkupDto skupDto = tskupMap.values().iterator().next();
404 SellerOrderGoods sellerOrderGoods = skupDto.getSellerOrderGoods(); 404 SellerOrderGoods sellerOrderGoods = skupDto.getSellerOrderGoods();
405 - inBoxFacade.sellerPlaySelf(sellerOrderGoods.getUid(), sellerOrderGoods.getProductName()); 405 + inBoxFacade.sellerPlaySelf(sellerOrderGoods.getUid(), sellerOrderGoods);
406 //clean cache 406 //clean cache
407 cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(req.getUid(), TabType.SELL.getValue()), 407 cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(req.getUid(), TabType.SELL.getValue()),
408 CacheKeyBuilder.sellerOrderDetailKey(sellerOrderGoods) 408 CacheKeyBuilder.sellerOrderDetailKey(sellerOrderGoods)
@@ -308,7 +308,7 @@ public class ShoppingServiceImpl implements IShoppingService { @@ -308,7 +308,7 @@ public class ShoppingServiceImpl implements IShoppingService {
308 .uid(shoppingRequest.getUid()).orderCode(orderCode).build(); 308 .uid(shoppingRequest.getUid()).orderCode(orderCode).build();
309 EventBusPublisher.publishEvent(notPaidNoticeEvent); 309 EventBusPublisher.publishEvent(notPaidNoticeEvent);
310 // 310 //
311 - inBoxFacade.sellerSkupCreateOrderByBuyer(sellerUid, skup.getProductName()); 311 + inBoxFacade.sellerSkupCreateOrderByBuyer(sellerUid, skup);
312 }else{ 312 }else{
313 logger.warn("buyer submit order "); 313 logger.warn("buyer submit order ");
314 } 314 }
@@ -241,7 +241,7 @@ public class InBoxFacade { @@ -241,7 +241,7 @@ public class InBoxFacade {
241 String sizeName = psog.getSizeName(); 241 String sizeName = psog.getSizeName();
242 Integer sellerUid = psog.getUid(); 242 Integer sellerUid = psog.getUid();
243 InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_APPRAISE_PASS; 243 InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_APPRAISE_PASS;
244 - String paramsOfSeller = buildParams(prdName, sizeName); 244 + String paramsOfSeller = buildParams(prdName, sizeName,productCode);
245 InboxReqVO reqOfSeller = buildInboxReqVO(sellerUid, paramsOfSeller, ibtOfSeller); 245 InboxReqVO reqOfSeller = buildInboxReqVO(sellerUid, paramsOfSeller, ibtOfSeller);
246 246
247 InBoxResponse respOfSeller = inBoxSDK.addInbox(reqOfSeller); 247 InBoxResponse respOfSeller = inBoxSDK.addInbox(reqOfSeller);
@@ -546,11 +546,16 @@ public class InBoxFacade { @@ -546,11 +546,16 @@ public class InBoxFacade {
546 * @param sellerUid 546 * @param sellerUid
547 * @param prdName 547 * @param prdName
548 */ 548 */
549 - public void sellerPaidEarnestMoney(int sellerUid, String prdName) { 549 + public void sellerPaidEarnestMoney(int sellerUid, String prdName,String sizeName,Integer productId) {
550 try { 550 try {
551 executorService.execute(() -> { 551 executorService.execute(() -> {
  552 + logger.info("record sellerPaidEarnestMoney inbox in , sellerUid {}, prdName {}, sizeName {} ,productId {}",
  553 + sellerUid, prdName, sizeName,productId);
  554 + Product product = productMapper.selectByPrimaryKey(productId);
  555 + String productCode = product.getProductCode();
  556 +
552 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SHELF; 557 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SHELF;
553 - String params = buildParams(prdName); 558 + String params = buildParams(prdName,sizeName,productCode);
554 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 559 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
555 560
556 InBoxResponse resp = inBoxSDK.addInbox(req); 561 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -558,8 +563,8 @@ public class InBoxFacade { @@ -558,8 +563,8 @@ public class InBoxFacade {
558 sellerUid, prdName, resp); 563 sellerUid, prdName, resp);
559 }); 564 });
560 } catch (Exception e) { 565 } catch (Exception e) {
561 - logger.warn("InBoxFacade sellerPaidEarnestMoney error inbox msg, sellerUid {}, prdName {} ",  
562 - sellerUid, prdName, e); 566 + logger.warn("InBoxFacade sellerPaidEarnestMoney error inbox msg, sellerUid {}, prdName {} ,productId {} ",
  567 + sellerUid, prdName,productId, e);
563 } 568 }
564 } 569 }
565 570
@@ -567,13 +572,17 @@ public class InBoxFacade { @@ -567,13 +572,17 @@ public class InBoxFacade {
567 * 下架成功 572 * 下架成功
568 * 573 *
569 * @param sellerUid 574 * @param sellerUid
570 - * @param prdName  
571 */ 575 */
572 - public void sellerPlaySelf(int sellerUid, String prdName) { 576 + public void sellerPlaySelf(int sellerUid,SellerOrderGoods sellerOrderGoods) {
573 try { 577 try {
574 executorService.execute(() -> { 578 executorService.execute(() -> {
  579 + String prdName = sellerOrderGoods.getProductName();
  580 + String sizeName = sellerOrderGoods.getSizeName();
  581 + Product product = productMapper.selectByPrimaryKey(sellerOrderGoods.getProductId());
  582 + String productCode = product.getProductCode();
  583 +
575 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_UNSHELF; 584 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_UNSHELF;
576 - String params = buildParams(prdName); 585 + String params = buildParams(prdName,sizeName,productCode);
577 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 586 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
578 587
579 InBoxResponse resp = inBoxSDK.addInbox(req); 588 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -583,7 +592,7 @@ public class InBoxFacade { @@ -583,7 +592,7 @@ public class InBoxFacade {
583 592
584 } catch (Exception e) { 593 } catch (Exception e) {
585 logger.warn("InBoxFacade sellerPlaySelf error inbox msg, sellerUid {}, prdName {} ", 594 logger.warn("InBoxFacade sellerPlaySelf error inbox msg, sellerUid {}, prdName {} ",
586 - sellerUid, prdName, e); 595 + sellerUid, sellerOrderGoods, e);
587 } 596 }
588 597
589 } 598 }
@@ -593,13 +602,17 @@ public class InBoxFacade { @@ -593,13 +602,17 @@ public class InBoxFacade {
593 * 卖家商品售出提醒，买家下单后 602 * 卖家商品售出提醒，买家下单后
594 * 603 *
595 * @param sellerUid 604 * @param sellerUid
596 - * @param prdName  
597 */ 605 */
598 - public void sellerSkupCreateOrderByBuyer(int sellerUid, String prdName) { 606 + public void sellerSkupCreateOrderByBuyer(int sellerUid, SellerOrderGoods psog) {
599 try { 607 try {
600 executorService.execute(() -> { 608 executorService.execute(() -> {
  609 + String prdName = psog.getProductName();
  610 + String sizeName = psog.getSizeName();
  611 + Product product = productMapper.selectByPrimaryKey(psog.getProductId());
  612 + String productCode = product.getProductCode();
  613 +
601 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SELLED; 614 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SELLED;
602 - String params = buildParams(prdName); 615 + String params = buildParams(prdName,sizeName,productCode);
603 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 616 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
604 617
605 InBoxResponse resp = inBoxSDK.addInbox(req); 618 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -609,7 +622,7 @@ public class InBoxFacade { @@ -609,7 +622,7 @@ public class InBoxFacade {
609 622
610 } catch (Exception e) { 623 } catch (Exception e) {
611 logger.warn("InBoxFacade sellerSkupCreateOrderByBuyer error inbox msg, sellerUid {}, prdName {} ", 624 logger.warn("InBoxFacade sellerSkupCreateOrderByBuyer error inbox msg, sellerUid {}, prdName {} ",
612 - sellerUid, prdName, e); 625 + sellerUid, psog, e);
613 } 626 }
614 } 627 }
615 628
@@ -622,11 +635,13 @@ public class InBoxFacade { @@ -622,11 +635,13 @@ public class InBoxFacade {
622 String sizeName = sog.getSizeName(); 635 String sizeName = sog.getSizeName();
623 try { 636 try {
624 executorService.execute(() -> { 637 executorService.execute(() -> {
  638 + Product product = productMapper.selectByPrimaryKey(sog.getProductId());
  639 + String productCode = product.getProductCode();
625 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_MINI_FAULT_UN_ACCEPT; 640 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_MINI_FAULT_UN_ACCEPT;
626 if(outTimeFlag){ 641 if(outTimeFlag){
627 ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME; 642 ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME;
628 } 643 }
629 - String params = buildParams(prdName, sizeName); 644 + String params = buildParams(prdName, sizeName,productCode);
630 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 645 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
631 646
632 InBoxResponse resp = inBoxSDK.addInbox(req); 647 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -644,7 +659,7 @@ public class InBoxFacade { @@ -644,7 +659,7 @@ public class InBoxFacade {
644 if(outTimeFlag){ 659 if(outTimeFlag){
645 sms = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME; 660 sms = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME;
646 } 661 }
647 - String content = getReplacedContent(sms.getContent(),prdName,orderCode); 662 + String content = getReplacedContent(sms.getContent(),prdName,sizeName,productCode,orderCode);
648 sendSmsService.smsSendByMobile(content, mobileList); 663 sendSmsService.smsSendByMobile(content, mobileList);
649 logger.info("record sellerMiniFaultUnAccept inbox sms msg,sellerUid {}, prdName {},orderCode {}", 664 logger.info("record sellerMiniFaultUnAccept inbox sms msg,sellerUid {}, prdName {},orderCode {}",
650 sellerUid, prdName,orderCode); 665 sellerUid, prdName,orderCode);
@@ -665,8 +680,10 @@ public class InBoxFacade { @@ -665,8 +680,10 @@ public class InBoxFacade {
665 String sizeName = sog.getSizeName(); 680 String sizeName = sog.getSizeName();
666 try { 681 try {
667 executorService.execute(() -> { 682 executorService.execute(() -> {
  683 + Product product = productMapper.selectByPrimaryKey(sog.getProductId());
  684 + String productCode = product.getProductCode();
668 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_QUALITY_CHECK_REJECT; 685 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_QUALITY_CHECK_REJECT;
669 - String params = buildParams(prdName, sizeName); 686 + String params = buildParams(prdName, sizeName,productCode);
670 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 687 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
671 688
672 InBoxResponse resp = inBoxSDK.addInbox(req); 689 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -680,7 +697,7 @@ public class InBoxFacade { @@ -680,7 +697,7 @@ public class InBoxFacade {
680 return; 697 return;
681 } 698 }
682 List<String> mobileList = Arrays.asList(phone); 699 List<String> mobileList = Arrays.asList(phone);
683 - String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_QUALITY_CHECK_REJECT.getContent(),prdName,orderCode); 700 + String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_QUALITY_CHECK_REJECT.getContent(),prdName,sizeName,productCode,orderCode);
684 sendSmsService.smsSendByMobile(content, mobileList); 701 sendSmsService.smsSendByMobile(content, mobileList);
685 logger.info("record sellerQualityCheckNotPass inbox sms msg,sellerUid {}, prdName {},orderCode {}", 702 logger.info("record sellerQualityCheckNotPass inbox sms msg,sellerUid {}, prdName {},orderCode {}",
686 sellerUid, prdName,orderCode); 703 sellerUid, prdName,orderCode);
@@ -700,8 +717,10 @@ public class InBoxFacade { @@ -700,8 +717,10 @@ public class InBoxFacade {
700 String sizeName = sog.getSizeName(); 717 String sizeName = sog.getSizeName();
701 try { 718 try {
702 executorService.execute(() -> { 719 executorService.execute(() -> {
  720 + Product product = productMapper.selectByPrimaryKey(sog.getProductId());
  721 + String productCode = product.getProductCode();
703 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_EXPRESS_QUALITY_CHECK_REJECT; 722 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_EXPRESS_QUALITY_CHECK_REJECT;
704 - String params = buildParams(prdName, sizeName); 723 + String params = buildParams(prdName, sizeName,productCode);
705 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 724 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
706 725
707 InBoxResponse resp = inBoxSDK.addInbox(req); 726 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -721,7 +740,7 @@ public class InBoxFacade { @@ -721,7 +740,7 @@ public class InBoxFacade {
721 }else if(type==3){ 740 }else if(type==3){
722 sms = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_EXPRESS_MINI_FAULT_UN_ACCEPT_OUT_TIME; 741 sms = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_EXPRESS_MINI_FAULT_UN_ACCEPT_OUT_TIME;
723 } 742 }
724 - String content = getReplacedContent(sms.getContent(),prdName,orderCode,wayBillCode); 743 + String content = getReplacedContent(sms.getContent(),prdName,sizeName,productCode,orderCode,wayBillCode);
725 sendSmsService.smsSendByMobile(content, mobileList); 744 sendSmsService.smsSendByMobile(content, mobileList);
726 logger.info("record sellerQualityCheckNotPass_send_back inbox sms msg,sellerUid {}, prdName {},type {},orderCode {}", 745 logger.info("record sellerQualityCheckNotPass_send_back inbox sms msg,sellerUid {}, prdName {},type {},orderCode {}",
727 sellerUid, prdName,type,orderCode); 746 sellerUid, prdName,type,orderCode);
@@ -745,9 +764,11 @@ public class InBoxFacade { @@ -745,9 +764,11 @@ public class InBoxFacade {
745 String sizeName = sog.getSizeName(); 764 String sizeName = sog.getSizeName();
746 try { 765 try {
747 executorService.execute(() -> { 766 executorService.execute(() -> {
  767 + Product product = productMapper.selectByPrimaryKey(sog.getProductId());
  768 + String productCode = product.getProductCode();
748 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SEND; 769 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SEND;
749 String timelimitDesc = new StringBuilder().append(deliveryTimeLimit).append(unit).toString(); 770 String timelimitDesc = new StringBuilder().append(deliveryTimeLimit).append(unit).toString();
750 - String params = buildParams(prdName, sizeName, timelimitDesc); 771 + String params = buildParams(prdName, sizeName,productCode, timelimitDesc);
751 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 772 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
752 773
753 InBoxResponse resp = inBoxSDK.addInbox(req); 774 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -762,7 +783,7 @@ public class InBoxFacade { @@ -762,7 +783,7 @@ public class InBoxFacade {
762 return; 783 return;
763 } 784 }
764 List<String> mobileList = Arrays.asList(phone); 785 List<String> mobileList = Arrays.asList(phone);
765 - String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),prdName,orderCode,timelimitDesc); 786 + String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),prdName,orderCode,productCode,timelimitDesc);
766 sendSmsService.smsSendByMobile(content, mobileList); 787 sendSmsService.smsSendByMobile(content, mobileList);
767 logger.info("record sellerSkupPaidByBuyer inbox sms msg,sellerUid {}, prdName {},orderCode {} timelimitDesc {}", 788 logger.info("record sellerSkupPaidByBuyer inbox sms msg,sellerUid {}, prdName {},orderCode {} timelimitDesc {}",
768 sellerUid, prdName,orderCode, timelimitDesc); 789 sellerUid, prdName,orderCode, timelimitDesc);
@@ -785,9 +806,11 @@ public class InBoxFacade { @@ -785,9 +806,11 @@ public class InBoxFacade {
785 String sizeName = sog.getSizeName(); 806 String sizeName = sog.getSizeName();
786 try { 807 try {
787 808
  809 + Product product = productMapper.selectByPrimaryKey(sog.getProductId());
  810 + String productCode = product.getProductCode();
788 executorService.execute(() -> { 811 executorService.execute(() -> {
789 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_CLOSED_SELLER; 812 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_CLOSED_SELLER;
790 - String params = buildParams(prdName, sizeName); 813 + String params = buildParams(prdName, sizeName,productCode);
791 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 814 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
792 815
793 InBoxResponse resp = inBoxSDK.addInbox(req); 816 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -851,8 +874,10 @@ public class InBoxFacade { @@ -851,8 +874,10 @@ public class InBoxFacade {
851 String sizeName = sog.getSizeName(); 874 String sizeName = sog.getSizeName();
852 try { 875 try {
853 executorService.execute(() -> { 876 executorService.execute(() -> {
  877 + Product product = productMapper.selectByPrimaryKey(sog.getProductId());
  878 + String productCode = product.getProductCode();
854 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_CLOSED_PLATFORM; 879 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_CLOSED_PLATFORM;
855 - String params = buildParams(prdName, sizeName); 880 + String params = buildParams(prdName, sizeName,productCode);
856 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 881 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
857 882
858 InBoxResponse resp = inBoxSDK.addInbox(req); 883 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -867,7 +892,7 @@ public class InBoxFacade { @@ -867,7 +892,7 @@ public class InBoxFacade {
867 return; 892 return;
868 } 893 }
869 List<String> mobileList = Arrays.asList(phone); 894 List<String> mobileList = Arrays.asList(phone);
870 - String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_CLOSED_PLATFORM.getContent(),prdName,orderCode,wayBillCode); 895 + String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_CLOSED_PLATFORM.getContent(),prdName,sizeName,productCode,orderCode,wayBillCode);
871 sendSmsService.smsSendByMobile(content, mobileList); 896 sendSmsService.smsSendByMobile(content, mobileList);
872 logger.info("record noticeSellerWhenAppraiseFail sms send,sellerUid {}, prdName {},orderCode {},wayBillCode {} ", 897 logger.info("record noticeSellerWhenAppraiseFail sms send,sellerUid {}, prdName {},orderCode {},wayBillCode {} ",
873 sellerUid, prdName,orderCode,wayBillCode); 898 sellerUid, prdName,orderCode,wayBillCode);
@@ -885,13 +910,16 @@ public class InBoxFacade { @@ -885,13 +910,16 @@ public class InBoxFacade {
885 * 商品下架提醒， 910 * 商品下架提醒，
886 * 911 *
887 * @param sellerUid 912 * @param sellerUid
888 - * @param prdName  
889 */ 913 */
890 - public void notifyUnshelfCauseBySpecialReason(int sellerUid, String prdName) { 914 + public void notifyUnshelfCauseBySpecialReason(int sellerUid,SellerOrderGoods psog ) {
891 try { 915 try {
892 executorService.execute(() -> { 916 executorService.execute(() -> {
  917 + String prdName = psog.getProductName();
  918 + String sizeName = psog.getSizeName();
  919 + Product product = productMapper.selectByPrimaryKey(psog.getProductId());
  920 + String productCode = product.getProductCode();
893 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_NOTIFIED_UNSHELF; 921 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_NOTIFIED_UNSHELF;
894 - String params = buildParams(prdName); 922 + String params = buildParams(prdName,sizeName,productCode);
895 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt); 923 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
896 924
897 InBoxResponse resp = inBoxSDK.addInbox(req); 925 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -905,17 +933,15 @@ public class InBoxFacade { @@ -905,17 +933,15 @@ public class InBoxFacade {
905 return; 933 return;
906 } 934 }
907 List<String> mobileList = Arrays.asList(phone); 935 List<String> mobileList = Arrays.asList(phone);
908 - //SmsContentEnum smsIbt = SmsContentEnum.SMS_NOTIFIED_UNSHELF;  
909 - //String content = smsIbt.getReplacedContent(prdName);  
910 - String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_UNSHELF.getContent(),prdName); 936 + String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_UNSHELF.getContent(),prdName,sizeName,productCode);
911 sendSmsService.smsSendByMobile(content, mobileList); 937 sendSmsService.smsSendByMobile(content, mobileList);
912 logger.info("record notifyUnshelfCauseBySpecialReason inbox sms msg,sellerUid {}, prdName {}, resp {}", 938 logger.info("record notifyUnshelfCauseBySpecialReason inbox sms msg,sellerUid {}, prdName {}, resp {}",
913 sellerUid, prdName); 939 sellerUid, prdName);
914 }); 940 });
915 941
916 } catch (Exception e) { 942 } catch (Exception e) {
917 - logger.warn("InBoxFacade notifyUnshelfCauseBySpecialReason error inbox msg, sellerUid {}, prdName {} ",  
918 - sellerUid, prdName, e); 943 + logger.warn("InBoxFacade notifyUnshelfCauseBySpecialReason error inbox msg, sellerUid {}, psog {} ",
  944 + sellerUid, psog, e);
919 } 945 }
920 } 946 }
921 947
@@ -1017,7 +1043,9 @@ public class InBoxFacade { @@ -1017,7 +1043,9 @@ public class InBoxFacade {
1017 executorService.execute(() -> { 1043 executorService.execute(() -> {
1018 // 发站内信 1044 // 发站内信
1019 logger.info("record seller sham send out inbox sms msg for seller,sellerUid {}, prdName {}", sellerUid, prdName); 1045 logger.info("record seller sham send out inbox sms msg for seller,sellerUid {}, prdName {}", sellerUid, prdName);
1020 - String params = buildParams(prdName, sizeName); 1046 + Product product = productMapper.selectByPrimaryKey(sog.getProductId());
  1047 + String productCode = product.getProductCode();
  1048 + String params = buildParams(prdName, sizeName,productCode);
1021 InboxReqVO req = buildInboxReqVO(sellerUid, params, InboxBusinessTypeEnum.NOTICE_SELLER_SELLER_SHAM_SEND_OUT); 1049 InboxReqVO req = buildInboxReqVO(sellerUid, params, InboxBusinessTypeEnum.NOTICE_SELLER_SELLER_SHAM_SEND_OUT);
1022 InBoxResponse resp = inBoxSDK.addInbox(req); 1050 InBoxResponse resp = inBoxSDK.addInbox(req);
1023 logger.info("record seller sham send out inbox msg,sellerUid {}, prdName {},sizeName {} resp {}", 1051 logger.info("record seller sham send out inbox msg,sellerUid {}, prdName {},sizeName {} resp {}",
@@ -1029,7 +1057,7 @@ public class InBoxFacade { @@ -1029,7 +1057,7 @@ public class InBoxFacade {
1029 return; 1057 return;
1030 } 1058 }
1031 List<String> mobileList = Arrays.asList(phone); 1059 List<String> mobileList = Arrays.asList(phone);
1032 - String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_SELLER_SHAM_SEND_OUT.getContent(),prdName,orderCode); 1060 + String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_SELLER_SHAM_SEND_OUT.getContent(),prdName,sizeName,productCode);
1033 sendSmsService.smsSendByMobile(content, mobileList); 1061 sendSmsService.smsSendByMobile(content, mobileList);
1034 logger.info("seller sham send out msg,sellerUid {}, prdName {}", sellerUid, prdName); 1062 logger.info("seller sham send out msg,sellerUid {}, prdName {}", sellerUid, prdName);
1035 }); 1063 });
@@ -1098,17 +1126,19 @@ public class InBoxFacade { @@ -1098,17 +1126,19 @@ public class InBoxFacade {
1098 InboxBusinessTypeEnum smsInboxBusinessTypeEnum; 1126 InboxBusinessTypeEnum smsInboxBusinessTypeEnum;
1099 String params ; 1127 String params ;
1100 String content; 1128 String content;
  1129 + Product product = productMapper.selectByPrimaryKey(sog.getProductId());
  1130 + String productCode = product.getProductCode();
1101 try { 1131 try {
1102 if (times == 2) { 1132 if (times == 2) {
1103 - params = buildParams(prdName, sizeName, leftTime, timeUnit); 1133 + params = buildParams(prdName, sizeName,productCode, leftTime, timeUnit);
1104 ibt = InboxBusinessTypeEnum.NOTICE_SELLER_DELIVER_GOODS; 1134 ibt = InboxBusinessTypeEnum.NOTICE_SELLER_DELIVER_GOODS;
1105 smsInboxBusinessTypeEnum = InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_SECOND; 1135 smsInboxBusinessTypeEnum = InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_SECOND;
1106 - content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),prdName,leftTime,timeUnit,orderCode); 1136 + content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),prdName,sizeName,productCode,leftTime,timeUnit,orderCode);
1107 } else if (times == 3) { 1137 } else if (times == 3) {
1108 - params = buildParams(prdName, sizeName); 1138 + params = buildParams(prdName, sizeName,productCode);
1109 ibt = InboxBusinessTypeEnum.NOTICE_SELLER_DELIVER_GOODS_FAIL; 1139 ibt = InboxBusinessTypeEnum.NOTICE_SELLER_DELIVER_GOODS_FAIL;
1110 smsInboxBusinessTypeEnum = InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_FAILED; 1140 smsInboxBusinessTypeEnum = InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_FAILED;
1111 - content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),prdName,orderCode); 1141 + content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),prdName,sizeName,productCode,orderCode);
1112 } else { 1142 } else {
1113 return; 1143 return;
1114 } 1144 }
@@ -1144,6 +1174,9 @@ public class InBoxFacade { @@ -1144,6 +1174,9 @@ public class InBoxFacade {
1144 String sizeName = sog.getSizeName(); 1174 String sizeName = sog.getSizeName();
1145 try { 1175 try {
1146 executorService.execute(()->{ 1176 executorService.execute(()->{
  1177 + Product product = productMapper.selectByPrimaryKey(sog.getProductId());
  1178 + String productCode = product.getProductCode();
  1179 +
1147 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.PURCHASE_CLOSED_BY_BUYER_AFTER_DELIVERY; 1180 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.PURCHASE_CLOSED_BY_BUYER_AFTER_DELIVERY;
1148 String params = buildParams(orderCode,compesant); 1181 String params = buildParams(orderCode,compesant);
1149 InboxReqVO req = buildInboxReqVO(buyerUid, params, ibt); 1182 InboxReqVO req = buildInboxReqVO(buyerUid, params, ibt);
@@ -1153,7 +1186,7 @@ public class InBoxFacade { @@ -1153,7 +1186,7 @@ public class InBoxFacade {
1153 buyerUid, orderCode,prdName, resp); 1186 buyerUid, orderCode,prdName, resp);
1154 //seller 1187 //seller
1155 InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_BY_BUYER_AFTER_DELIVERY; 1188 InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_BY_BUYER_AFTER_DELIVERY;
1156 - String paramsOfSeller = buildParams(prdName, sizeName); 1189 + String paramsOfSeller = buildParams(prdName, sizeName,productCode);
1157 InboxReqVO reqOfSeller = buildInboxReqVO(sellerUid, paramsOfSeller, ibtOfSeller); 1190 InboxReqVO reqOfSeller = buildInboxReqVO(sellerUid, paramsOfSeller, ibtOfSeller);
1158 InBoxResponse respOfSeller = inBoxSDK.addInbox(reqOfSeller); 1191 InBoxResponse respOfSeller = inBoxSDK.addInbox(reqOfSeller);
1159 logger.info("record buyerCancelBeforeDepotReceive to seller inbox msg, sellerUid {}, orderCode {},prdName {} resp {}", 1192 logger.info("record buyerCancelBeforeDepotReceive to seller inbox msg, sellerUid {}, orderCode {},prdName {} resp {}",