Merge branch 'pre' into 'master'

Pre

See merge request !42

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

@@ -4,8 +4,6 @@ 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);
     //同步场次

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

@@ -4,6 +4,7 @@ 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.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.dao.OrderPushDamaiDto;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
@@ -24,8 +25,6 @@ import com.taobao.api.response.AlibabaDamaiMevOpenPushperformResponse;
 import com.taobao.api.response.AlibabaDamaiMevOpenPushprojectResponse;
 import lombok.extern.slf4j.Slf4j;
 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.stereotype.Service;
 
 import java.time.format.DateTimeFormatter;
@@ -45,25 +44,16 @@ import java.util.List;
 @Slf4j
 public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, KylinRoadShows> implements DamaiService {
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    private MongoConverter mongoConverter;
-
     @Autowired
     private TaobaoTicketUtils taobaoTicketUtils;
     @Autowired
     private KylinOrderTicketsMapper orderTicketsMapper;
-
     @Autowired
     private KylinPerformancesMapper performancesMapper;
-
     @Autowired
     private KylinTicketTimesMapper ticketTimesMapper;
     @Autowired
     private KylinTicketTimeRelationMapper ticketTimeRelationMapper;
-
     @Autowired
     private KylinTicketsMapper ticketsMapper;
     @Autowired
@@ -72,11 +62,6 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
     private KylinTicketStatusMapper ticketStatusMapper;
 
 
-    @Override
-    public Boolean sycField(String fieldId) {
-        return null;
-    }
-
     @Override
     public Boolean sycPerformance(String performanceId) {
         try {
@@ -87,12 +72,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
 
             obj1.setPicUrl(performanceData.getImgPoster());
-            long performanceKey = 0l;
-            if (performanceData.getPerformancesId().length() < 13) {
-                performanceKey = Long.valueOf(performanceData.getPerformancesId());
-            } else {
-                performanceKey = Long.valueOf(performanceData.getPerformancesId().substring(0, 5).concat(performanceData.getPerformancesId().substring(7, 12)));
-            }
+
+            long performanceKey = IDGenerator.getDamaiCode(performanceData.getPerformancesId());
             obj1.setProjectId(performanceKey);
             obj1.setProjectName(performanceData.getTitle());
             obj1.setCityId(performanceData.getCityId().longValue());
@@ -101,9 +82,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 
             req.setPushProjectParam(obj1);
             AlibabaDamaiMevOpenPushprojectResponse rsp = client.execute(req);
+            log.info("performance=" + 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++) {
                     KylinTicketTimes timeData = ticketTimesMapper.selectOne(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", timeRelation.get(i).getTimesId()));
                     boolean result = sycTimes(performanceKey, timeData);
@@ -129,13 +110,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             ThirdPerformPushOpenParam obj1 = new ThirdPerformPushOpenParam();
 
             obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
-            long ticketTimesKey = 0l;
-            if (timesData.getTicketTimesId().length() > 13) {
-                ticketTimesKey = Long.valueOf(timesData.getTicketTimesId().substring(0, 5).concat(timesData.getTicketTimesId().substring(7, 12)));
-            } else {
-                ticketTimesKey = Long.valueOf(timesData.getTicketTimesId());
-            }
-
+            long ticketTimesKey = IDGenerator.getDamaiCode(timesData.getTicketTimesId());
             obj1.setPerformId(ticketTimesKey);
             obj1.setPerformName(timesData.getTitle());
             obj1.setProjectId(performancesmId);
@@ -144,6 +119,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
             req.setPushPerformParam(obj1);
             AlibabaDamaiMevOpenPushperformResponse rsp = client.execute(req);
+            log.info("times = " + rsp.getBody());
             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++) {
@@ -171,13 +147,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
             AlibabaDamaiMevOpenPushitemRequest req = new AlibabaDamaiMevOpenPushitemRequest();
             PushTicketItemPushOpenParam obj1 = new PushTicketItemPushOpenParam();
-
-            long ticketIdKey = 0l;
-            if (ticketsData.getTicketsId().length() > 13) {
-                ticketIdKey = Long.valueOf(ticketsData.getTicketsId().substring(0, 5).concat(ticketsData.getTicketsId().substring(7, 12)));
-            } else {
-                ticketIdKey = Long.valueOf(ticketsData.getTicketsId());
-            }
+            long ticketIdKey = IDGenerator.getDamaiCode(ticketsData.getTicketsId());
             obj1.setItemId(ticketIdKey);
             obj1.setItemName(ticketsData.getTitle());
             obj1.setItemPrice(ticketsData.getPrice().longValue());
@@ -187,8 +157,10 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 //            obj1.setRemark("0");
             req.setPushItemParam(obj1);
             AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
+            log.info("ticket = " + rsp.getBody());
             if (rsp.getResult().getSuccess()) {
                 return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey);
+//                return true;
             } else {
                 return false;
             }
@@ -203,63 +175,61 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
         try {
             TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
             AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
-            List<ThirdTicketPushOpenParam> list2 = new ArrayList<>();
             List<OrderPushDamaiDto> data = orderTicketsMapper.pushDamaiDetailsList(ticketsId);
-            for (int i = 0; i < data.size(); i++) {
-                OrderPushDamaiDto item = data.get(i);
-                ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
-                long orderTicketEntitiesKey = 0l;
-                if (item.getIsMember() == 1) {
-                    if (item.getOrderTicketEntitiesId().length() > 13) {
-                        orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12)) + "010");
+            log.info("data = " + data.size() + " ticketsId=" + ticketsId);
+            int forSize = 100;
+            int forCount = data.size() % forSize == 0 ? data.size() / forSize : (data.size() / forSize) + 1;
+            for (int i = 0; i < forCount; i++) {
+                List<ThirdTicketPushOpenParam> list2 = new ArrayList<>();
+                for (int y = 0; y < forSize; y++) {
+                    if ((i * forSize + y) == data.size()) {
+                        break;
+                    }
+                    OrderPushDamaiDto item = data.get(i * forSize + y);
+                    ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
+                    long orderTicketEntitiesKey;
+                    if (item.getIsMember() == 1) {
+                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("010"));
                     } else {
-                        orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId() + "010");//票单号 入场人id
+                        orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020"));
                     }
-                } else {
-                    if (item.getOrderTicketEntitiesId().length() > 13) {
-                        orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12) + "020"));//票单号 入场人id
+
+                    long orderIdKey = IDGenerator.getDamaiCode(item.getOrderTicketsId());
+                    if (item.getIsPayment() == 3) {
+                        taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
+                    } else if (item.getTransferStatus() == 2) {
+                        taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
                     } else {
-                        orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId() + "020");//票单号 入场人id
+                        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(item.getTimePay()));//支付时间
+                        obj3.setPerformId(timemId);//场次id
+                        obj3.setTicketItemId(ticketsmId);
+                        obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
+                        obj3.setOrderId(orderIdKey);//订单id orderId
+                        obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
+                        obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
+                        obj3.setSystemId(taobaoTicketUtils.getSystemId());
+                        obj3.setSeatType(1L);
+                        obj3.setTicketType(1L);//票类型
                     }
                 }
