修改下单 提示和增加回滚库存文案

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

@@ -73,9 +73,7 @@ public class KylinPerformanceVo {
     private Integer isRecommend;
     @ApiModelProperty(value = "状态")
     private Integer appStatus;
-    @ApiModelProperty(value = "状态 [1正常|2非正常]")
-    private Integer status_sell;
-    @ApiModelProperty(value = "是否可买")
+    @ApiModelProperty(value = "是否可买 状态 [1正常|2非正常]")
     private Integer statusSell;
     @ApiModelProperty(value = "是否关联会员")
     private Integer isMember;
@@ -141,9 +139,9 @@ public class KylinPerformanceVo {
         this.approvalUrl = performance.getApprovalUrl();
         this.rejectTxt = performance.getRejectTxt();
         if (performance.getApprovalUrl() == null || performance.getApprovalUrl().isEmpty()) {
-            this.status_sell = 0;
+            this.statusSell = 0;
         } else {
-            this.status_sell = 1;
+            this.statusSell = 1;
         }
     }
 

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

@@ -231,28 +231,27 @@ public class MongoMerchantUtils {
                 ),
                 MerchantAuthorizationPerformanceVo.class, MerchantAuthorizationPerformanceVo.class.getSimpleName());
         List<String> performanceIdList = permissionVoList.stream().map(MerchantAuthorizationPerformanceVo::getPerformanceId).collect(Collectors.toList());
-        //        List<String> performanceIdList = new ArrayList<>();
-        //        performanceIdList.add("393126530855854085960596");
-        //        performanceIdList.add("324470932321198083852669");
-        //        performanceIdList.add("324517967623741449058314");
 
         //查询演出
         Criteria criteria = Criteria.where("performancesId").in(performanceIdList);
-//        if (performancePartnerListParam.getTitle() != null && !performancePartnerListParam.getTitle().isEmpty()) {
-//            criteria = criteria.where("title").regex(".*" + performancePartnerListParam.getTitle() + ".*");
-//        }
-//        if (performancePartnerListParam.getSize() != null && !performancePartnerListParam.getTitle().isEmpty()) {
-//            criteria = criteria.where("title").regex(".*" + performancePartnerListParam.getTitle() + ".*");
-//        }
-//        if (performancePartnerListParam.getTimeStart() != null && !performancePartnerListParam.getTitle().isEmpty()) {
-//            criteria = criteria.where("title").regex(".*" + performancePartnerListParam.getTitle() + ".*");
-//        }
-//        if (performancePartnerListParam.getOrderType() != null && !performancePartnerListParam.getTitle().isEmpty()) {
-//            criteria = criteria.where("title").regex(".*" + performancePartnerListParam.getTitle() + ".*");
-//        }
-//        if (performancePartnerListParam.getStopSellDay() != -2 && !performancePartnerListParam.getTitle().isEmpty()) {
-//            criteria = criteria.where("title").regex(".*" + performancePartnerListParam.getTitle() + ".*");
-//        }
+        if (performancePartnerListParam.getTitle() != null && !performancePartnerListParam.getTitle().isEmpty()) {
+            criteria = criteria.and("title").regex(".*" + performancePartnerListParam.getTitle() + ".*");
+        }
+        if (performancePartnerListParam.getStatus() != null) {
+            if(performancePartnerListParam.getStatus()==0){
+                criteria = criteria.and("appStatus").is(0);
+            }else{
+                if(performancePartnerListParam.getStatus()!=-2){
+                    criteria = criteria.and("appStatus").is(performancePartnerListParam.getStatus());
+                }
+                if (performancePartnerListParam.getTimeStart() != null && !performancePartnerListParam.getTimeStart().isEmpty()) {
+                    criteria = criteria.and("timeStart").gte(performancePartnerListParam.getTimeStart()).and("timeStart").lte(performancePartnerListParam.getTimeEnd());
+                }
+//                if (performancePartnerListParam.getStopSellDay() != -2) {
+//                    criteria = criteria.and("timeEnd").gte(performancePartnerListParam.getStopSellDay()).and("timeEnd").lte(DateUtil.getNowTime());
+//                }
+            }
+        }
         List<KylinPerformanceVo> performanceVos = mongoTemplate.find(
                 Query.query(criteria)
                         .with(Sort.by(orderBy, performancePartnerListParam.getOrderItem()))