commit

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/ticketSystem/STInsertOrderParam.java

@@ -15,7 +15,7 @@ public class STInsertOrderParam implements Cloneable{
     @ApiModelProperty(value = "订单id [必传]")
     String orderId;
     @ApiModelProperty(value = "下单时间 [必传]")
-    LocalDateTime orderTime;
+    String orderTime;
     @ApiModelProperty(value = "渠道类型，1自销，2分销 [必传]")
     Integer channelType;
     @ApiModelProperty(value = "渠道名称 [必传]")

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

@@ -8,7 +8,7 @@ import java.io.Serializable;
 
 @Data
 @ApiModel
-public class OrderVo implements Serializable {
+public class OrderVo implements Serializable ,Cloneable{
     private static final long serialVersionUID = 4073256621782131607L;
     @ApiModelProperty(value = "票单id [必传]")
     private String ticketOrderId;
@@ -26,4 +26,15 @@ public class OrderVo implements Serializable {
     private String ticketId;
     @ApiModelProperty(value = "票实收金额[必传 单位分]")
     private long ticketOrderAmount;
+
+    private static final OrderVo obj = new OrderVo();
+
+    public static OrderVo getNew() {
+        try {
+            return (OrderVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new OrderVo();
+    }
 }

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

@@ -12,7 +12,10 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.param.ticketSystem.*;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.ticketSystem.OrderVo;
 import com.liquidnet.service.kylin.dto.vo.ticketSystem.TicketPriceVo;
 import com.liquidnet.service.kylin.dto.vo.ticketSystem.TicketVo;
 import com.liquidnet.service.kylin.dto.vo.ticketSystem.TimesVo;
@@ -42,7 +45,7 @@ public class InnerService {
         STInsertPerformanceParam insertPerformanceParam = STInsertPerformanceParam.getNew();
         insertPerformanceParam.setPerformanceId(vo.getPerformancesId());
         insertPerformanceParam.setPerformanceName(vo.getTitle());
-        if(approval!=null) {
+        if (approval != null) {
             insertPerformanceParam.setApproval(approval);//TODO 批文号
         }
         insertPerformanceParam.setTypeId(vo.getType() == 101 ? 2002 : 2003);
@@ -181,4 +184,40 @@ public class InnerService {
     private String getPriceId(String ticketId) {
         return ticketId.concat("01");
     }
+
+
+    //上报订单
+    private boolean reportO(KylinOrderTicketVo vo, String channelName) {
+        STInsertOrderParam insertOrderParam = STInsertOrderParam.getNew();
+        insertOrderParam.setOrderId(vo.getOrderTicketsId());
+        insertOrderParam.setOrderTime(vo.getTimePay());
+        insertOrderParam.setChannelType(1);
+        insertOrderParam.setChannelName(channelName);
+        insertOrderParam.setTicketNum(vo.getNumber());
+        insertOrderParam.setTotalAmount(vo.getPriceActual().multiply(BigDecimal.valueOf(100)).intValue());
+        insertOrderParam.setTicketType(1);
+        insertOrderParam.setTicketMode(vo.getGetTicketType().equalsIgnoreCase("express") ? 1 : 2);
+        insertOrderParam.setAuthMode(vo.getIsTrueName() == 1 ? 3 : 1);
+        int voucherPrice = vo.getPriceVoucher().multiply(BigDecimal.valueOf(100)).divide(BigDecimal.valueOf(vo.getNumber())).intValue();
+        List<OrderVo> orderVos = new ArrayList();
+        for (KylinOrderTicketEntitiesVo item : vo.getEntitiesVoList()) {
+            OrderVo orderVo = OrderVo.getNew();
+            orderVo.setTicketOrderId(item.getOrderTicketEntitiesId());
+            orderVo.setPerformanceId(item.getPerformanceId());
+            orderVo.setSessionId(item.getTimeId());
+            orderVo.setSessionCode(getSessionCode(item.getTimeId()));
+            orderVo.setPriceId(getPriceId(item.getTicketId()));
+            orderVo.setTicketPrice(vo.getPrice().multiply(BigDecimal.valueOf(100)).intValue());
+            orderVo.setTicketId(item.getTicketId());
+            orderVo.setTicketOrderAmount(orderVo.getTicketPrice() - voucherPrice);
+            orderVos.add(orderVo);
+        }
+        insertOrderParam.setTicketOrderList(orderVos);
+        MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+        header.add("Accept", "application/json;charset=UTF-8");
+        String resultData = HttpUtil.postRaw(platform + "/platform/st/order/insert", JSON.toJSONString(insertOrderParam), header);
+        ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() {
+        });
+        return innerReturnVo.getData();
+    }
 }

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

@@ -87,11 +87,13 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 
     @Override
     public void test() {
-        String performancesId = "324517967623741449058314";
-        KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
-        KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
-//        merchantAuthorizationRecordsAdminService.authorizationInit(performancesId, relationData.getMerchantId(), relationData.getFieldId(), data.getSponsorId());
-        innerService.reportP(dataUtils.getPerformanceVo(performancesId),null,data.getSponsorId());
+        //同步演出
+//        String performancesId = "324517967623741449058314";
+//        KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
+//        KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
+//        merchantAuthorizationRecordsAdminService.authorizationInit(performancesId, "484418569471385607065926", "528301618682265605017366", "528268445384048648038465");
+//        innerService.reportP(dataUtils.getPerformanceVo(performancesId),null,data.getSponsorId());
+        //同步订单
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/ticketSystem/impl/ITicketSystemServiceImpl.java

@@ -272,7 +272,7 @@ public class ITicketSystemServiceImpl implements ITicketSystemService {
         HashMap<String, String> params = CollectionUtil.mapStringString();
         params.put("accessToken", accessToken);
         params.put("orderId", insertOrderParam.getOrderId());
-        params.put("orderTime", DateUtil.Formatter.yyyyMMddHHmmss.format(insertOrderParam.getOrderTime()));
+        params.put("orderTime", insertOrderParam.getOrderTime());
         params.put("channelType", insertOrderParam.getChannelType().toString());
         params.put("channelName", insertOrderParam.getChannelName());
         params.put("ticketNum", insertOrderParam.getTicketNum().toString());