Merge remote-tracking branch 'origin/template_message' into template_message

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketCreateParam.java

@@ -110,7 +110,6 @@ public class TicketCreateParam implements Serializable {
             kylinTickets.setCreatedAt(createdAt);
         if (updatedAt != null)
             kylinTickets.setUpdatedAt(updatedAt);
-        //TODO 各种说明文案
         return kylinTickets;
     }
 

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

@@ -69,7 +69,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
     @Override
     public PageInfo<List<KylinOrderListVo>> orderList() {
-        //TODO 缺快递
         PageInfo<List<KylinOrderListVo>> mPageInfo = null;
         String uid = CurrentUtil.getCurrentUid();
 //        checkOrderTime(uid);
@@ -78,7 +77,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             for (int i = 0; i < voList.size(); i++) {
                 KylinOrderListVo item = voList.get(i);
 
-                //TODO 顺丰快递
                 Integer orderExpressStatus = dataUtils.getOrderExpressInfo(item.getOrderTicketsId());
                 item.setExpressStatus(orderExpressStatus);
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/dto/SweetOpenSendMsgParam.java

+package com.liquidnet.service.order.dto;
+
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@ApiModel(value = "SweetOpenSendMsgParam", description = "发送模版消息公共接口入参")
+@Data
+public class SweetOpenSendMsgParam implements Serializable,Cloneable {
+
+    private static final long serialVersionUID = 675588088506034208L;
+
+    @ApiModelProperty(position = 11, required = true, allowableValues = "1,2", value = "发送目标类型 1正在服务号 2摩登服务号")
+    @NotNull(message = "sendTargetType不能为空") @Min(value = 1, message = "sendTargetType无效") @Max(value = 2, message = "sendTargetType无效")
+    private Integer sendTargetType;
+
+    @ApiModelProperty(position = 12, required = true, value = "模版消息ID", example = "y-j82V1TYhlTH1j8QscuDPcPQtNiDtENb7N5IZMBvqU")
+    @NotBlank(message = "templateId不能为空")
+    private String templateId;
+
+    @ApiModelProperty(position = 13, required = true, value = "模版消息数据", example = "{\"first\": \"感谢关注「正在现场」服务号\", \"keyword2\": \"4006-310-750\"}")
+    @NotBlank(message = "templateData不能为空")
+    private String templateData;
+
+    @ApiModelProperty(position = 14, required = true, allowableValues = "1,2,3,4,5", value = "点击跳转类型 1草莓小程序 2五百里小程序 3mdsk小程序 4正在小程序 5url")
+    @NotNull(message = "jumpType不能为空") @Min(value = 1, message = "jumpType无效") @Max(value = 5, message = "jumpType无效")
+    private Integer jumpType;
+
+    @ApiModelProperty(position = 15, value = "跳转url", example = "www.zhengzai.tv")
+    private String jumpUrl;
+
+    @ApiModelProperty(position = 16, allowableValues = "false,true", value = "是否需要前端配合处理跳转，直接跳转jumpAppletPagePath为false,true时需要前端根据状态码做跳转处理")
+    private Boolean jumpAppletUsePath;
+
+    @ApiModelProperty(position = 17, value = "跳转小程序需要的某页地址", example = "pages/webview?query=lottery")
+    private String jumpAppletPagePath;
+
+    @ApiModelProperty(position = 18, required = true, value = "openId", example = "oUpkkuNe4yuVs77aaKFvuvpgNOSw")
+    @NotBlank(message = "openId不能为空")
+    private String openId;
+
+    @ApiModelProperty(position = 18, required = true, value = "phone", example = "15888888888")
+    @NotBlank(message = "phone不能为空")
+    private String phone;
+
+    private static final SweetOpenSendMsgParam obj = new SweetOpenSendMsgParam();
+    public static SweetOpenSendMsgParam getNew() {
+        try {
+            return (SweetOpenSendMsgParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetOpenSendMsgParam();
+        }
+    }
+}

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

@@ -25,6 +25,7 @@ import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
+import com.liquidnet.service.order.dto.SweetOpenSendMsgParam;
 import com.liquidnet.service.order.utils.*;
 import com.taobao.api.TaobaoClient;
 import com.taobao.api.request.AlibabaDamaiMevOpenBatchpushticketRequest;
@@ -871,6 +872,19 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                                     .setTemplateParam("time", time1 + " " + time2).toJson()
                     );
                 }
+                //模板消息
+                SweetOpenSendMsgParam param = SweetOpenSendMsgParam.getNew();
+                param.setSendTargetType(1);
+                //TODO 胡佳晨 模板相关
+//                param.setTemplateId();
+//                param.setTemplateData();
+                param.setJumpType(4);
+                param.setJumpUrl("http://m.zhengzai.tv/#/order/ticket/orderdetail?id="+orderTicketData.getOrderTicketsId());
+                param.setJumpAppletPagePath("刘然的地址");
+                param.setJumpAppletUsePath(false);
+                param.setPhone(orderTicketData.getUserMobile());
+                queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_TEMPLATE_MSG.getKey(),
+                        JsonUtils.toJson(param));
 
                 // 大麦回调
 //                sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember());