添加下单成功短信

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -252,8 +252,10 @@ public class PackageNewClothes {
         }
         order.setLzgh(school.getLzgh());
         Integer insert = orderMapper.insert(order);
-        // MessageUtil.sent(contactNumber,"4","");
-
+        String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + id;
+        log.info("预制卡订单查询短信地址:" + url);
+        log.info("联系号码：" + contactNumber);
+        SendSmsAndMail.sendSms(contactNumber, url, "2");
         if (insert == 1) {
             appMapper.inserOrderHis(id, "资料已提交", date, customerName);
             if(StringUtils.isNotEmpty(isFromRh)){
@@ -383,7 +385,10 @@ public class PackageNewClothes {
         }
         order.setLzgh(school.getLzgh());
         Integer insert = orderMapper.insert(order);
-        // MessageUtil.sent(contactNumber,"4","");
+        String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + id;
+        log.info("天翼学生卡订单查询短信地址:" + url);
+        log.info("联系号码：" + contactNumber);
+        SendSmsAndMail.sendSms(contactNumber, url, "2");
         if (insert == 1) {
             appMapper.inserOrderHis(id, "资料已提交", date, customerName);
             if(StringUtils.isNotEmpty(isFromRh)){

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -4,7 +4,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -14,12 +13,12 @@ import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.util.IOUtils;
-import com.winsun.bean.*;
 import com.winsun.bean.Package;
+import com.winsun.bean.*;
 import com.winsun.constant.FilePath;
-import com.winsun.constant.OrderType;
 import com.winsun.mapper.*;
 import com.winsun.rabbitmq.RabbitProducer;
+import com.winsun.smsUtils.SendSmsAndMail;
 import com.winsun.utils.Constant;
 import com.winsun.utils.*;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +26,6 @@ import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpPost;
@@ -51,7 +49,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.net.ssl.SSLHandshakeException;
 import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
@@ -62,8 +59,6 @@ import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @Author: dongyp
@@ -1078,16 +1073,27 @@ public class OrderController extends BaseController {
             return ResponseData.error("导入异常！");
         }
         int number = 0;
-        Date successTime = new Date();
+        Date successTime = null;
         for (int i = 1; i < listMap.size(); i++) {
+            successTime = new Date();
             Map<String, Object> map = listMap.get(i);
             String orderNumber = map.get("a").toString();
             String sendType = map.get("b").toString();
             String company = null;
             String kuaidiOrder = null;
             String orderStatus = null;
-            String xbOrderId = orderMapper.selectxbOrderIdByOrderNumber(orderNumber);
-            if (StringUtils.isNotBlank(xbOrderId)) {
+            Order order = null;
+            Wrapper<Order> wrapper = new EntityWrapper<>();
+            wrapper.eq("order_number", orderNumber);
+            List<Order> orders = orderMapper.selectList(wrapper);
+            if (orders != null && orders.size() == 1) {
+                order = orders.get(0);
+            }else{
+                error.append("第" + (i + 1) + "行的更新失败,");
+                continue;
+            }
+
+            if (StringUtils.isNotBlank(order.getXbOrderId())) {
                 orderStatus = "待活体";
                 successTime = null;
             } else {
@@ -1096,6 +1102,12 @@ public class OrderController extends BaseController {
             if ("快递".equals(map.get("b").toString())) {
                 company = map.get("c").toString();
                 kuaidiOrder = map.get("d").toString();
+
+                String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + order.getId();
+                log.info("批量下单订单查询短信地址:" + url);
+                log.info("联系号码：" + order.getContactNumber());
+                // 发送短信
+                SendSmsAndMail.sendSms2(order.getContactNumber(), company, kuaidiOrder, "11");
             }
             Integer integer = null;
             if (StringUtils.isBlank(company) || StringUtils.isBlank(kuaidiOrder)) {
@@ -1110,6 +1122,8 @@ public class OrderController extends BaseController {
                 }else {
                     integer = orderMapper.updateOrderKDIsNotNullByTime(orderNumber, company, kuaidiOrder, sendType, orderStatus,successTime);
                 }
+
+
             }
             if (integer == 1) {
                 number++;
@@ -1905,6 +1919,9 @@ public class OrderController extends BaseController {
         order.setUpdateTime(new Date());
         appMapper.inserOrderHis(orderId, "快递公司："+company+"快递单号："+kuaidiOrder, new Date(), user.getName());
         orderMapper.update(order, wrapper);
+
+        // 发送短信
+        SendSmsAndMail.sendSms2(databaseOrder.getContactNumber(), company, kuaidiOrder, "11");
         return ResponseData.success();
     }
 }