KylinDamaiServiceImpl 大麦同步修改

KylinPerformancesMapper.xml admin 演出详情 增加根据票种名称排序
KylinTicketsPartnerServiceImpl 票种增加价格排序
KylinTicketTimesPartnerServiceImpl 场次根据 创建时间排序

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

@@ -4,25 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.common.utils.DateUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.TaobaoTicketUtils;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.OrderPushDamaiDto;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.other.DamaiService;
 import com.taobao.api.TaobaoClient;
 import com.taobao.api.internal.util.StringUtils;
-import com.taobao.api.request.AlibabaDamaiMevOpenBatchpushticketRequest;
+import com.taobao.api.request.*;
 import com.taobao.api.request.AlibabaDamaiMevOpenBatchpushticketRequest.ThirdTicketPushOpenParam;
-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.AlibabaDamaiMevOpenBatchpushticketResponse;
-import com.taobao.api.response.AlibabaDamaiMevOpenPushitemResponse;
-import com.taobao.api.response.AlibabaDamaiMevOpenPushperformResponse;
-import com.taobao.api.response.AlibabaDamaiMevOpenPushprojectResponse;
+import com.taobao.api.response.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,6 +47,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
     @Autowired
     private KylinPerformancesMapper performancesMapper;
     @Autowired
+    private KylinPerformanceRelationsMapper performanceRelationsMapper;
+    @Autowired
     private KylinTicketTimesMapper ticketTimesMapper;
     @Autowired
     private KylinTicketTimeRelationMapper ticketTimeRelationMapper;
@@ -60,6 +58,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
     private KylinTicketRelationsMapper ticketRelationsMapper;
     @Autowired
     private KylinTicketStatusMapper ticketStatusMapper;
+    @Autowired
+    private RedisUtil redisUtil;
 
     @Override
     public Boolean sycPerformance(String performanceId) {
@@ -69,19 +69,30 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             ThirdProjectPushOpenParam obj1 = new ThirdProjectPushOpenParam();
 
             KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
+            KylinPerformanceRelations performanceRelationData = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performanceId));
 
             obj1.setPicUrl(performanceData.getImgPoster());
 
             long performanceKey = IDGenerator.getDamaiCode(performanceData.getPerformancesId());
             obj1.setProjectId(performanceKey);
             obj1.setProjectName(performanceData.getTitle());
-            obj1.setCityId(performanceData.getCityId().longValue());
+            if (performanceData.getCityId().equals(6977)) {
+                obj1.setCityId(110100L);
+            } else if (performanceData.getCityId().equals(3833)) {
+                obj1.setCityId(520100L);
+            } else {//520100
+                obj1.setCityId(Long.parseLong(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelationData.getFieldId(), "ad_code").toString()));
+            }
             obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
-
+            Long venueId = sycField(performanceId, performanceRelationData.getFieldId());
+            if (venueId != 0) {
+                obj1.setVenueId(venueId);
+            }
             req.setPushProjectParam(obj1);
             log.info("[同步演出] 演出名称 = " + performanceData.getTitle() + " 大麦演出id =" + performanceKey);
             AlibabaDamaiMevOpenPushprojectResponse rsp = client.execute(req);
+            log.info("[BODY = {}]", rsp.getBody());
             if (rsp.getResult().getSuccess()) {
                 List<KylinTicketTimeRelation> timeRelation = ticketTimeRelationMapper.selectList(new UpdateWrapper<KylinTicketTimeRelation>().eq("performance_id", performanceId));
                 for (int i = 0; i < timeRelation.size(); i++) {
@@ -102,6 +113,44 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
         }
     }
 