-
-                long orderIdKey;
-                if (item.getOrderTicketsId().length() > 13) {
-                    orderIdKey = Long.valueOf(item.getOrderTicketsId().substring(0, 5).concat(item.getOrderTicketsId().substring(7, 12)));
+                req.setThirdTicketSetOpenParamList(list2);
+                log.info("list2 = " + list2.size());
+                if (list2.size() == 0) {
+                    return true;
                 } else {
-                    orderIdKey = Long.valueOf(item.getOrderTicketsId());
-                }
-
-
-                if (item.getIsPayment() == 3) {
-                    taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
-                } else {
-                    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(item.getTimePay()));//支付时间
-                    obj3.setPerformId(timemId);//场次id
-                    obj3.setTicketItemId(ticketsmId);
-                    obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
-                    obj3.setOrderId(orderIdKey);//订单id orderId
-
-                    obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
-                    obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
-                    obj3.setSystemId(taobaoTicketUtils.getSystemId());
-                    obj3.setSeatType(1L);
-                    obj3.setTicketType(1L);//票类型
+                    AlibabaDamaiMevOpenBatchpushticketResponse rsp = client.execute(req);
+                    log.info("order = " + rsp.getBody());
+                    if (!rsp.getResult().getSuccess()) {
+                        return false;
+                    }
                 }
             }
