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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderTicketEntitiesVo.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 1207664465164005975L;
 
+    private Integer mid;
     private String orderTicketEntitiesId;
     private String orderId;
     private String ticketId;
@@ -31,6 +32,9 @@ public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
     private String createdAt;
     private String updatedAt;
 
+    private Integer ticketsmId;
+    private Integer timemId;
+
     private String checkType;
     private String checkedAt;
     private String checkUserId;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderTicketVo.java

@@ -14,6 +14,7 @@ import java.math.BigDecimal;
 @ApiModel(value = "KylinOrderTicketVo", description = "订单数据")
 @Data
 public class KylinOrderTicketVo implements Serializable {
+    private Integer mid;
     private static final long serialVersionUID = 5325511589667456213L;
     @ApiModelProperty(position = 10, value = "ID")
     private String orderTicketsId;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -54,6 +54,14 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>taobao-sdk-impl</groupId>
+            <artifactId>taobao-sdk-impl</artifactId>
+            <version>0.0.2</version>
+            <type>jar</type>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/taobao-sdk-java-auto_1600401599540-20210607-impl.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>
@@ -64,4 +72,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file

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

@@ -23,8 +23,11 @@ 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.TaobaoTicketUtils;
 import com.mongodb.BasicDBObject;
+import com.taobao.api.request.AlibabaDamaiMevOpenBatchpushticketRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -84,6 +87,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     private FeignAdamBaseClient feignAdamBaseClient;
     @Autowired
     private ExpressesMapper expressesMapper;
+    @Autowired
+    private TaobaoTicketUtils taobaoTicketUtils;
 
     @Override
     public ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam) {
@@ -492,7 +497,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTickets.setPayCode(payResultVo.getCode());
         if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
             payResultVo.setShowUrl(payOrderParam.getShowUrl());
-            payResultVo.setReturnUrl(payOrderParam.getReturnUrl()+orderTicketId);
+            payResultVo.setReturnUrl(payOrderParam.getReturnUrl() + orderTicketId);
         }
         // 生成vo
         KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo();
@@ -700,9 +705,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         }
 
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.gets(sqls, sqlsDataA,sqlsDataB,sqlsDataC));
+                SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
 
         // 发短信
+
+        // 大麦回调
+//        sycOrder(orderTickets.getOrderTicketsId());
         return "success";
     }
 
@@ -897,4 +905,39 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             return true;
         }
     }
+
+    private boolean sycOrder(String orderId) {
+        try {
+            KylinOrderTicketVo orderData = mongoTemplate.findOne(
+                    Query.query(Criteria.where("orderTicketsId").is(orderId)),
+                    KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
+
+            List<KylinOrderTicketEntitiesVo> listData = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
+            AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
+            List<AlibabaDamaiMevOpenBatchpushticketRequest.ThirdTicketPushOpenParam> list2 = new ArrayList<AlibabaDamaiMevOpenBatchpushticketRequest.ThirdTicketPushOpenParam>();
+            for (int i = 0; i < listData.size(); i++) {
+                KylinOrderTicketEntitiesVo item = listData.get(i);
+                AlibabaDamaiMevOpenBatchpushticketRequest.ThirdTicketPushOpenParam obj3 = new AlibabaDamaiMevOpenBatchpushticketRequest.ThirdTicketPushOpenParam();
+                list2.add(obj3);
+                obj3.setUserName(item.getEnterName());//用户名 入场人姓名
+                obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证
+                obj3.setOrderUserMobile(item.getEnterMobile());//用户手机号 入场人手机号
+                obj3.setCertificateType(item.getEnterType().longValue());//证件内容 入场人证件type
+                obj3.setPayTime(DateUtils.parseDate(orderData.getTimePay(),new String[]{"yyyy-MM-dd HH:mm:ss"}));//支付时间
+//                obj3.setPerformId(timemId);//场次id
+//                obj3.setTicketItemId(ticketsmId);
+                obj3.setVoucherId(item.getMid().longValue());//票单号 入场人id
+
+                obj3.setOrderId(Long.parseLong(orderData.getOrderTicketsId()));//订单id orderId
+                obj3.setMediumType(orderData.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
+                obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
+                obj3.setSystemId(taobaoTicketUtils.getSystemId());
+                obj3.setSeatType(1L);
+                obj3.setTicketType(1L);//票类型
+            }
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }

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

+package com.liquidnet.service.kylin.utils;
+
+import com.taobao.api.DefaultTaobaoClient;
+import com.taobao.api.TaobaoClient;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaobaoTicketUtils {
+
+    private String URL = "http://gw.api.taobao.com/router/rest";
+    private String APPKEY = "27542597";
+    private String SECRET = "900025efc616fd2446344bb8fa21d039";
+    private String SUPPLIER_SECRET= "444d0752439f921a75eaf5951a8bc03c";
+    private Long SYSTEM_ID= 15669L;
+//    private String url = "http://gw.api.tbsandbox.com/router/rest";
+//    private String appkey = "4272";
+//    private String secret = "0ebbcccfee18d7ad1aebc5b135ffa906";
+    private TaobaoClient client = null;
+
+    public TaobaoClient initTaobaoClient() {
+        if (client == null) {
+            client = new DefaultTaobaoClient(URL, APPKEY, SECRET);
+        }
+        return client;
+    }
+
+    public String getSupplierSecret(){
+        return SUPPLIER_SECRET;
+    }
+
+    public Long getSystemId(){
+        return SYSTEM_ID;
+    }
+}