Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

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

@@ -5,9 +5,9 @@ import com.liquidnet.service.kylin.dto.vo.tmp.CourierListVo;
 
 public interface DamaiService {
     //同步演出
-    ResponseDto<Boolean> sycPerformance(String performanceId);
+    Boolean sycPerformance(String performanceId);
     //同步场次
-    ResponseDto<Boolean> sycTimes(String timeId);
+    Boolean sycTimes(String timeId);
     //同步票
-    ResponseDto<Boolean> sycTicket(String ticketId);
+    Boolean sycTicket(String ticketId);
 }

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

@@ -8,6 +8,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.json.JSON;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceOrderStatisCountResp;
+import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinDamaiServiceImpl;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
@@ -43,6 +44,9 @@ public class KylinPerformancesController extends BaseController {
     @Autowired
     private KylinPerformancesAdminServiceImpl kylinPerformancesService;
 
+    @Autowired
+    private KylinDamaiServiceImpl damaiService;
+
     @RequiresPermissions("kylin:performances:view")
     @GetMapping()
     public String performances() {
@@ -161,4 +165,12 @@ public class KylinPerformancesController extends BaseController {
         boolean result = kylinPerformancesService.changeSysDamai(data);
         return toAjax(result);
     }
+
+    @RequiresPermissions("kylin:performances:damai")
+    @PostMapping(value = "/sync/damai")
+    @ResponseBody
+    public AjaxResult syncDamai(@RequestParam("performancesId") String performancesId) {
+        boolean result = damaiService.sycPerformance(performancesId);
+        return toAjax(result);
+    }
 }

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

@@ -46,17 +46,17 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 
 
     @Override
-    public ResponseDto<Boolean> sycPerformance(String performanceId) {
-        return null;
+    public Boolean sycPerformance(String performanceId) {
+        return false;
     }
 
     @Override
-    public ResponseDto<Boolean> sycTimes(String timeId) {
-        return null;
+    public Boolean sycTimes(String timeId) {
+        return false;
     }
 
     @Override
-    public ResponseDto<Boolean> sycTicket(String ticketId) {
-        return null;
+    public Boolean sycTicket(String ticketId) {
+        return false;
     }
 }

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

@@ -19,6 +19,7 @@ public class PerformanceAdminListDao {
     private Integer saleGeneral;
     private Integer totalSalePrice;
     private Integer surplusGeneral;
+    private Integer syncDamai;
     private String rejectTxt;
     private Integer sort;
     private String createdAt;

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -73,6 +73,11 @@ public class KylinOrderTickets implements Serializable {
      */
     private String orderType;
 
+    /**
+     * 下单来源
+     */
+    private String orderSource;
+
     /**
      * 下单版本
      */

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -34,6 +34,7 @@
         <result column="sort" property="sort"/>
         <result column="audit_time" property="auditTime"/>
         <result column="sponsor" property="sponsor"/>
+        <result column="sync_damai" property="syncDamai"/>
         <result column="created_at" property="createdAt"/>
     </resultMap>
 
@@ -178,6 +179,7 @@
         p.type,
         p.time_start ,
         p.time_end ,
+        ps.sync_damai ,
         IFNULL(t.total_general , 0) AS 'total_general' ,
         IFNULL(ot.sale_general , 0) AS 'sale_general' ,
         IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -419,6 +419,7 @@ CREATE TABLE `kylin_order_tickets`
     `pay_code`             varchar(255)  NOT NULL DEFAULT '' COMMENT '支付单号',
     `qr_code`              varchar(255)  NOT NULL DEFAULT '' COMMENT '二维码地址',
     `order_type`           varchar(255)  NOT NULL DEFAULT '' COMMENT '下单方式',
+    `order_source`        varchar(255)  NOT NULL DEFAULT '' COMMENT '下单来源',
     `order_version`        varchar(255)  NOT NULL DEFAULT '' COMMENT '下单版本',
     `number`               int(32) NOT NULL DEFAULT 0 COMMENT '数量',
     `price`                decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '单价',

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

@@ -38,6 +38,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Api(tags = "验票")
@@ -105,13 +106,15 @@ public class KylinStationController {
     @ApiOperation(value = "演出列表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mod", value = "模块[recent-近期的,over-历史]", allowableValues = "recent,over"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "match", value = "匹配字符[title|cityName|fieldName]"),
             @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageNo", value = "页码", example = "1"),
             @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "pageSize", value = "页记录数", example = "5"),
     })
     @GetMapping("performances")
     public ResponseDto<PageInfo<KylinStationPerformanceVo>> performances(@RequestParam String mod,
-                                                                     @RequestParam(defaultValue = "1", required = false) int pageNo,
-                                                                     @RequestParam(defaultValue = "5", required = false) int pageSize) {
+                                                                         @RequestParam(required = false) String match,
+                                                                         @RequestParam(defaultValue = "1", required = false) int pageNo,
+                                                                         @RequestParam(defaultValue = "5", required = false) int pageSize) {
         List<KylinStationPerformanceVo> voList = new ArrayList<>();
         String currentUid = CurrentUtil.getCurrentUid();
         long count = 0;
@@ -124,25 +127,34 @@ public class KylinStationController {
                 if (!CollectionUtils.isEmpty(performanceRelationList)) {
                     LocalDateTime tmpDt = LocalDateTime.of(LocalDate.now(), LocalTime.of(0, 0, 0, 0));
                     String tmpDtStr = DateUtil.format(tmpDt, DateUtil.Formatter.yyyyMMddHHmmss);
-                    Query performancesVoQuery = Query.query(Criteria.where("performancesId").in(
+                    Criteria criteria = Criteria.where("performancesId").in(
                             performanceRelationList.stream().map(CheckPerformanceRelationParam::getPerformanceId).toArray()
-                    ));
+                    );
                     switch (mod) {
                         case "recent":
-                            log.info(":::performances/recent:{}", currentUid);
-                            performancesVoQuery.addCriteria(Criteria.where("timeEnd").gt(tmpDtStr));
+                            log.debug(":::performances/recent:{},match:{}", currentUid, match);
+                            criteria.andOperator(Criteria.where("timeEnd").gt(tmpDtStr));
                             break;
 //                        case "down":
 //                            log.info(":::performances/down:{}", currentUid);
 //                            break;
                         case "over":
                             log.info(":::performances/over:{}", currentUid);
-                            performancesVoQuery.addCriteria(Criteria.where("timeEnd").lte(tmpDtStr));
+                            criteria.andOperator(Criteria.where("timeEnd").lte(tmpDtStr));
                             break;
                         default:
                             log.info(":::performances/default:{}", currentUid);
                             return ResponseDto.success(new PageInfo<>());
                     }
+                    if (StringUtils.isNotBlank(match)) {
+                        Pattern pattern = Pattern.compile("^.*" + match + ".*$", Pattern.CASE_INSENSITIVE);
+                        criteria.orOperator(
+                                Criteria.where("title").regex(pattern),
+                                Criteria.where("cityName").regex(pattern),
+                                Criteria.where("fieldName").regex(pattern)
+                        );
+                    }
+                    Query performancesVoQuery = Query.query(criteria);
                     count = mongoTemplate.count(performancesVoQuery, KylinPerformanceVo.class.getSimpleName());
 
                     if (count <= 0) return ResponseDto.success(new PageInfo<>());
@@ -178,6 +190,8 @@ public class KylinStationController {
 
                         List<KylinStationTicketVo> ticketVoList = new ArrayList<>();
 
+                        BigDecimal priceSum = BigDecimal.ZERO;
+                        int number = 0, checkedNum = 0, remainderNum = 0;
                         for (Map.Entry<String, List<KylinOrderTicketEntitiesVo>> entry : performanceTicketEntitiesVoMap.entrySet()) {
                             KylinTicketVo ticketVo = performanceTicketMap.get(entry.getKey());
 
@@ -200,9 +214,23 @@ public class KylinStationController {
                             List<KylinOrderTicketEntitiesVo> remainderEntitiesVoList = subStatusPerformanceTicketEntitiesVoMap.get(0);
                             stationTicketVo.setRemainderNum(CollectionUtils.isEmpty(remainderEntitiesVoList) ? 0 : remainderEntitiesVoList.size());
 
+                            number += stationTicketVo.getNumber();
+                            checkedNum += stationTicketVo.getCheckedNum();
+                            remainderNum += stationTicketVo.getRemainderNum();
+                            priceSum = priceSum.add(stationTicketVo.getPriceSum());
+
                             ticketVoList.add(stationTicketVo);
                         }
 
+                        KylinStationTicketVo sumTicketVo = KylinStationTicketVo.getNew();
+                        sumTicketVo.setTicketId("TT");
+                        sumTicketVo.setTitle("合计");
+                        sumTicketVo.setPriceSum(priceSum);
+                        sumTicketVo.setNumber(number);
+                        sumTicketVo.setCheckedNum(checkedNum);
+                        sumTicketVo.setRemainderNum(remainderNum);
+
+                        ticketVoList.add(sumTicketVo);
                         r.setTicketVoList(ticketVoList);
                         r.setCanDownTime(performanceRelationMap.get(r.getPerformancesId()));
                     });