|
@@ -1822,34 +1822,34 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (count == 1) {
|
|
|
- try {
|
|
|
- //发货短信推送(取消推送)
|
|
|
- CmUser user = cmUserDao.get(order.getUserID().toString());
|
|
|
- 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)) {
|
|
|
- //部分发货
|
|
|
- String shortLink = getShortLink(8, 7, wwwServer + "user/order/detail.html?orderId=" + order.getOrderID());
|
|
|
- String content = "您的订单(订单编号:" + order.getOrderNo() + ")已部分发货。您可关注采美公众号或者访问采美微信小程序和网站查看订单。平台公众号:微信搜索“采美365网”; " +
|
|
|
- "微信小程序:微信搜索“采美采购商城”;网址:www.caimei365.com/t/" + shortLink;
|
|
|
- sendSms = getSendSms(7, user.getBindMobile(), content);
|
|
|
- } else if ("3".equals(order.getSendOutStatus())) {
|
|
|
- //已发货
|
|
|
- String shortLink = getShortLink(8, 8, wwwServer + "user/order/detail.html?orderId=" + order.getOrderID());
|
|
|
- String content = "您的订单(订单编号:" + order.getOrderNo() + ")已发货完毕。您可关注采美公众号或者访问采美微信小程序和网站查看订单。平台公众号:微信搜索“采美365网”; " +
|
|
|
- "微信小程序:微信搜索“采美采购商城”;网址:www.caimei365.com/t/" + shortLink;
|
|
|
- sendSms = getSendSms(8, user.getBindMobile(), content);
|
|
|
- }
|
|
|
- if (!sendSms) {
|
|
|
- logger.info("发货短信推送失败,订单id>>>>" + order.getOrderID());
|
|
|
- }
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- }
|
|
|
+// if (count == 1) {
|
|
|
+// try {
|
|
|
+// //发货短信推送(取消推送)
|
|
|
+// CmUser user = cmUserDao.get(order.getUserID().toString());
|
|
|
+// 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)) {
|
|
|
+// //部分发货
|
|
|
+// String shortLink = getShortLink(8, 7, wwwServer + "user/order/detail.html?orderId=" + order.getOrderID());
|
|
|
+// String content = "您的订单(订单编号:" + order.getOrderNo() + ")已部分发货。您可关注采美公众号或者访问采美微信小程序和网站查看订单。平台公众号:微信搜索“采美365网”; " +
|
|
|
+// "微信小程序:微信搜索“采美采购商城”;网址:www.caimei365.com/t/" + shortLink;
|
|
|
+// sendSms = getSendSms(7, user.getBindMobile(), content);
|
|
|
+// } else if ("3".equals(order.getSendOutStatus())) {
|
|
|
+// //已发货
|
|
|
+// String shortLink = getShortLink(8, 8, wwwServer + "user/order/detail.html?orderId=" + order.getOrderID());
|
|
|
+// String content = "您的订单(订单编号:" + order.getOrderNo() + ")已发货完毕。您可关注采美公众号或者访问采美微信小程序和网站查看订单。平台公众号:微信搜索“采美365网”; " +
|
|
|
+// "微信小程序:微信搜索“采美采购商城”;网址:www.caimei365.com/t/" + shortLink;
|
|
|
+// sendSms = getSendSms(8, user.getBindMobile(), content);
|
|
|
+// }
|
|
|
+// if (!sendSms) {
|
|
|
+// logger.info("发货短信推送失败,订单id>>>>" + order.getOrderID());
|
|
|
+// }
|
|
|
+// }
|
|
|
+// } catch (Exception e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// }
|
|
|
+// }
|
|
|
return lb.getId();
|
|
|
}
|
|
|
|