卖家消息,区分现货等类型

qinchao
Commit e43d29b3a9d8c50451b01e00a9c02b50e4aefcf7 1 parent 2a2a5009
Showing 1 changed file with 27 additions and 19 deletions
order/src/main/java/com/yohoufo/order/service/proxy/InBoxFacade.java
--- a/order/src/main/java/com/yohoufo/order/service/proxy/InBoxFacade.java
View file @e43d29b
+++ b/order/src/main/java/com/yohoufo/order/service/proxy/InBoxFacade.java
View file @e43d29b
@@ -631,13 +631,14 @@ public class InBoxFacade {
     public void sellerPlaySelf(int sellerUid,SellerOrderGoods sellerOrderGoods) {
         try {
             executorService.execute(() -> {
+                String skupTypeText=SkupType.getSkupType(sellerOrderGoods.getAttributes()).attrName();
                 String prdName = sellerOrderGoods.getProductName();
                 String sizeName = sellerOrderGoods.getSizeName();
                 Product product = productMapper.selectByPrimaryKey(sellerOrderGoods.getProductId());
                 String productCode = product.getProductCode();
                 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_UNSHELF;
-                String params = buildParams(prdName,sizeName,productCode);
+                String params = buildParams(skupTypeText,prdName,sizeName,productCode);
                 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
                 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -661,13 +662,14 @@ public class InBoxFacade {
     public void sellerSkupCreateOrderByBuyer(int sellerUid, SellerOrderGoods psog) {
         try {
             executorService.execute(() -> {
+                String skupTypeText=SkupType.getSkupType(psog.getAttributes()).attrName();
                 String prdName = psog.getProductName();
                 String sizeName = psog.getSizeName();
                 Product product = productMapper.selectByPrimaryKey(psog.getProductId());
                 String productCode = product.getProductCode();
                 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SELLED;
-                String params = buildParams(prdName,sizeName,productCode);
+                String params = buildParams(skupTypeText,prdName,sizeName,productCode);
                 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
                 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -819,11 +821,12 @@ public class InBoxFacade {
         String sizeName = sog.getSizeName();
         try {
             executorService.execute(() -> {
+                String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
                 Product product = productMapper.selectByPrimaryKey(sog.getProductId());
                 String productCode = product.getProductCode();
                 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SEND;
                 String timelimitDesc = new StringBuilder().append(deliveryTimeLimit).append(unit).toString();
-                String params = buildParams(prdName, sizeName,productCode, timelimitDesc);
+                String params = buildParams(skupTypeText,prdName, sizeName,productCode, timelimitDesc);
                 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
                 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -842,7 +845,7 @@ public class InBoxFacade {
                     return;
                 }
                 List<String> mobileList = Arrays.asList(phone);
-                String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),prdName,sizeName,productCode,orderCode,timelimitDesc);
+                String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode,timelimitDesc);
                 sendSmsService.smsSendByMobile(content, mobileList);
                 logger.info("record sellerSkupPaidByBuyer inbox sms msg,sellerUid {}, prdName {},orderCode {} timelimitDesc {}",
                         sellerUid, prdName,orderCode, timelimitDesc);
@@ -864,12 +867,12 @@ public class InBoxFacade {
         String prdName = sog.getProductName();
         String sizeName = sog.getSizeName();
         try {
-
+            executorService.execute(() -> {
                 Product product = productMapper.selectByPrimaryKey(sog.getProductId());
                 String productCode = product.getProductCode();
-            executorService.execute(() -> {
+                String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
                 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_CLOSED_SELLER;
-                String params = buildParams(prdName, sizeName,productCode);
+                String params = buildParams(skupTypeText,prdName, sizeName,productCode);
                 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
                 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -976,12 +979,13 @@ public class InBoxFacade {
     public void notifyUnshelfCauseBySpecialReason(int sellerUid,SellerOrderGoods psog ) {
         try {
             executorService.execute(() -> {
+                String skupTypeText=SkupType.getSkupType(psog.getAttributes()).attrName();
                 String prdName = psog.getProductName();
                 String sizeName = psog.getSizeName();
                 Product product = productMapper.selectByPrimaryKey(psog.getProductId());
                 String productCode = product.getProductCode();
                 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_NOTIFIED_UNSHELF;
-                String params = buildParams(prdName,sizeName,productCode);
+                String params = buildParams(skupTypeText,prdName,sizeName,productCode);
                 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
                 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -1000,7 +1004,7 @@ public class InBoxFacade {
                     return;
                 }
                 List<String> mobileList = Arrays.asList(phone);
-                String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_UNSHELF.getContent(),prdName,sizeName,productCode);
+                String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_UNSHELF.getContent(),skupTypeText,prdName,sizeName,productCode);
                 sendSmsService.smsSendByMobile(content, mobileList);
                 logger.info("record notifyUnshelfCauseBySpecialReason inbox sms msg,sellerUid {}, prdName {}, resp {}",
                         sellerUid, prdName);
@@ -1393,6 +1397,7 @@ public class InBoxFacade {
         Integer sellerUid = sog.getUid();
         String prdName = sog.getProductName();
         String sizeName = sog.getSizeName();
+        String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
         InboxBusinessTypeEnum ibt;
         InboxBusinessTypeEnum smsInboxBusinessTypeEnum;
         String params ;
@@ -1401,15 +1406,15 @@ public class InBoxFacade {
         String productCode = product.getProductCode();
         try {
             if (times == 2) {
-                params = buildParams(prdName, sizeName,productCode, leftTime, timeUnit);
+                params = buildParams(skupTypeText,prdName, sizeName,productCode, leftTime, timeUnit);
                 ibt = InboxBusinessTypeEnum.NOTICE_SELLER_DELIVER_GOODS;
                 smsInboxBusinessTypeEnum = InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_SECOND;
-                content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),prdName,sizeName,productCode,leftTime,timeUnit,orderCode);
+                content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),skupTypeText,prdName,sizeName,productCode,leftTime,timeUnit,orderCode);
             } else if (times == 3) {
-                params = buildParams(prdName, sizeName,productCode);
+                params = buildParams(skupTypeText,prdName, sizeName,productCode);
                 ibt = InboxBusinessTypeEnum.NOTICE_SELLER_DELIVER_GOODS_FAIL;
                 smsInboxBusinessTypeEnum = InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_FAILED;
-                content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),prdName,sizeName,productCode,orderCode);
+                content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
             } else {
                 return;
             }
@@ -1486,6 +1491,7 @@ public class InBoxFacade {
         Integer sellerUid = sog.getUid();
         String prdName = sog.getProductName();
         String sizeName = sog.getSizeName();
+        String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
         try {
             executorService.execute(()->{
                 Product product = productMapper.selectByPrimaryKey(sog.getProductId());
@@ -1500,7 +1506,7 @@ public class InBoxFacade {
                         buyerUid, orderCode,prdName, resp);
                 //seller
                 InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_BY_BUYER_AFTER_DELIVERY;
-                String paramsOfSeller = buildParams(prdName, sizeName,productCode);
+                String paramsOfSeller = buildParams(skupTypeText,prdName, sizeName,productCode);
                 InboxReqVO reqOfSeller = buildInboxReqVO(sellerUid, paramsOfSeller, ibtOfSeller);
                 InBoxResponse respOfSeller = inBoxSDK.addInbox(reqOfSeller);
                 logger.info("record buyerCancelBeforeDepotReceive to seller inbox msg, sellerUid {}, orderCode {},prdName {} resp {}",
@@ -1519,7 +1525,7 @@ public class InBoxFacade {
                 }
                 List<String> mobileList = Arrays.asList(phone);
-                String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_DELIVERY.getContent(),orderCode);
+                String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_DELIVERY.getContent(),skupTypeText,prdName, sizeName,productCode,orderCode);
                 sendSmsService.smsSendByMobile(content,mobileList);
                 logger.info("record buyerCancelBeforeDepotReceive inbox sms msg, sellerUid {}, orderCode {},prdName {}",
                         sellerUid, orderCode, prdName);
@@ -1544,12 +1550,13 @@ public class InBoxFacade {
             executorService.execute(()->{
                 Product product = productMapper.selectByPrimaryKey(sog.getProductId());
                 String productCode = product.getProductCode();
+                String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
                 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
                 if(autoReSell){
                     ibt = InboxBusinessTypeEnum.NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
                 }
-                String params = buildParams(prdName, sizeName,productCode);
+                String params = buildParams(skupTypeText,prdName, sizeName,productCode);
                 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
                 InBoxResponse resp = inBoxSDK.addInbox(req);
@@ -1573,7 +1580,7 @@ public class InBoxFacade {
                 if(autoReSell){
                     sms=InboxBusinessTypeEnum.SMS_NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
                 }
-                String content = replaceSMSContent(sms, orderCode, prdName,sizeName,productCode);
+                String content = replaceSMSContent(sms,skupTypeText, orderCode, prdName,sizeName,productCode);
                 sendSmsService.smsSendByMobile(content,mobileList);
                 logger.info("record noticeSellerWhenBuyerCancelNoResponsibility inbox sms msg, sellerUid {}, orderCode {},prdName {}",
                         sellerUid, orderCode, prdName);
@@ -1588,6 +1595,7 @@ public class InBoxFacade {
         Integer sellerUid = sog.getUid();
         String prdName = sog.getProductName();
         String sizeName = sog.getSizeName();
+        String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
         try {
             executorService.execute(()->{
                 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.PURCHASE_CLOSED_BY_BUYER_AFTER_PAID;
@@ -1604,7 +1612,7 @@ public class InBoxFacade {
                 if(autoReSellFlag){
                     ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_AUTO_RESELL_BY_BUYER_AFTER_PAID;
                 }
-                String paramsOfSeller = buildParams(prdName, sizeName,productCode);
+                String paramsOfSeller = buildParams(skupTypeText,prdName, sizeName,productCode);
                 InboxReqVO reqOfSeller = buildInboxReqVO(sellerUid, paramsOfSeller, ibtOfSeller);
                 InBoxResponse respOfSeller = inBoxSDK.addInbox(reqOfSeller);
                 logger.info("record buyerCancelBeforeSellerDeliver to seller inbox msg, sellerUid {}, orderCode {},prdName {} resp {}",
@@ -1627,7 +1635,7 @@ public class InBoxFacade {
                 if(autoReSellFlag){
                     sms=InboxBusinessTypeEnum.SMS_CANCELED_AUTO_RESELL_BY_BUYER_AFTER_PAID;
                 }
-                String content= getReplacedContent(sms.getContent(),orderCode,prdName,sizeName,productCode);
+                String content= getReplacedContent(sms.getContent(),skupTypeText,orderCode,prdName,sizeName,productCode);
                 sendSmsService.smsSendByMobile(content,mobileList);
                 logger.info("record buyerCancelBeforeSellerDeliver inbox sms msg, sellerUid {}, orderCode {},prdName {} ,sizeName {} ,productCode {}",
                         sellerUid, orderCode, prdName,sizeName,productCode);