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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/other/DamaiService.java

@@ -2,12 +2,16 @@ package com.liquidnet.service.kylin.service.other;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.tmp.CourierListVo;
+import com.liquidnet.service.kylin.entity.KylinTicketTimes;
+import com.liquidnet.service.kylin.entity.KylinTickets;
 
 public interface DamaiService {
+    //同步场地
+    Boolean sycField(String fieldId);
     //同步演出
     Boolean sycPerformance(String performanceId);
     //同步场次
-    Boolean sycTimes(String timeId);
+    Boolean sycTimes(String performanceId, KylinTicketTimes timesData);
     //同步票
-    Boolean sycTicket(String ticketId);
+    Boolean sycTicket(String timeId, KylinTickets ticketsData);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml

@@ -57,6 +57,14 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>taobao-sdk-id</groupId>
+            <artifactId>taobao-sdk</artifactId>
+            <version>1.0.0</version>
+            <type>jar</type>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/taobao-sdk-java-auto_1600401599540-20210607.jar</systemPath>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java

@@ -2,31 +2,31 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
-import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
-import com.liquidnet.service.kylin.dto.vo.KylinRoadShowVo;
-import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
-import com.liquidnet.service.kylin.entity.KylinRoadShows;
-import com.liquidnet.service.kylin.mapper.KylinRoadShowsMapper;
-import com.liquidnet.service.kylin.service.admin.IKylinRoadShowsAdminService;
+import com.liquidnet.client.admin.zhengzai.kylin.utils.TaobaoTicketUtils;
+import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.other.DamaiService;
-import com.mongodb.BasicDBObject;
-import org.springframework.beans.BeanUtils;
+import com.taobao.api.TaobaoClient;
+import com.taobao.api.internal.util.StringUtils;
+import com.taobao.api.request.AlibabaDamaiMevOpenPushitemRequest;
+import com.taobao.api.request.AlibabaDamaiMevOpenPushitemRequest.PushTicketItemPushOpenParam;
+import com.taobao.api.request.AlibabaDamaiMevOpenPushperformRequest;
+import com.taobao.api.request.AlibabaDamaiMevOpenPushperformRequest.ThirdPerformPushOpenParam;
+import com.taobao.api.request.AlibabaDamaiMevOpenPushprojectRequest;
+import com.taobao.api.request.AlibabaDamaiMevOpenPushprojectRequest.ThirdProjectPushOpenParam;
+import com.taobao.api.response.AlibabaDamaiMevOpenPushfaceResponse;
+import com.taobao.api.response.AlibabaDamaiMevOpenPushitemResponse;
+import com.taobao.api.response.AlibabaDamaiMevOpenPushperformResponse;
+import com.taobao.api.response.AlibabaDamaiMevOpenPushprojectResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.util.HashMap;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
+
 /**
  * <p>
  * 巡演 服务实现类
@@ -44,19 +44,126 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
     @Autowired
     private MongoConverter mongoConverter;
 
+    @Autowired
+    private TaobaoTicketUtils taobaoTicketUtils;
+
+    @Autowired
+    private KylinPerformancesMapper performancesMapper;
+
+    @Autowired
+    private KylinTicketTimesMapper ticketTimesMapper;
+    @Autowired
+    private KylinTicketTimeRelationMapper ticketTimeRelationMapper;
+
+    @Autowired
+    private KylinTicketsMapper ticketsMapper;
+    @Autowired
+    private KylinTicketRelationsMapper ticketRelationsMapper;
+
+
+    @Override
+    public Boolean sycField(String fieldId) {
+        return null;
+    }
 
     @Override
     public Boolean sycPerformance(String performanceId) {
-        return false;
+        try {
+            TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
+            AlibabaDamaiMevOpenPushprojectRequest req = new AlibabaDamaiMevOpenPushprojectRequest();
+            ThirdProjectPushOpenParam obj1 = new ThirdProjectPushOpenParam();
+
+            KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
+
+            obj1.setPicUrl(performanceData.getImgPoster());
+            obj1.setProjectId(Long.parseLong(performanceData.getPerformancesId()));
+            obj1.setProjectName(performanceData.getTitle());
+            obj1.setCityId(performanceData.getCityId().longValue());
+            obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
+            obj1.setSystemId(taobaoTicketUtils.getSystemId());
+
+//            obj1.setPushTime(DateUtils.getNowDate());
+//            obj1.setSupplierSecret("foo");
+//            obj1.setSystemId(0L);
+//            obj1.setVenueId(0L);
+
+            req.setPushProjectParam(obj1);
+            AlibabaDamaiMevOpenPushprojectResponse rsp = client.execute(req);
+            if (rsp.getResult().getSuccess()) {
+                List<KylinTicketTimeRelation> timeRelation = ticketTimeRelationMapper.selectList(new UpdateWrapper<KylinTicketTimeRelation>().eq("performance_id", performanceId));
+
+                for (int i = 0; i < timeRelation.size(); i++) {
+                    KylinTicketTimes timeData = ticketTimesMapper.selectOne(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", timeRelation.get(i).getTimesId()));
+                    boolean result = sycTimes(performanceId, timeData);
+                    if (!result) {
+                        return false;
+                    }
+                }
+                return true;
+            } else {
+                return false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
     @Override
-    public Boolean sycTimes(String timeId) {
-        return false;
+    public Boolean sycTimes(String performancesId, KylinTicketTimes timesData) {
+        try {
+            TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
+            AlibabaDamaiMevOpenPushperformRequest req = new AlibabaDamaiMevOpenPushperformRequest();
+            ThirdPerformPushOpenParam obj1 = new ThirdPerformPushOpenParam();
+
+            obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+            obj1.setPerformId(Long.parseLong(timesData.getTicketTimesId()));
+            obj1.setPerformName(timesData.getTitle());
+            obj1.setProjectId(Long.parseLong(performancesId));
+            obj1.setStartTime(StringUtils.parseDateTime(timesData.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+            obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
+            obj1.setSystemId(taobaoTicketUtils.getSystemId());
+            req.setPushPerformParam(obj1);
+            AlibabaDamaiMevOpenPushperformResponse rsp = client.execute(req);
+            if (rsp.getResult().getSuccess()) {
+                List<KylinTicketRelations> ticketRelation = ticketRelationsMapper.selectList(new UpdateWrapper<KylinTicketRelations>().eq("times_id", timesData.getTicketTimesId()));
+                for (int i = 0; i < ticketRelation.size(); i++) {
+                    KylinTickets ticketData = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketRelation.get(i).getTicketId()));
+                    boolean result = sycTicket(timesData.getTicketTimesId(), ticketData);
+                    if (!result) {
+                        return false;
+                    }
+                }
+                return true;
+            } else {
+                return false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
     @Override
-    public Boolean sycTicket(String ticketId) {
-        return false;
+    public Boolean sycTicket(String timeId, KylinTickets ticketsData) {
+        try {
+            TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
+            AlibabaDamaiMevOpenPushitemRequest req = new AlibabaDamaiMevOpenPushitemRequest();
+            PushTicketItemPushOpenParam obj1 = new PushTicketItemPushOpenParam();
+
+            obj1.setItemId(Long.parseLong(ticketsData.getTicketsId()));
+            obj1.setItemName(ticketsData.getTitle());
+            obj1.setItemPrice(ticketsData.getPrice().longValue());
+            obj1.setPerformId(Long.parseLong(timeId));
+            obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
+            obj1.setSystemId(taobaoTicketUtils.getSystemId());
+//            obj1.setRemark("0");
+            req.setPushItemParam(obj1);
+            AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
+            return rsp.getResult().getSuccess();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/TaobaoTicketUtils.java

+package com.liquidnet.client.admin.zhengzai.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;
+    }
+}

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -19,6 +19,9 @@ liquidnet:
     connection-timeout: 3000
   mysql:
     database-name: test_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test_ln_scene
   url-pay:
     pay: http://testpay.zhengzai.tv
     check: http://testpay.zhengzai.tv/order/verify
@@ -28,6 +31,3 @@ liquidnet:
     accessSecret:
 
 #以下为spring各环境个性配置
-spring:
-  data-mongo-sslEnabled: false
-  data-mongo-database: test_ln_scene

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

@@ -479,6 +479,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             httpData.add("return_url", payOrderParam.getReturnUrl());
         }
 
+
+
         String returnData = HttpUtil.post(payUrl + payOrderParam.getDeviceFrom() + "/" + payOrderParam.getPayType(), httpData);
         PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
         payResultVo.setOrder_id(orderTicketId);