宽带下单更新

apply-net/src/main/java/com/winsun/controller/SingleBroadToIntegrateController.java

@@ -349,11 +349,11 @@ public class SingleBroadToIntegrateController {
         if (toIntegrateOrderParam.getRhTime() == null || StringUtils.isBlank(toIntegrateOrderParam.getRhTime())) {
         if (toIntegrateOrderParam.getRhTime() == null || StringUtils.isBlank(toIntegrateOrderParam.getRhTime())) {
             Wrapper<Order> wrapper = new EntityWrapper<>();
             Wrapper<Order> wrapper = new EntityWrapper<>();
             wrapper.eq("id", uuid);
             wrapper.eq("id", uuid);
-            //Map<String, Object> orderMap = orderMapper.selectForId(order.getId());
+            Map<String, Object> orderMap = orderMapper.selectForId(order.getId());
             new Thread(() -> {
             new Thread(() -> {
                 try {
                 try {
-                    intelligenceSendOrder.integrateSendOrder(order, true);
-                    //intelligenceSendOrders.integrateSendOrder(orderMap, true);
+                    //intelligenceSendOrder.integrateSendOrder(order, true);
+                    intelligenceSendOrders.integrateSendOrder(orderMap, true);
                 }catch(Exception e) {
                 }catch(Exception e) {
                     e.printStackTrace();
                     e.printStackTrace();
                     log.info("融合下单失败！");
                     log.info("融合下单失败！");

common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrders.java

@@ -1007,7 +1007,7 @@ public class IntelligenceSendOrders {
             Map<String, Object> map = JSONObject.parseObject(bodyJsonObject.getString("data"));
             Map<String, Object> map = JSONObject.parseObject(bodyJsonObject.getString("data"));
             List<Object> list = (List<Object>) map.get("q");
             List<Object> list = (List<Object>) map.get("q");
             Map<String, Object> map2 = (Map<String, Object>) list.get(0);
             Map<String, Object> map2 = (Map<String, Object>) list.get(0);
-            Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态");
+            //Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态");
             if (!map2.isEmpty()) {
             if (!map2.isEmpty()) {
                 return responese.getBody();
                 return responese.getBody();
             }
             }

common/src/main/java/com/winsun/smsUtils/SendSmsAndMail.java

@@ -51,9 +51,10 @@ public class SendSmsAndMail {
 		sb.append("accountSid").append("=").append(ACCOUNT_SID);
 		sb.append("accountSid").append("=").append(ACCOUNT_SID);
 		sb.append("&to").append("=").append(contactPhone);
 		sb.append("&to").append("=").append(contactPhone);
 		if ("2".equals(t)){
 		if ("2".equals(t)){
+			speed = speed.replace("https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=", "");
 			sb.append("&param").append("=").append(URLEncoder.encode(speed,"UTF-8"));
 			sb.append("&param").append("=").append(URLEncoder.encode(speed,"UTF-8"));
 			//【飞young校园】尊敬的客户，您已成功下单！如需了解订单详情请点击@_url_@，如有任何问题请点击订单详情页面右上角，咨询客服。
 			//【飞young校园】尊敬的客户，您已成功下单！如需了解订单详情请点击@_url_@，如有任何问题请点击订单详情页面右上角，咨询客服。
-			sb.append("&templateid").append("=").append("319129");
+			sb.append("&templateid").append("=").append("319435");
 		}else if ("3".equals(t)){
 		}else if ("3".equals(t)){
 			sb.append("&param").append("=").append(URLEncoder.encode(speed,"UTF-8"));
 			sb.append("&param").append("=").append(URLEncoder.encode(speed,"UTF-8"));
 			//【飞young校园】尊敬的用户：您已完成手机卡的活体认证，请在5分钟后插卡拨打电话进行激活。
 			//【飞young校园】尊敬的用户：您已完成手机卡的活体认证，请在5分钟后插卡拨打电话进行激活。
@@ -78,7 +79,8 @@ public class SendSmsAndMail {
 		String body = sb.toString() + createCommonParam(ACCOUNT_SID, AUTH_TOKEN);
 		String body = sb.toString() + createCommonParam(ACCOUNT_SID, AUTH_TOKEN);
 		log.info("send body:" + body);
 		log.info("send body:" + body);
 		try {
 		try {
-			HttpUtil.post(BASE_URL, body);
+			String post = HttpUtil.post(BASE_URL, body);
+			return post;
 		} catch (Exception e) {
 		} catch (Exception e) {
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}