篮球订单查询调整,增加场馆索引
This commit is contained in:
@@ -40,7 +40,7 @@ public interface BarcodeOrderTimeMapper {
|
||||
@NoPlatform
|
||||
MemberEnterOrderDTO memberOrderEnterDetail(@Param("memberId") Integer memberId,@Param("enterId") Integer enterId);
|
||||
@NoPlatform
|
||||
List<MemberEnterOrderDTO> findAll(@Param("starTime") String starTime,@Param("endTime") String endTime,@Param("orderSn") String orderSn,@Param("state") Integer state);
|
||||
List<MemberEnterOrderDTO> findAll(@Param("starTime") String starTime,@Param("endTime") String endTime,@Param("orderSn") String orderSn,@Param("state") Integer state,@Param("venueName") String venueName);
|
||||
@NoPlatform
|
||||
BigDecimal orderPageSum(@Param("starTime") String starTime,@Param("endTime") String endTime,@Param("orderSn") String orderSn,@Param("state") Integer state);
|
||||
BigDecimal orderPageSum(@Param("starTime") String starTime,@Param("endTime") String endTime,@Param("orderSn") String orderSn,@Param("state") Integer state,@Param("venueName") String venueName);
|
||||
}
|
||||
|
||||
@@ -119,10 +119,10 @@ public class MemberEnterVenueLogService extends BaseServiceImpl {
|
||||
*/
|
||||
|
||||
public Pagination findPage(Pagination pagination, String starTime,
|
||||
String endTime, String orderSn, Integer state) {
|
||||
String endTime, String orderSn, Integer state,String venueName) {
|
||||
PageHelper.startPage(pagination.getPage(), pagination.getPageSize());
|
||||
pagination.setQueryResult(barcodeOrderTimeMapper.findAll(starTime,
|
||||
endTime, orderSn, state));
|
||||
endTime, orderSn, state,venueName));
|
||||
// pagination.setQueryResult(memberEnterVenueLogMapper.findAlls(payStatus, memberId, starTime, endTime, orderSn, payType,venueId));
|
||||
return pagination;
|
||||
}
|
||||
@@ -134,10 +134,10 @@ public class MemberEnterVenueLogService extends BaseServiceImpl {
|
||||
*/
|
||||
|
||||
public BigDecimal orderPageSum(String starTime,
|
||||
String endTime, String orderSn, Integer state) {
|
||||
String endTime, String orderSn, Integer state,String venueName) {
|
||||
BigDecimal result = BigDecimal.ZERO;
|
||||
BigDecimal orderPageSum = barcodeOrderTimeMapper.orderPageSum(starTime,
|
||||
endTime, orderSn, state);
|
||||
endTime, orderSn, state,venueName);
|
||||
if (orderPageSum != null) {
|
||||
result = orderPageSum;
|
||||
}
|
||||
|
||||
@@ -314,6 +314,7 @@
|
||||
t.created_time as createTime,
|
||||
1 as payType
|
||||
from sv_barcode_order_time t LEFT JOIN sv_member m on t.member_id = m.id
|
||||
left join sv_venue svc on t.venue_id = svc.id
|
||||
where 1=1
|
||||
<if test="state != null and state == 2">
|
||||
AND (t.status = 1 or t.paying = #{state})
|
||||
@@ -327,6 +328,9 @@
|
||||
<if test="orderSn != ''">
|
||||
AND t.order_sn = #{orderSn}
|
||||
</if>
|
||||
<if test="venueName != ''">
|
||||
AND svc.name like '%${venueName}%'
|
||||
</if>
|
||||
<if test="starTime != ''">
|
||||
AND t.order_start >= #{starTime}
|
||||
</if>
|
||||
@@ -342,6 +346,7 @@
|
||||
where ot.member_id = t.member_id and (ot.order_sn = t.order_sn or ot.order_sn = t.order_add_sn)
|
||||
) - IFNULL(t.sum_pay_money,0)) orderSumMoney
|
||||
from sv_barcode_order_time t LEFT JOIN sv_member m on t.member_id = m.id
|
||||
left join sv_venue svc on t.venue_id = svc.id
|
||||
where 1=1
|
||||
<if test="state != null and state == 2">
|
||||
AND (t.status = 1 or t.paying = #{state})
|
||||
@@ -355,6 +360,9 @@
|
||||
<if test="orderSn != ''">
|
||||
AND t.order_sn = #{orderSn}
|
||||
</if>
|
||||
<if test="venueName != ''">
|
||||
AND svc.name like '%${venueName}%'
|
||||
</if>
|
||||
<if test="starTime != ''">
|
||||
AND t.order_start >= #{starTime}
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user