-            req.setThirdTicketSetOpenParamList(list2);
-            if (list2.size() == 0) {
-                return true;
-            } else {
-                AlibabaDamaiMevOpenBatchpushticketResponse rsp = client.execute(req);
-                return rsp.getResult().getSuccess();
-            }
-
+            return true;
         } catch (Exception e) {
             e.printStackTrace();
             return null;

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

 package com.liquidnet.commons.lang.util;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.UUID;
@@ -45,12 +47,20 @@ public class IDGenerator {
         return orderCode;
     }
 
-    public static String payCode(){
-        return "PAY"+nextTimeId();
+    public static Long getDamaiCode(String code) {
+        if (code.length() < 13) {
+            return Long.valueOf(code);
+        } else {
+            return Long.valueOf(StringUtils.left(code, 5).concat(StringUtils.right(code, 8)));
+        }
+    }
+
+    public static String payCode() {
+        return "PAY" + nextTimeId();
     }
 
-    public static String refundCode(){
-        return "RED"+nextTimeId();
+    public static String refundCode() {
+        return "RED" + nextTimeId();
     }
 
     /**
@@ -65,11 +75,11 @@ public class IDGenerator {
     }
 
     public static void main(String[] args) {
-        System.out.println(""+IDGenerator.payCode());
-        System.out.println(""+IDGenerator.refundCode());
-        System.out.println("nextTimeId==="+IDGenerator.nextTimeId());
-        System.out.println("nextMilliId==="+IDGenerator.nextMilliId());
-        System.out.println("nextSnowId==="+IDGenerator.nextSnowId());
-        System.out.println("get32UUID==="+IDGenerator.get32UUID());
+        System.out.println("" + IDGenerator.payCode());
+        System.out.println("" + IDGenerator.refundCode());
+        System.out.println("nextTimeId===" + IDGenerator.nextTimeId());
+        System.out.println("nextMilliId===" + IDGenerator.nextMilliId());
+        System.out.println("nextSnowId===" + IDGenerator.nextSnowId());
+        System.out.println("get32UUID===" + IDGenerator.get32UUID());
     }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderPushDamaiDto.java

@@ -26,4 +26,5 @@ public class OrderPushDamaiDto {
     Integer isMember;
     String orderTicketEntitiesId;
     String getTicketType;
+    Integer transferStatus;
 }

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

@@ -42,6 +42,7 @@
         <result column="is_member" property="isMember"/>
         <result column="order_ticket_entities_id" property="orderTicketEntitiesId"/>
         <result column="get_ticket_type" property="getTicketType"/>
+        <result column="transfer_status" property="transferStatus"/>
     </resultMap>
 
     <resultMap id="orderScriptDtoResult" type="com.liquidnet.service.kylin.dao.OrderScriptDto">
@@ -246,13 +247,14 @@
                otr.ticket_id,
                otr.is_member,
                ote.order_ticket_entities_id,
-               get_ticket_type
+               get_ticket_type,
+               ots.transfer_status
         FROM kylin_order_tickets AS ot
                  LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
                  LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
                  LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
                  LEFT JOIN kylin_ticket_status AS kys ON kys.ticket_id = otr.ticket_id
-        WHERE  ots.pay_status = 1
+        WHERE (ots.status = 1 or ots.status = 3)
           AND kys.sync_damai = 1
           AND ote.ticket_id = ${ticketsId}
     </select>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletMdskController.java

@@ -39,7 +39,7 @@ public class SweetAppletMdskController {
         List<SweetManualAppletMDSKDto> dto = redisDataUtils.getPushList();
         List<SweetManualAppletMDSKDto> vo = ObjectUtil.getSweetManualAppletMDSKDtoList();
         for (SweetManualAppletMDSKDto item : dto) {
-            if (item.getTitle().contains(name)) {
+            if (item.getTitle().contains(name) || item.getTitle().contains("M_DSK")) {
                 vo.add(item);
             }
         }

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualMdskMapper.xml

@@ -75,7 +75,7 @@
         ) AS t ON p.performances_id = t.performance_id
         <where>
             <if test="title!='' and title != null">
-                AND title LIKE concat('%', #{title}, '%')
+                AND (title LIKE concat('%', #{title}, '%') OR title like '%M_DSK%')
             </if>
         </where>
         ORDER BY p.created_at desc