Explorar o código

返佣订单不推送短信

plf %!s(int64=3) %!d(string=hai) anos
pai
achega
ed6333a6ae

+ 1 - 1
src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -620,7 +620,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             }
             }
             //退款短信推送
             //退款短信推送
             try {
             try {
-                if (user != null && StringUtils.isNotBlank(user.getBindMobile())) {
+                if (user != null && StringUtils.isNotBlank(user.getBindMobile()) && "0".equals(newOrder.getRebateFlag())) {
                     String wwwServer = Global.getConfig("wwwServer");
                     String wwwServer = Global.getConfig("wwwServer");
                     boolean sendSms = false;
                     boolean sendSms = false;
                     if ("1".equals(newOrder.getRefundType())) {
                     if ("1".equals(newOrder.getRefundType())) {

+ 3 - 3
src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -649,7 +649,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
 
 
             //下单短信推送
             //下单短信推送
             try {
             try {
-                if (flag) {
+                if (flag && "0".equals(newOrder.getRebateFlag())) {
                     CmUser user = cmUserDao.get(newOrder.getUserID().toString());
                     CmUser user = cmUserDao.get(newOrder.getUserID().toString());
                     if (user != null && StringUtils.isNotBlank(user.getBindMobile())) {
                     if (user != null && StringUtils.isNotBlank(user.getBindMobile())) {
                         String wwwServer = Global.getConfig("wwwServer");
                         String wwwServer = Global.getConfig("wwwServer");
@@ -1249,7 +1249,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         }
         }
         //取消订单短信推送
         //取消订单短信推送
         try {
         try {
-            if (user != null && StringUtils.isNotBlank(user.getBindMobile())) {
+            if (user != null && StringUtils.isNotBlank(user.getBindMobile()) && "0".equals(order.getRebateFlag())) {
                 String wwwServer = Global.getConfig("wwwServer");
                 String wwwServer = Global.getConfig("wwwServer");
                 String shortLink = getShortLink(8, 11, wwwServer + "user/order/detail.html?orderId=" + orderID);
                 String shortLink = getShortLink(8, 11, wwwServer + "user/order/detail.html?orderId=" + orderID);
                 String content = "您已成功取消订单(订单编号:" + order.getOrderNo() + "),订单金额¥" + order.getPayTotalFee() + "。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
                 String content = "您已成功取消订单(订单编号:" + order.getOrderNo() + "),订单金额¥" + order.getPayTotalFee() + "。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
@@ -1439,7 +1439,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         try {
         try {
             //发货短信推送
             //发货短信推送
             CmUser user = cmUserDao.get(order.getUserID().toString());
             CmUser user = cmUserDao.get(order.getUserID().toString());
-            if (user != null && StringUtils.isNotBlank(user.getBindMobile())) {
+            if (user != null && StringUtils.isNotBlank(user.getBindMobile()) && "0".equals(order.getRebateFlag())) {
                 String wwwServer = Global.getConfig("wwwServer");
                 String wwwServer = Global.getConfig("wwwServer");
                 boolean sendSms = false;
                 boolean sendSms = false;
                 if ("2".equals(order.getSendOutStatus()) && "1".equals(sendOutStatus)) {
                 if ("2".equals(order.getSendOutStatus()) && "1".equals(sendOutStatus)) {