Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java

@@ -261,6 +261,7 @@ public class KylinBannersAdminController extends BaseController {
         ossClient.putObject(putObjectRequest);
 
         ossClient.shutdown();
+        file.delete();
 
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
         objectObjectHashMap.put("uploadpath", uploadpath);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml

@@ -39,7 +39,7 @@ liquidnet:
     url1: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
     url2: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
     url5: "https://devmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
-    url6: "https://devkylin.zhengzai.tv/kylin/performances/roadShow/performance/status?pageNum=1&pageSize=50&status=3,6,7,8,9,10&title=''" #票务
+    url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
     url7: "https://devmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
     url8: "https://devkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
     url13: "https://devmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml

@@ -32,7 +32,7 @@ liquidnet:
     url1: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
     url2: "https://mediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
     url5: "https://mall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
-    url6: "https://kylin.zhengzai.tv/kylin/performances/roadShow/performance/status?pageNum=1&pageSize=50&status=3,6,7,8,9,10&title=''" #票务
+    url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
     url7: "https://mall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
     url8: "https://kylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
     url13: "https://mall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml

@@ -39,7 +39,7 @@ liquidnet:
     url1: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
     url2: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
     url5: "https://testmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
-    url6: "https://testkylin.zhengzai.tv/kylin/kylin/performances/roadShow/performance/status?pageNum=1&pageSize=50&status=3,6,7,8,9,10&title=''" #票务
+    url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
     url7: "https://testmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
     url8: "https://testkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
     url13: "https://testmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html

@@ -305,6 +305,8 @@
             } else {
                 var urlVarName = 'url' + targetType;
                 var url = eval(urlVarName);
+                var arrEntities = {'lt':'<','gt':'>','nbsp':' ','amp':'&','quot':'"'};
+                url = url.replace(/&(lt|gt|nbsp|amp|quot);/ig,function(all,t){return arrEntities[t];});
                 // 获取相关数据
                 var configUrl = {
                     url: url,
@@ -318,7 +320,7 @@
                         var data = [];
                         var html = '<option value="">--请选择--</option>';
                         if (6 == targetType) {
-                            data = result.rows;
+                            data = result.value;
                             for (var i = 0, l = data.length; i < l; i++) {
                                 html += '<option value="' + data[i].performancesId + '">' + data[i].title + '</option>';
                             }
@@ -327,6 +329,16 @@
                             for (var i = 0, l = data.length; i < l; i++) {
                                 html += '<option value="' + data[i].roadShowId + '">' + data[i].title + '</option>';
                             }
+                        } else if(24 == targetType) {
+                            data = result.data;
+                            for (var i = 0, l = data.length; i < l; i++) {
+                                html += '<option value="' + data[i].id + '">' + data[i].collect_name + '</option>';
+                            }
+                        } else if(26 == targetType) {
+                            data = result.data;
+                            for (var i = 0, l = data.length; i < l; i++) {
+                                html += '<option value="' + data[i].id + '">' + data[i].name + '</option>';
+                            }
                         } else {
                             data = result.data
                             for (var i = 0, l = data.length; i < l; i++) {

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

@@ -120,7 +120,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
 
         // todo 出票未出票
         // 选择退款的入场人是否正确
-        Integer[] entitiesStatus = new Integer[]{KylinTableStatusConst.ENTITIES_IS_PAYMENT1, KylinTableStatusConst.ENTITIES_IS_PAYMENT2};
+        Integer[] entitiesStatus = new Integer[]{KylinTableStatusConst.ENTITIES_IS_PAYMENT1, KylinTableStatusConst.ENTITIES_IS_PAYMENT2, KylinTableStatusConst.ENTITIES_IS_PAYMENT4};
         int choiceCount = kylinOrderTicketEntitiesMapper.selectCount(
                 new QueryWrapper<KylinOrderTicketEntities>()
                         .eq("order_id", orderTicketsId)
@@ -250,7 +250,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             case "approved":
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
                 break;
-            case "Reject":
+            case "reject":
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
                 break;
             case "unfilled":
@@ -369,8 +369,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 new QueryWrapper<KylinPerformances>().eq("performances_id", kylinOrderTicketRelations.getPerformanceId())
         );
 
-        List<KylinOrderTicketEntitiesDao> entitiesList = kylinOrderTicketEntitiesMapper.getRefundEntitiesList(kylinOrderTickets.getOrderTicketsId());
-        if(entitiesList.size() > 0) {
+        List<KylinOrderTicketEntitiesDao> entitiesListTemp = kylinOrderTicketEntitiesMapper.getRefundEntitiesList(kylinOrderTickets.getOrderTicketsId());
+        List<KylinOrderTicketEntitiesDao> entitiesList = new ArrayList<>();
+        if(entitiesListTemp.size() > 0) {
             double priceActual = kylinOrderTickets.getPriceActual().doubleValue();
             double priceExpress = kylinOrderTickets.getPriceExpress().doubleValue();
             int allEntitiesCount = kylinOrderTicketEntitiesMapper.selectCount(// 总入场人数量 排出未付款的 用来计算单入场人的价格
@@ -379,7 +380,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                             .ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
             );
             double onePrice = (priceActual - priceExpress) / allEntitiesCount;//单价
-            for (KylinOrderTicketEntitiesDao entities : entitiesList) {
+            for (KylinOrderTicketEntitiesDao entities : entitiesListTemp) {
                 Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退 包含退款中
                         kylinOrderTickets.getOrderTicketsId(),
                         KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL,
@@ -392,6 +393,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                     canRefundedPrice = onePrice;
                 }
                 entities.setCanRefundedPrice(BigDecimal.valueOf(canRefundedPrice));
+                if (canRefundedPrice > 0) { // 退款中但是可退款金额为0不展示
+                    entitiesList.add(entities);
+                }
             }
         }
 

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

@@ -206,7 +206,7 @@ public class KylinRefundsStatusServiceImpl {
                 KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
                         new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
                 );
-                if (orderInfo.getRefundNumber() > 0) { // 已经有退完的 那就是部分退款了
+                if (orderInfo.getPriceRefund().doubleValue() > 0) { // 已经有退完的 那就是部分退款了
                     newStatus = KylinTableStatusConst.ORDER_STATUS6;
                 } else {
                     newStatus = KylinTableStatusConst.ORDER_STATUS1;
@@ -298,7 +298,7 @@ public class KylinRefundsStatusServiceImpl {
                 kylinOrderRefunds.setAuditorAt(LocalDateTime.now());
                 kylinOrderRefunds.setReject(reject);
                 break;
-            case "Reject":
+            case "reject":
                 kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT);
                 kylinOrderRefunds.setAuditorId(authId);
                 kylinOrderRefunds.setAuditorName(authName);

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

@@ -71,18 +71,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                     isShow = false;
                 }
             }
-            if (null != isExclusive) {
-                if (info.getIsExclusive() != isExclusive) {
-                    isShow = false;
-                }
-            }
-            if (null != isDiscount) {
-                if (info.getIsDiscount() != isDiscount) {
-                    isShow = false;
-                }
-            }
-            if (null != isAdvance) {
-                if (info.getIsAdvance() != isAdvance) {
+            if (null != isExclusive || null != isDiscount || null != isAdvance) {
+                if (info.getIsExclusive() != isExclusive && info.getIsDiscount() != isDiscount && info.getIsAdvance() != isAdvance) {
                     isShow = false;
                 }
             }
@@ -98,7 +88,17 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             List<KylinPerformanceVo> performancesListRecommend = dataUtils.getPerformancesListIsSystemRecommend();
             if (performancesListRecommend.size() > 0) {
                 is_native = 0;
-                performancesListNew.addAll(performancesListRecommend);
+                if(recommend > 0) {// 去重
+                    for(KylinPerformanceVo recommendInfo : performancesListRecommend) {
+                        for(KylinPerformanceVo info : performancesListNew) {
+                            if (recommendInfo.getPerformancesId() != info.getPerformancesId()) {
+                                performancesListNew.add(recommendInfo);
+                            }
+                        }
+                    }
+                } else {
+                    performancesListNew.addAll(performancesListRecommend);
+                }
             }
         }