ufo / yohoufo-fore · Commits

Go to a project

Authored by qinchao
Commit 94f468ad44e7f74b71b9a7ebb6e4eeaefabdcbe6 1 parent 6eab1311

加货号

Inline Side-by-side
Showing 2 changed files with 19 additions and 9 deletions
@@ -583,7 +583,7 @@ public class AppraiseService { @@ -583,7 +583,7 @@ public class AppraiseService {
583 orderStatusFlowService.addAsy(buyerOrder.getOrderCode(), targetStatus.getCode()); 583 orderStatusFlowService.addAsy(buyerOrder.getOrderCode(), targetStatus.getCode());
584 584
585 //瑕疵不接受（用户不接受和超时不接受），只给买家发消息 585 //瑕疵不接受（用户不接受和超时不接受），只给买家发消息
586 - inBoxFacade.buyerMiniFaultUnAccept(buyerUid,buyerOrder.getOrderCode(), sellerOrderGoods.getProductName(),outTimeFlag); 586 + inBoxFacade.buyerMiniFaultUnAccept(buyerUid,buyerOrder.getOrderCode(), sellerOrderGoods,outTimeFlag);
587 inBoxFacade.sellerMiniFaultUnAccept(sellerOrderGoods,orderCode,outTimeFlag); 587 inBoxFacade.sellerMiniFaultUnAccept(sellerOrderGoods,orderCode,outTimeFlag);
588 588
589 }catch(Exception ex) { 589 }catch(Exception ex) {
@@ -1003,7 +1003,7 @@ public class AppraiseService { @@ -1003,7 +1003,7 @@ public class AppraiseService {
1003 orderStatusFlowService.addAsy(buyerOrder.getOrderCode(), targetStatus.getCode()); 1003 orderStatusFlowService.addAsy(buyerOrder.getOrderCode(), targetStatus.getCode());
1004 1004
1005 //鉴定不通过 1005 //鉴定不通过
1006 - inBoxFacade.noticeBuyerWhenQualityCheckNotPass(buyerUid, buyerOrder.getOrderCode(), sellerOrderGoods.getProductName()); 1006 + inBoxFacade.noticeBuyerWhenQualityCheckNotPass(buyerUid, buyerOrder.getOrderCode(), sellerOrderGoods);
1007 inBoxFacade.sellerQualityCheckNotPass(sellerOrderGoods,orderCode); 1007 inBoxFacade.sellerQualityCheckNotPass(sellerOrderGoods,orderCode);
1008 1008
1009 }catch(Exception ex) { 1009 }catch(Exception ex) {
@@ -1090,7 +1090,7 @@ public class AppraiseService { @@ -1090,7 +1090,7 @@ public class AppraiseService {
1090 orderStatusFlowService.addAsy(buyerOrder.getOrderCode(), targetStatus.getCode()); 1090 orderStatusFlowService.addAsy(buyerOrder.getOrderCode(), targetStatus.getCode());
1091 1091
1092 //质检不通过 1092 //质检不通过
1093 - inBoxFacade.noticeBuyerWhenQualityCheckNotPass(buyerUid, buyerOrder.getOrderCode(), sellerOrderGoods.getProductName()); 1093 + inBoxFacade.noticeBuyerWhenQualityCheckNotPass(buyerUid, buyerOrder.getOrderCode(), sellerOrderGoods);
1094 inBoxFacade.sellerQualityCheckNotPass(sellerOrderGoods,orderCode); 1094 inBoxFacade.sellerQualityCheckNotPass(sellerOrderGoods,orderCode);
1095 1095
1096 }catch(Exception ex) { 1096 }catch(Exception ex) {
@@ -399,9 +399,11 @@ public class InBoxFacade { @@ -399,9 +399,11 @@ public class InBoxFacade {
399 /** 399 /**
400 * 质检未通过，买家 400 * 质检未通过，买家
401 */ 401 */
402 - public void noticeBuyerWhenQualityCheckNotPass(int buyerUid, long orderCode,String prdName) { 402 + public void noticeBuyerWhenQualityCheckNotPass(int buyerUid, long orderCode,SellerOrderGoods sellerOrderGoods) {
403 try { 403 try {
404 executorService.execute(() -> { 404 executorService.execute(() -> {
  405 + String prdName = sellerOrderGoods.getProductName();
  406 + String sizeName = sellerOrderGoods.getSizeName();
405 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_QUALITY_NOT_PASS; 407 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_QUALITY_NOT_PASS;
406 String params = buildParams(orderCode); 408 String params = buildParams(orderCode);
407 InboxReqVO req = buildInboxReqVO(buyerUid, params, ibt); 409 InboxReqVO req = buildInboxReqVO(buyerUid, params, ibt);
@@ -416,8 +418,11 @@ public class InBoxFacade { @@ -416,8 +418,11 @@ public class InBoxFacade {
416 logger.warn("in noticeBuyerWhenQualityCheckNotPass sms fail, buyerUid {} orderCode {} ,prdName {}", buyerUid, orderCode,prdName); 418 logger.warn("in noticeBuyerWhenQualityCheckNotPass sms fail, buyerUid {} orderCode {} ,prdName {}", buyerUid, orderCode,prdName);
417 return; 419 return;
418 } 420 }
  421 + Product product = productMapper.selectByPrimaryKey(sellerOrderGoods.getProductId());
  422 + String productCode = product.getProductCode();
  423 +
419 List<String> mobileList = Arrays.asList(phone); 424 List<String> mobileList = Arrays.asList(phone);
420 - String content=getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_QUALITY_NOT_PASS.getContent(),prdName,orderCode); 425 + String content=getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_QUALITY_NOT_PASS.getContent(),prdName,sizeName,productCode,orderCode);
421 426
422 sendSmsService.smsSendByMobile(content,mobileList); 427 sendSmsService.smsSendByMobile(content,mobileList);
423 logger.info("record noticeBuyerWhenQualityCheckNotPass inbox sms msg, buyerUid {}, orderCode {}, prdName {}", 428 logger.info("record noticeBuyerWhenQualityCheckNotPass inbox sms msg, buyerUid {}, orderCode {}, prdName {}",
@@ -425,7 +430,7 @@ public class InBoxFacade { @@ -425,7 +430,7 @@ public class InBoxFacade {
425 }); 430 });
426 } catch (Exception e) { 431 } catch (Exception e) {
427 logger.warn("InBoxFacade noticeBuyerWhenQualityCheckNotPass error inbox msg, buyerUid {}, orderCode {} ,prdName {}", 432 logger.warn("InBoxFacade noticeBuyerWhenQualityCheckNotPass error inbox msg, buyerUid {}, orderCode {} ,prdName {}",
428 - buyerUid, orderCode,prdName, e); 433 + buyerUid, orderCode,sellerOrderGoods, e);
429 } 434 }
430 } 435 }
431 436
@@ -470,10 +475,12 @@ public class InBoxFacade { @@ -470,10 +475,12 @@ public class InBoxFacade {
470 /** 475 /**
471 * 不接受瑕疵，给买家消息 476 * 不接受瑕疵，给买家消息
472 */ 477 */
473 - public void buyerMiniFaultUnAccept(int buyerUid, long orderCode,String prdName,boolean outTimeFlag) { 478 + public void buyerMiniFaultUnAccept(int buyerUid, long orderCode,SellerOrderGoods sellerOrderGoods,boolean outTimeFlag) {
474 479
475 try { 480 try {
476 executorService.execute(() -> { 481 executorService.execute(() -> {
  482 + String prdName = sellerOrderGoods.getProductName();
  483 + String sizeName =sellerOrderGoods.getSizeName();
477 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT; 484 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT;
478 if(outTimeFlag){ 485 if(outTimeFlag){
479 ibt = InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME; 486 ibt = InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME;
@@ -491,12 +498,15 @@ public class InBoxFacade { @@ -491,12 +498,15 @@ public class InBoxFacade {
491 logger.warn("buyerQualityCheckNotPass sms send fail,buyerUid {} ,orderCode {}", buyerUid, orderCode); 498 logger.warn("buyerQualityCheckNotPass sms send fail,buyerUid {} ,orderCode {}", buyerUid, orderCode);
492 return; 499 return;
493 } 500 }
  501 + Product product = productMapper.selectByPrimaryKey(sellerOrderGoods.getProductId());
  502 + String productCode = product.getProductCode();
  503 +
494 List<String> mobileList = Arrays.asList(phone); 504 List<String> mobileList = Arrays.asList(phone);
495 InboxBusinessTypeEnum sms = InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT; 505 InboxBusinessTypeEnum sms = InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT;
496 if(outTimeFlag){ 506 if(outTimeFlag){
497 sms = InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME; 507 sms = InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME;
498 } 508 }
499 - String content = getReplacedContent(sms.getContent(),prdName,orderCode); 509 + String content = getReplacedContent(sms.getContent(),prdName,sizeName,productCode,orderCode);
500 sendSmsService.smsSendByMobile(content, mobileList); 510 sendSmsService.smsSendByMobile(content, mobileList);
501 logger.info("record buyerQualityCheckNotPass inbox sms msg,buyerUid {}, prdName {},orderCode {}", 511 logger.info("record buyerQualityCheckNotPass inbox sms msg,buyerUid {}, prdName {},orderCode {}",
502 buyerUid , prdName,orderCode); 512 buyerUid , prdName,orderCode);
@@ -504,7 +514,7 @@ public class InBoxFacade { @@ -504,7 +514,7 @@ public class InBoxFacade {
504 514
505 } catch (Exception e) { 515 } catch (Exception e) {
506 logger.warn("InBoxFacade sellerSkupPaidByBuyer error inbox msg, buyerUid {},orderCode {}, prdName {} ", 516 logger.warn("InBoxFacade sellerSkupPaidByBuyer error inbox msg, buyerUid {},orderCode {}, prdName {} ",
507 - buyerUid, orderCode ,prdName, e); 517 + buyerUid, orderCode ,sellerOrderGoods, e);
508 } 518 }
509 } 519 }
510 520