发短信

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/DateUtil.java

@@ -29,6 +29,7 @@ public abstract class DateUtil {
 
         MM_dd("MM-dd"),
         yyyyMMdd("yyyyMMdd"),
+        HHmm("HH:mm"),
         yyyy_MM_dd("yyyy-MM-dd"),
         yyyy_MM_dd2("yyyy/MM/dd"),
         yyyyMMddHH("yyyy-MM-dd HH"),
@@ -37,6 +38,7 @@ public abstract class DateUtil {
         yyyyMMddHHmmssTrim("yyyyMMddHHmmss"),
         ddHHmmssTrim("ddHHmmss"),
         yyyy_MM_dd_zh("yyyy年MM月dd日"),
+        MM_dd_zh("MM月dd日"),
         english("d MMM yyyy HH:mm 'UTC'", Locale.ENGLISH),
         ;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -19,6 +19,8 @@ import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
+import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.*;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
@@ -28,10 +30,7 @@ import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.service.kylin.utils.DataUtils;
-import com.liquidnet.service.kylin.utils.MongoVoUtils;
-import com.liquidnet.service.kylin.utils.OrderUtils;
-import com.liquidnet.service.kylin.utils.TaobaoTicketUtils;
+import com.liquidnet.service.kylin.utils.*;
 import com.mongodb.BasicDBObject;
 import com.taobao.api.TaobaoClient;
 import com.taobao.api.request.AlibabaDamaiMevOpenBatchpushticketRequest;
@@ -57,6 +56,8 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
+import static com.liquidnet.commons.lang.util.DateUtil.Formatter.yyyyMMdd;
+
 /**
  * <p>
  * 订单 服务实现类
@@ -85,6 +86,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     @Autowired
     private OrderUtils orderUtils;
     @Autowired
+    private OtherUtils otherUtils;
+    @Autowired
     private MongoVoUtils mongoVoUtils;
     @Autowired
     private RedisLockUtil redisLockUtil;
@@ -150,8 +153,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             String timeStart = ticketData.getTimeStart(); // 普通开售时间
             String timeEnd = ticketData.getTimeEnd(); // 购票停售时间
             String timeExpressEnd = ticketData.getTimeEndExpress(); // 快递停售时间
-            boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
-//            boolean isMember = true;
+//            boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
+            boolean isMember = true;
             int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
             if (ticketData.getIsExclusive() == 1) {
                 memberType = 2;
@@ -287,8 +290,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTickets.setOrderTicketsId(orderTicketId);
         orderTickets.setUserId(uid);
         Map token = CurrentUtil.getTokenClaims();
-        orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
-        orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
+//        orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
+//        orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
         orderTickets.setPerformanceTitle(performanceData.getTitle());
         orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
         orderTickets.setPayCode("");
@@ -447,6 +450,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             }
         }
         // 调用支付
+        String time1=DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketData.getUseStart()),DateUtil.Formatter.MM_dd_zh);
+        String time2=DateUtil.format( DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketData.getUseEnd()),DateUtil.Formatter.MM_dd_zh);
+        String useTime = ticketData.getType()==2?time1+"~"+time2:time2;
+
+
         LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<String, String>();
         httpData.add("type", "TICKET");
         if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
@@ -454,8 +462,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         } else {
             httpData.add("price", "0.01");
         }
-        httpData.add("name", ticketData.getUseStart() + "" + ticketData.getTitle());
-        httpData.add("detail", performanceData.getTitle() + "-" + ticketData.getTitle() + "-" + ticketData.getUseStart());
+        httpData.add("name", useTime+ticketData.getTitle().substring(0,12) + "-" + performanceData.getTitle().substring(0,12));
+        httpData.add("detail", performanceData.getTitle() + "-" + ticketData.getTitle() + "-" + useTime);
         httpData.add("order_code", orderTickets.getOrderCode());
         httpData.add("client_ip", CurrentUtil.getCliIpAddr());
         httpData.add("notify_url", synUrl);
@@ -680,7 +688,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 Query.query(Criteria.where("orderId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
                 new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketEntitiesVo))
         );
-
         dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
 
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
@@ -689,6 +696,38 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         //生成vo redis
         mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId());
         // 发短信
+        KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(orderTicketData.getPerformanceId());
+        KylinTicketTimesVo ticketTimesData = null;
+        KylinTicketVo ticketData = null;
+        for (int x = 0; x < performanceData.getTicketTimeList().size(); x++) {
+            KylinTicketTimesVo timeItem = performanceData.getTicketTimeList().get(x);
+            if (timeItem.getTimeId().equals(orderTicketData.getTimeId())) {
+                ticketTimesData = timeItem;
+                for (int y = 0; y < ticketTimesData.getTicketList().size(); y++) {
+                    KylinTicketVo ticketItem = ticketTimesData.getTicketList().get(y);
+                    if (ticketItem.getTicketsId().equals(orderTicketData.getTicketId())) {
+                        ticketData = ticketItem;
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+
+        MessageDataVo dataVo = new MessageDataVo();
+        dataVo.setName(orderTicketData.getPerformanceTitle());
+        String time1=DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketData.getUseStart()),DateUtil.Formatter.yyyyMMdd);
+        String time2=DateUtil.format( DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceData.getTimeStart()),DateUtil.Formatter.HHmm);
+        dataVo.setTime( time1+time2);
+
+        MessageConfigVo configVo = new MessageConfigVo();
+        configVo.setStatus(true);
+        if(orderTicketData.getGetTicketType().equals("express")) {
+            configVo.setId("SMS_181490473");
+        }else if(orderTicketData.getGetTicketType().equals("electronic")){
+            configVo.setId(ticketData.getIsShowCode()==1?"SMS_171358560":"SMS_181500419");
+        }
+        otherUtils.sendMessage(orderTicketData.getUserMobile(),dataVo,configVo,1);
 
         // 大麦回调
         sycDamaiOrder(orderTickets.getOrderTicketsId());

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/OtherUtils.java

@@ -40,7 +40,7 @@ public class OtherUtils {
 
                 String returnData = HttpUtil.post(serviceUrl + "sendSmsMessage", httpData);
                 JsonNode postResultNew = JsonUtils.fromJson(returnData, JsonNode.class);
-                if (postResultNew.get("message").toString() != "OK") {
+                if (!postResultNew.get("message").toString().equals("OK")) {
                     return false;
                 } else {
                     return true;