Merge branch 'master' into hjc_mixSale

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

@@ -234,7 +234,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>');
-                        actions.push('<a class="btn btn-warning btn-xs ' + transferFlag + '" href="javascript:void(0)" onclick="f(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>初始化</a>');
+                        // actions.push('<a class="btn btn-warning btn-xs ' + transferFlag + '" href="javascript:void(0)" onclick="f(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>初始化</a>');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/edit.html

@@ -29,7 +29,7 @@
             <label class="col-sm-3 control-label is-required">头像：</label>
             <div class="col-sm-8">
                 <!--                <input name="img" class="form-control" type="text" th:value="*{img}" readonly required>-->
-                <img class="img-details" style="height: 800px;" name="img" th:src="*{img}"
+                <img class="img-details" style="height: 400px;" name="img" th:src="*{img}"
                      th:onclick="click_big([[*{img}]])">
             </div>
         </div>
@@ -87,7 +87,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">自我介绍：</label>
             <div class="col-sm-8">
-                <textarea name="introduce" class="form-control" type="text" th:text="*{introduce}" readonly required></textarea>
+                <textarea name="introduce" class="form-control" style="height: 200px; font-size: 16px;" type="text" th:text="*{introduce}" readonly required></textarea>
             </div>
         </div>
         <div class="form-group">

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

@@ -278,12 +278,12 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                         if (item.getEnterType() == 0 && !item.getEnterName().equals("")) {
                             log.info("[入场人错误数据] 入场人id = " + item.getOrderTicketEntitiesId() + " 入场人 name = " + item.getEnterName());
                         }
-                        if (empty.contains(orderTicketEntitiesKey)) {
-                            log.info("[ ORDER COPY ] orderId = " + orderTicketEntitiesKey);
-                            orderTicketEntitiesKey=Long.parseLong(orderTicketEntitiesKey+"1");
-                        }
-                        empty.add(orderTicketEntitiesKey);
-                        orderCount+=1;
+//                        if (empty.contains(orderTicketEntitiesKey)) {
+//                            log.info("[ ORDER COPY ] orderId = " + orderTicketEntitiesKey);
+//                            orderTicketEntitiesKey=Long.parseLong(orderTicketEntitiesKey+"1");
+//                        }
+//                        empty.add(orderTicketEntitiesKey);
+//                        orderCount+=1;
 
                         if (empty.contains(orderTicketEntitiesKey)) {
                             log.info("[ ORDER COPY ] orderId = " + orderTicketEntitiesKey);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -86,11 +87,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
     @Override
     public TableDataInfo listShow(SmileShowParam smileShowParam) {
-        PageInfo<KylinPerformances> pageInfo;
         TableDataInfo rspData = new TableDataInfo();
         //查询所有代理的演出id
-        List<KylinPerformances> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent();
-        pageInfo = new PageInfo<>(kylinPerformancesList);
+        List<KylinPerformances> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent((smileShowParam.getPageNum()-1)* smileShowParam.getPageSize(),smileShowParam.getPageSize());
         List<ShowVo> showVoList = kylinPerformancesList.stream().map(kylinPerformances -> {
             ShowVo vo = new ShowVo();
             //演出id
@@ -126,7 +125,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         }).collect(Collectors.toList());
         rspData.setCode(0);
         rspData.setRows(showVoList);
-        rspData.setTotal(pageInfo.getTotal());
+        rspData.setTotal(smileAgentMapper.selectCountPerId());
         return rspData;
     }
 
@@ -427,6 +426,14 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         showAgentVo.setPerformanceId(performancesId);
         showAgentVo.setTicketId(ticketAndStatusDao.getTicketsId());
         showAgentVo.setTitle(ticketAndStatusDao.getTitle());
+        //开始结束时间转换年月日
+        String start = ticketAndStatusDao.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        String end = ticketAndStatusDao.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        if (start.equals(end)) {
+            showAgentVo.setTitle(ticketAndStatusDao.getTitle().concat("(").concat(start).concat(")"));
+        } else {
+            showAgentVo.setTitle(ticketAndStatusDao.getTitle().concat("(").concat(start).concat("--").concat(end).concat(")"));
+        }
         //总代票提
         showAgentVo.setTotalCarry(smileAgent.getTotalCarry());
         //普代票提

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

@@ -67,7 +67,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
 
     List<KylinPerformances> selectByComment();
 
-    List<KylinPerformances> selectPerIdByAgent();
+    List<KylinPerformances> selectPerIdByAgent(@Param("pageNumber") Integer pageNumber, @Param("pageSize")Integer pageSize);
 
     List<KylinPerformancesDao> selectTicketIdByPerId(@Param("performancesId") String performancesId);
 

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

@@ -720,6 +720,7 @@ GROUP BY user_mobile;
           AND kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent sa WHERE sa.del_tag = 0 GROUP BY sa.performance_id )
         group by kp.performances_id
         order by kp.comment desc, kp.time_start asc
