Merge branch 'pre' into 'master'

Pre

See merge request !67

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

 package com.liquidnet.service.kylin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
@@ -15,4 +16,12 @@ import java.util.List;
  * @since 2021-05-05
  */
 public interface IKylinPerformancesService  {
+
+    /**
+     * 根据 券适用范围查询演出id
+     * @param useScope
+     * @param busiId
+     * @return
+     */
+    ResponseDto<String> getPerformanceIdByInfo(Integer useScope,String busiId);
 }

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

@@ -6,10 +6,13 @@ import com.liquidnet.service.kylin.entity.KylinTickets;
 public interface DamaiService {
     //同步演出
     Boolean sycPerformance(String performanceId);
+
     //同步场次
-    Boolean sycTimes(long performanceId, KylinTicketTimes timesData);
+    Boolean sycTimes(long performanceId, KylinTicketTimes timesData, Long venueId);
+
     //同步票
     Boolean sycTicket(long timeId, KylinTickets ticketsData);
+
     //订单
-    Boolean sycOrder(long timeId, String ticketsId,long ticketsmId);
+    Boolean sycOrder(long timeId, String ticketsId, long ticketsmId);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html

@@ -106,6 +106,28 @@
 <!--                    <i class="fa fa-download"></i> 导出-->
 <!--                </a>-->
 <!--            </div>-->
+
+            <div class="col-sm-12 search-collapse">
+                <form id="formId2">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>短订单号：</label>
+                                <input type="text" name="findCode"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="findCode()"><i
+                                        class="fa fa-search"></i>&nbsp;查询</a>
+                            </li>
+                            <li>
+                                <label>长订单号：</label>
+                                <input type="text" name="allCode" readonly/>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
             <div class="col-sm-12 select-table table-bordered">
                 <table id="bootstrap-table"></table>
             </div>
@@ -122,6 +144,16 @@
         var getTicketTypeDic = [[${@dict.getType('zhengzai_get_ticket_type')}]];
         var payTypeDic = [[${@dict.getType('zhengzai_pay_type')}]];
 
+        var prefix2 = ctx + "kylin/refund";
+
+        function findCode() {
+            var shortCode = document.getElementsByName("findCode")[0].value;
+            var allCode = document.getElementsByName("allCode")[0];
+            $.operate.get(prefix2 + "/search/code?code=" + shortCode + "&type=2", function (res) {
+                allCode.value = res.msg;
+            });
+        }
+
         $(function() {
             var options = {
                 url: prefix + "/list",

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-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java

@@ -40,6 +40,7 @@ public class CouponBaseUtil {
         vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setUsedFor(dtoItem.getUsedFor());
         //适用范围 规则
+        if (dtoItem.getUseRules() != null) {
             for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {
                 CandyCouponRulesVo voRules = CandyCouponRulesVo.getNew();
                 voRules.setUseScope(ruleItem.getUseScope());
@@ -47,6 +48,7 @@ public class CouponBaseUtil {
                 voRules.setBusiName(ruleItem.getBusiName());
                 rulesVoList.add(voRules);
             }
+        }
         //券类别
         if (dtoItem.getBusiType().equals(3)) {
             vo.setCouType(101);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java

@@ -8,6 +8,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
 import com.liquidnet.service.kylin.service.IKylinLackRegistersService;
+import com.liquidnet.service.kylin.service.IKylinPerformancesService;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -40,6 +41,8 @@ public class KylinPerformancesController {
     private KylinPerformancesServiceImpl kylinPerformancesService;
     @Autowired
     private IKylinLackRegistersService kylinLackRegistersService;
+    @Autowired
+    private IKylinPerformancesService iKylinPerformancesService;
 
     @GetMapping("localList")
     @ApiOperation("本地演出列表")
@@ -233,7 +236,17 @@ public class KylinPerformancesController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "performancesId", value = "演出id", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "ticketsId", value = "票种id", required = true)
     })
-    public ResponseDto<String> addLackRegister(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId){
-        return kylinLackRegistersService.addLackRegister(performancesId,ticketsId);
+    public ResponseDto<String> addLackRegister(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId) {
+        return kylinLackRegistersService.addLackRegister(performancesId, ticketsId);
+    }
+
+    @GetMapping("couponPerformanceId")
+    @ApiOperation("根据券信息获取演出id")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "useScope", value = "适用范围[91-场次｜92-票]", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "busiId", value = "使用Id", required = true)
+    })
+    public ResponseDto<String> addLackRegister(@RequestParam("useScope") Integer useScope, @RequestParam("busiId") String busiId) {
+        return iKylinPerformancesService.getPerformanceIdByInfo(useScope, busiId);
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -5,11 +5,17 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.DistanceUtil;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
+import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 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.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;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
 import com.liquidnet.service.kylin.utils.DataUtils;
@@ -421,6 +427,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         }
         return newList;
     }
+
     public List<KylinPerformanceVo> checkAppStatusRoad(List<KylinPerformanceVo> list) {
         List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();
         if (!CollectionUtils.isEmpty(list)) {
@@ -595,8 +602,10 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         }
         return isMemberStatus;
     }
+
     /**
      * 获取我的已购票演出列表
+     *
      * @return
      */
     public List<KylinPerformanceVo> myPerformancesList() {
@@ -604,4 +613,33 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         List<KylinPerformanceVo> performanceVoList = dataUtils.myPerformancesList(userId);
         return performanceVoList;
     }
+
+    @Override
+    public ResponseDto<String> getPerformanceIdByInfo(Integer useScope, String busiId) {
+        if (useScope.equals(91)) {//场次
+            List<KylinTicketTimesPartnerVo> voTimes = mongoTemplate.find(Query.query(Criteria.where("ticketTimesId").is(busiId)),
+                    KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+            if(voTimes.size()<=0){
+                return ResponseDto.failure();
+            }else{
+                return ResponseDto.success(voTimes.get(0).getPerformancesId());
+            }
+        } else if (useScope.equals(92)) {//票
+            List<KylinTicketPartnerVo> voTickets = mongoTemplate.find(Query.query(Criteria.where("ticketsId").is(busiId)),
+                    KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
+            if(voTickets.size()<=0) {
+                return ResponseDto.failure();
+            }else{
+                List<KylinTicketTimesPartnerVo> voTimes = mongoTemplate.find(Query.query(Criteria.where("ticketTimesId").is(voTickets.get(0).getTimesId())),
+                        KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+                if(voTimes.size()<=0){
+                    return ResponseDto.failure();
+                }else{
+                    return ResponseDto.success(voTimes.get(0).getPerformancesId());
+                }
+            }
+        } else {
+            return ResponseDto.failure();
+        }
+    }
 }

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

@@ -542,7 +542,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         try {
             KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
 
-            if (performanceStatusData.getStatus() >= 3 && performanceStatusData.getStatus() != 4 && performanceStatusData.getStatus() != 7 && performanceStatusData.getStatus() != 10) {//未提审||被拒绝
+            if (performanceStatusData.getStatus() >= 3 && performanceStatusData.getStatus() != 4 && performanceStatusData.getStatus() != 7) {//未提审||被拒绝   && performanceStatusData.getStatus() != 10
                 LocalDateTime updatedAt = LocalDateTime.now();
                 KylinPerformanceStatus performanceStatus = KylinPerformanceStatus.getNew();
                 performanceStatus.setStatus(7);

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,10 @@ 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")),
+                        .with(Sort.by(Sort.Direction.ASC, "createdAt")),
+                KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
     }
 
     @Override