+    public Long sycField(String performanceId, String fieldId) {
+        try {
+            TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
+            AlibabaDamaiMevOpenPushvenueRequest req = new AlibabaDamaiMevOpenPushvenueRequest();
+            AlibabaDamaiMevOpenPushvenueRequest.ThirdVenuePushOpenParam obj1 = new AlibabaDamaiMevOpenPushvenueRequest.ThirdVenuePushOpenParam();
+//        obj1.setPushTime(StringUtils.parseDateTime("2017-01-01 00:00:00"));
+            obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
+            obj1.setSystemId(taobaoTicketUtils.getSystemId());
+
+//            if (performanceId.equals("299481167884001288936975")) {
+//                obj1.setVenueId(2774011L);
+//                obj1.setVenueName("北京世园公园");
+////                obj1.setVenueAddress("foo");
+//            } else if (performanceId.equals("5936257")) {
+//                obj1.setVenueId(3238010L);
+//                obj1.setVenueName("贵阳奥林匹克体育中心");
+////                obj1.setVenueAddress("foo");
+//            } else {
+//                return 0L;
+//            }
+            obj1.setVenueId(Long.parseLong(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "id").toString()));
+            obj1.setVenueName(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "name").toString());
+            obj1.setVenueAddress(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "address").toString());
+
+            req.setPushVenueParam(obj1);
+            AlibabaDamaiMevOpenPushvenueResponse rsp = client.execute(req);
+            log.info("[同步场地] 场地名称 = " + obj1.getVenueName() + " 大麦场地id =" + obj1.getVenueId());
+            log.info("[BODY = {}]", rsp.getBody());
+            if (!rsp.getResult().getSuccess()) {
+                return 0L;
+            }
+            return obj1.getVenueId();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0L;
+        }
+    }
+
     @Override
     public Boolean sycTimes(long performancesmId, KylinTicketTimes timesData) {
         try {
@@ -109,12 +158,12 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             AlibabaDamaiMevOpenPushperformRequest req = new AlibabaDamaiMevOpenPushperformRequest();
             ThirdPerformPushOpenParam obj1 = new ThirdPerformPushOpenParam();
 
-            obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
             long ticketTimesKey = IDGenerator.getDamaiCode(timesData.getTicketTimesId());
             obj1.setPerformId(ticketTimesKey);
             obj1.setPerformName(timesData.getTitle());
             obj1.setProjectId(performancesmId);
             obj1.setStartTime(StringUtils.parseDateTime(timesData.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+            obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
             obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
             req.setPushPerformParam(obj1);
@@ -150,13 +199,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             long ticketIdKey = IDGenerator.getDamaiCode(ticketsData.getTicketsId());
             obj1.setItemId(ticketIdKey);
             obj1.setItemName(ticketsData.getTitle());
-            obj1.setItemPrice(ticketsData.getPrice().longValue()*100);
+            obj1.setItemPrice(ticketsData.getPrice().longValue() * 100);
             obj1.setPerformId(timemId);
             obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
 //            obj1.setRemark("0");
             req.setPushItemParam(obj1);
-            log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + " 大麦票种id =" + ticketIdKey +" 票种价格 = "+ticketsData.getPrice());
+            log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + " 大麦票种id =" + ticketIdKey + " 票种价格 = " + ticketsData.getPrice());
             AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
             if (rsp.getResult().getSuccess()) {
                 return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey);
@@ -195,7 +244,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     }
 
                     long orderIdKey = IDGenerator.getDamaiCode(item.getOrderTicketsId());
-                    if (item.getIsPayment() == 3) {
+                    if (item.getIsPayment() == 3 || item.getIsPayment() == 2) {
                         taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
                     } else if (item.getTransferStatus() == 2 || item.getTransferStatus() == 6) {
                         taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -505,7 +505,7 @@
                                                                                       group by kotr.performance_id,kot.user_id
                                                                                   ) t
             ) AS ut ON ut.performance_id = kp.performances_id
-        order by kt.type desc,kt.use_start asc
+        order by kt.type desc,kt.title,kt.use_start asc
     </select>
     <select id="getPerformanceSponsorList" resultMap="performanceSponsorDaoResult">
         select distinct kp.sponsor_id, kp.sponsor, kp.sponsor_type

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java

@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -259,7 +260,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
 
     @Override
     public List<KylinTicketTimesPartnerVo> getTimesMongoList(String performancesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId).and("status").ne(0)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId).and("status").ne(0)).with(Sort.by(Sort.Direction.ASC, "createdAt")), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinTicketsPartnerServiceImpl.java

@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -357,7 +358,8 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
 
     @Override
     public List<KylinTicketPartnerVo> getTicketMongoList(String timesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("timesId").is(timesId).and("status").ne(-1)), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
+        return mongoTemplate.find(Query.query(Criteria.where("timesId").is(timesId).and("status").ne(-1))
+                .with(Sort.by(Sort.Direction.ASC, "status")).with(Sort.by(Sort.Direction.ASC, "price")), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
     }
 
     @Override