+        limit #{pageNumber},#{pageSize}
     </select>
 
     <select id="selectTicketIdByPerId" resultType="com.liquidnet.service.kylin.dao.KylinPerformancesDao">

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileAgentMapper.java

@@ -31,4 +31,6 @@ public interface SmileAgentMapper extends BaseMapper<SmileAgent> {
     List<SmileAgentDao> selectAgentList(@Param("performancesId") String performancesId);
 
     List<SmileAgent> selectAgentCarryGtZeroByPerId(@Param("performancesId")String performancesId);
+
+    int selectCountPerId();
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -117,4 +117,8 @@
           AND del_tag = 0
     </select>
 
+    <select id="selectCountPerId"  resultType="int">
+        SELECT COUNT(sa.id) FROM (SELECT id FROM smile_agent WHERE del_tag = 0 GROUP BY performance_id) sa;
+    </select>
+
 </mapper>

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

@@ -333,23 +333,23 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     vo.setIsCanTransfer(0);
                 }
                 //是否可回退
-//                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
-//                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
-//                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-//                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
-//                            && orderTicketVo.getTransferStatus().equals(3)) {
-//                        vo.setIsCanBack(1);
-//                    } else {
-//                        vo.setIsCanBack(0);
-//                    }
-//                } else {
-//                    vo.setIsCanBack(0);
-//                }
-                if (orderTicketVo.getTransferStatus().equals(3) && LocalDateTime.now().isBefore(DateUtil.Formatter.yyyyMMddHHmmss.parse(orderTicketVo.getUseStart()))) {
-                    vo.setIsCanBack(1);
+                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
+                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
+                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
+                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
+                            && orderTicketVo.getTransferStatus().equals(3)) {
+                        vo.setIsCanBack(1);
+                    } else {
+                        vo.setIsCanBack(0);
+                    }
                 } else {
                     vo.setIsCanBack(0);
                 }
+//                if (orderTicketVo.getTransferStatus().equals(3) && LocalDateTime.now().isBefore(DateUtil.Formatter.yyyyMMddHHmmss.parse(orderTicketVo.getUseStart()))) {
+//                    vo.setIsCanBack(1);
+//                } else {
+//                    vo.setIsCanBack(0);
+//                }
                 // 快递票不可回退
                 if (orderTicketVo.getGetTicketType().equals("express")) {
                     vo.setIsCanBack(0);

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

@@ -4,9 +4,9 @@ kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id
 # ------------------------PV/UV----------------------------
 bi_ticket_access_records.insert=INSERT INTO `bi_ticket_access_records` (  `user_id`,  `access_type`,  `performance_id`,  `order_id`,  `order_code`,`ip_address`,  `area`,  `area_province`,  `area_city`,  `area_county`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?);
 # ------------------------创建订单----------------------------
-kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?)
+kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at,agent_status,agent_distributions,agent_id_master,agent_distributions_master)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status , produce_code, created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 # ------------------------支付回调----------------------------
 kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -132,15 +132,17 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                         return ResponseDto.failure("您已超出限购数量～");
                     }
                 }
-                // 权限限购
-                boolean isVip = nftOrderUtils.isVipMember(uid);
-                String buyFactor = skuVo.getBuyFactor();
-                if (null == buyFactor) {
-                    buyFactor = "0";
-                }
-                Boolean isAuthBuy = goblinOrderUtils.judgeOrderRose(isVip, skuId, mobile, Integer.parseInt(buyFactor));
-                if (!isAuthBuy) {
-                    return ResponseDto.failure("该商品仅限特定用户购买～");
+                // 权限限购 分批购不用这个规则
+                if (null == listId) {
+                    boolean isVip = nftOrderUtils.isVipMember(uid);
+                    String buyFactor = skuVo.getBuyFactor();
+                    if (null == buyFactor) {
+                        buyFactor = "0";
+                    }
+                    Boolean isAuthBuy = goblinOrderUtils.judgeOrderRose(isVip, skuId, mobile, Integer.parseInt(buyFactor));
+                    if (!isAuthBuy) {
+                        return ResponseDto.failure("该商品仅限特定用户购买～");
+                    }
                 }
                 // 判断优惠券不能一起使用
                 /*String platVoucherCode = payParam.getPlatVoucherCode();