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