提交 第三方 演出上票迁移

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

@@ -46,22 +46,22 @@ public class PerformancePartnerListParam {
         this.orderType = orderType;
         switch (orderType) {
             case 1: {
-                orderItem = "created_at";
+                orderItem = "createdAt";
                 orderSc = "desc";
                 break;
             }
             case 2: {
-                orderItem = "created_at";
+                orderItem = "createdAt";
                 orderSc = "asc";
                 break;
             }
             case 3: {
-                orderItem = "time_start";
+                orderItem = "timeStart";
                 orderSc = "desc";
                 break;
             }
             case 4: {
-                orderItem = "time_start";
+                orderItem = "timeStart";
                 orderSc = "asc";
                 break;
             }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -106,6 +106,8 @@ public class KylinPerformanceVo {
 
     @ApiModelProperty(value = "分销人名称")
     private String agentName;
+    @ApiModelProperty(value = "注册时间")
+    private String createdAt;
 
     private Integer isCanRefund;
     private Integer isOpenRefundPresent;
@@ -129,6 +131,7 @@ public class KylinPerformanceVo {
         this.imgPoster = performance.getImgPoster();
         this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(performance.getTimeStart());
         this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(performance.getTimeEnd());
+        this.createdAt = DateUtil.Formatter.yyyyMMddHHmmss.format(performance.getCreatedAt());
         this.type = performance.getType();
         this.details = performance.getDetails();
         this.noticeImage = performance.getNoticeImage();

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform-dev.yml

@@ -15,10 +15,10 @@ liquidnet:
   rabbitmq:
     connection-timeout: 5000
   mysql:
-    database-name: test_ln_scene
+    database-name: dev_ln_scene
   mongodb:
     sslEnabled: false
-    database: test_ln_scene
+    database: dev_ln_scene
   al-oss:
     imgUrl: "https://img.zhengzai.tv/"
     appUrl: "https://app.zhengzai.tv/"

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

@@ -14,12 +14,17 @@ public class PerformancePartnerListDao {
     private String timeEnd;
     private Integer totalGeneral;
     private Integer saleGeneral;
+    private Integer number;
+    private Integer refundNumber;
+    private BigDecimal priceActual;
+    private BigDecimal priceRefund;
     private BigDecimal totalSalePrice;
     private Integer surplusGeneral;
     private Integer status;
     private Integer type;
     private String timeSell;
     private String timeStop;
+    private Integer payCountdownMinute;
     private Integer auditStatus;
     private String rejectTxt;
     private String createdAt;

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/KylinBuyNoticeParnterController.java

@@ -6,6 +6,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
 import com.liquidnet.service.merchant.util.InnerUtils;
+import com.liquidnet.service.merchant.util.MongoMerchantUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/PerformancePartnerController.java

@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
 import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
+import com.liquidnet.service.merchant.util.MongoMerchantUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -30,6 +31,8 @@ public class PerformancePartnerController {
 
     @Autowired
     private IKylinPerformancesPartnerService performancesPartnerService;
+    @Autowired
+    MongoMerchantUtils mongoMerchantUtils;
 
     @PostMapping(value = "list")
     @ApiOperation(value = "演出列表",position = 1)

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinPerformancesPartnerServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.aggregation.LookupOperation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -210,9 +211,9 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             LocalDateTime createdAt = LocalDateTime.now();
 
             boolean isExistsSubmit = mongoMerchantUtils.isExistsSubmitPerformancePartner(performanceId);
-//            if (isExistsSubmit) {
-//                return ResponseDto.failure(ErrorMapping.get(20112));
-//            }
+            if (isExistsSubmit) {
+                return ResponseDto.failure(ErrorMapping.get(20112));
+            }
 
             //演出修改数据
             PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
@@ -559,20 +560,23 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             try {
                 PageHelper.startPage(performancePartnerListParam.getPage(), performancePartnerListParam.getSize());
                 //TODO 待做
-//                List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam));
-//                for (int i = 0; i < voList.size(); i++) {
-//                    PerformancePartnerListDao vo = voList.get(i);
-//                    if (vo.getStatus() >= 6 && vo.getStatus() != 7) {
-//                        if (DateUtil.compareStrDay(vo.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
-//                            vo.setStatus(9);
-//                        } else if (DateUtil.compareStrDay(vo.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
-//                            vo.setStatus(10);
-//                        } else {
-//                            vo.setStatus(6);
-//                        }
-//                    }
-//                }
-                pageInfoTmp = new PageInfo(null);
+                List<PerformancePartnerListDao> voList = mongoMerchantUtils.getPerformanceList(performancePartnerListParam);
+                for (int i = 0; i < voList.size(); i++) {
+                    PerformancePartnerListDao vo = voList.get(i);
+                    vo.setSaleGeneral(vo.getNumber() - vo.getRefundNumber());
+                    vo.setTotalSalePrice(vo.getPriceActual().subtract(vo.getPriceRefund()));
+                    vo.setSurplusGeneral(vo.getTotalGeneral() - vo.getSaleGeneral());
+                    if (vo.getStatus() >= 6 && vo.getStatus() != 7) {
+                        if (DateUtil.compareStrDay(vo.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
+                            vo.setStatus(9);
+                        } else if (DateUtil.compareStrDay(vo.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
+                            vo.setStatus(10);
+                        } else {
+                            vo.setStatus(6);
+                        }
+                    }
+                }
+                pageInfoTmp = new PageInfo(voList);
             } catch (Exception e) {
                 e.printStackTrace();
                 return ResponseDto.failure(ErrorMapping.get(20104));

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/MongoMerchantUtils.java

 package com.liquidnet.service.merchant.util;
 
+import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+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.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
@@ -9,13 +12,20 @@ import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.aggregation.LookupOperation;
 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.Component;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -182,4 +192,46 @@ public class MongoMerchantUtils {
         );
         return docTicket;
     }
+
+    public List<PerformancePartnerListDao> getPerformanceList(PerformancePartnerListParam performancePartnerListParam) {
+        performancePartnerListParam.setOrderType(performancePartnerListParam.getOrderType());
+        //分页排序
+        Sort.Direction orderBy = Sort.Direction.DESC;
+        if (performancePartnerListParam.getOrderSc().equals("asc")) {
+            orderBy = Sort.Direction.ASC;
+        }
+        Aggregation aggregation = Aggregation.newAggregation(
+                Aggregation.project("performancesId", "title", "timeStart", "timeEnd", "timeSell", "timeStop", "totalGeneral", "saleGeneral", "totalSalePrice",
+                        "surplusGeneral", "status", "type", "auditStatus", "rejectTxt", "createdAt","payCountdownMinute",
+                        "ticketTimeList", "ticketList","appStatus",
+                        "performanceId", "couponType", "transferStatus", "number", "refundNumber", "priceActual", "priceRefund"),
+                Aggregation.lookup(KylinOrderTicketVo.class.getSimpleName(),"performanceId","performancesId","o"),
+                Aggregation.match(Criteria.where("o.status").in(0, 1, 3, 6).and("o.couponType").is("no").and("o.transferStatus").in(0, 1, 2, 5)),
+                Aggregation.unwind("ticketTimeList"),
+                Aggregation.unwind("ticketTimeList.ticketList"),
+                Aggregation.group("performancesId").first("performancesId").as("performancesId")
+                        .first("title").as("title")
+                        .first("timeStart").as("timeStart")
+                        .first("timeEnd").as("timeEnd")
+                        .first("type").as("type")
+                        .first("rejectTxt").as("rejectTxt")
+                        .first("createdAt").as("createdAt")
+                        .first("appStatus").as("status")
+                        .first("auditStatus").as("auditStatus")
+                        .first("payCountdownMinute").as("payCountdownMinute")
+                        .min("ticketTimeList.ticketList.timeStart").as("timeSell")
+                        .sum("totalGeneral").as("totalGeneral")
+                        .sum("o.number").as("number")
+                        .sum("o.refundNumber").as("refundNumber")
+                        .sum("o.priceActual").as("priceActual")
+                        .sum("o.priceRefund").as("priceRefund")
+                        .max("ticketTimeList.ticketList.timeEnd").as("timeStop"),
+                Aggregation.skip((performancePartnerListParam.getPage() - 1) * performancePartnerListParam.getSize()),
+                Aggregation.limit(performancePartnerListParam.getSize()),
+                Aggregation.sort(orderBy,performancePartnerListParam.getOrderItem())
+        );
+        AggregationResults<PerformancePartnerListDao> outputType = mongoTemplate.aggregate(aggregation, KylinPerformanceVo.class.getSimpleName(), PerformancePartnerListDao.class);
+        List<PerformancePartnerListDao> list = outputType.getMappedResults();
+        return list;
+    }
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/PerformanceUtils.java

@@ -287,12 +287,12 @@ public class PerformanceUtils {
             del1.add(new Object[]{performances.getPerformancesId()});
             Object[] obj_array1 = BeanUtil.convertBeanToMap(performances).values().toArray();
             insert1.add(obj_array1);
-            log.debug("performance:"+obj_array1);
+            log.debug("performance:"+obj_array1.toString());
 
             del2.add(new Object[]{performances.getPerformancesId()});
             Object[] obj_array2 = BeanUtil.convertBeanToMap(performanceStatus).values().toArray();
             insert2.add(obj_array2);
-            log.debug("performanceStatus:"+obj_array2);
+            log.debug("performanceStatus:"+obj_array2.toString());
 
             del3.add(new Object[]{performances.getPerformancesId()});
             Object[] obj_array3 = BeanUtil.convertBeanToMap(performanceRelations).values().toArray();

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties

@@ -36,20 +36,20 @@ kylin_performances.del=DELETE FROM kylin_performances WHERE performances_id = ?
 kylin_performance_status.del=DELETE FROM kylin_performance_status WHERE performance_id = ?
 kylin_performance_relations.del=DELETE FROM kylin_performance_relations WHERE performance_id = ?
 
-kylin_performances.insert=DELETE FROM kylin_performances WHERE performances_id = ?
-kylin_performance_status.insert=DELETE FROM kylin_performance_status WHERE performance_id = ?
-kylin_performance_relations.insert=DELETE FROM kylin_performance_relations WHERE performance_id = ?
+kylin_performances.insert=INSERT INTO kylin_performances (performances_id,title,type,imgPoster,province_id,province_name,city_id,city_name,district_id,district_name,approval_url,notice,sponsor_id,sponsor_type,sponsor,contacts,mobile,describes,details,notice_image,time_start,time_end,audit_time,reject_txt,sort,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_performance_status.insert=INSERT INTO kylin_performance_status (performance_status_id,performance_id,is_show,status,status_sell,is_distribution,sync_agent,sync_damai,audit_status,is_true_name,limit_count,limit_count_member,is_recommend,is_can_refund,is_open_refund_present,refund_open_time,refund_close_time,is_transfer,transfer_start_time,transfer_end_time,is_refund_poundage,is_refund_voucher,is_refund_express,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_performance_relations.insert=INSERT INTO kylin_performance_relations (performance_relations_id,performance_id,copy_id,merchant_id,field_id,road_show_id,project_id,video_id,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)
 
 kylin_ticket_times.del=DELETE FROM kylin_ticket_times WHERE ticket_times_id = ?
 kylin_ticket_time_relation.del=DELETE FROM kylin_ticket_time_relation WHERE times_id = ?
 
-kylin_ticket_times.insert=DELETE FROM kylin_ticket_times WHERE ticket_times_id = ?
-kylin_ticket_time_relation.insert=DELETE FROM kylin_ticket_time_relation WHERE times_id = ?
+kylin_ticket_times.insert=INSERT INTO kylin_ticket_times (ticket_times_id,title,status,type,use_start,use_end,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?)
+kylin_ticket_time_relation.insert=INSERT INTO kylin_ticket_time_realtion (ticket_time_relation_id,times_id,performance_id,created_at,updated_at) VALUES (?,?,?,?,?)
 
 kylin_tickets.del=DELETE FROM kylin_tickets WHERE tickets_id = ?
 kylin_ticket_status.del=DELETE FROM kylin_ticket_status WHERE ticket_id = ?
 kylin_ticket_relations.del=DELETE FROM kylin_ticket_relations WHERE ticket_id = ?
 
-kylin_tickets.insert=DELETE FROM kylin_tickets WHERE tickets_id = ?
-kylin_ticket_status.insert=DELETE FROM kylin_ticket_status WHERE ticket_id = ?
-kylin_ticket_relations.insert=DELETE FROM kylin_ticket_relations WHERE ticket_id = ?
+kylin_tickets.insert=INSERT INTO kylin_tickets (tickets_id,title,type,prcie,price_express,price_discount_member,price_discount,describes,describe_express,describe_electronic,advance_minute_member,time_start,time_end,time_end_express,use_start,use_end,pay_countdown_minute,sale_remind_minute,comment,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_ticket_status.insert=INSERT INTO kylin_ticket_status (ticket_status_id,ticket_id,is_student,is_electronic,is_express,status,counts,status_exchange,is_show_code,qr_code_show_time,is_lack_register,total_general,total_exchange,surplus_general,surplus_exchange,express_type,is_transfer,is_true_name,limit_count,member_limit_count,is_exclusive,is_member,is_agent,sync_damai,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_ticket_relations.insert=INSERT INTO kylin_ticket_relations (ticket_relations_id,ticket_id,times_id,created_at,updated_at) VALUES (?,?,?,?,?)