Merge branch 'pre' into 'master'

Pre

See merge request !47

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

@@ -80,8 +80,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
 
             req.setPushProjectParam(obj1);
+            log.info("[同步演出] 演出名称 = " + performanceData.getTitle() + " 大麦演出id =" + performanceKey);
             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++) {
@@ -117,8 +117,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
             req.setPushPerformParam(obj1);
+            log.info("[同步场次] 场次名称 = " + timesData.getTitle() + " 大麦场次id =" + ticketTimesKey);
             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++) {
@@ -155,8 +155,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             obj1.setSystemId(taobaoTicketUtils.getSystemId());
 //            obj1.setRemark("0");
             req.setPushItemParam(obj1);
+            log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + " 大麦票种id =" + ticketIdKey);
             AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
-            log.info("ticket = " + rsp.getBody());
             if (rsp.getResult().getSuccess()) {
                 return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey);
 //                return true;
@@ -175,7 +175,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             TaobaoClient client = taobaoTicketUtils.initTaobaoClient();
             AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
             List<OrderPushDamaiDto> data = orderTicketsMapper.pushDamaiDetailsList(ticketsId);
-            log.info("data = " + data.size() + " ticketsId=" + ticketsId);
+            log.info("[同步订单] 票种张数 = " + data.size() + " 票种id =" + ticketsId);
             int forSize = 100;
             int forCount = data.size() % forSize == 0 ? data.size() / forSize : (data.size() / forSize) + 1;
             for (int i = 0; i < forCount; i++) {
@@ -196,7 +196,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     long orderIdKey = IDGenerator.getDamaiCode(item.getOrderTicketsId());
                     if (item.getIsPayment() == 3) {
                         taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
-                    } else if (item.getTransferStatus() == 2) {
+                    } else if (item.getTransferStatus() == 2 || item.getTransferStatus() == 6) {
                         taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
                     } else {
                         list2.add(obj3);
@@ -217,7 +217,6 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     }
                 }
                 req.setThirdTicketSetOpenParamList(list2);
-                log.info("list2 = " + list2.size());
                 if (list2.size() == 0) {
                     return true;
                 } else {

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

@@ -254,8 +254,7 @@
                  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.status = 1 or ots.status = 3)
-          AND kys.sync_damai = 1
+        WHERE (ots.status = 1 or ots.status = 3 or ots.status = 4 or ots.status = 6)
           AND ote.ticket_id = ${ticketsId}
     </select>