venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

篮球订单查询调整，增加场馆索引

Browse Source
This commit is contained in:
limqhz
2024-03-02 18:07:31 +08:00
parent f5e2120b28
commit 476f2ee3c2
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
oms/src/main/java/com/sv/oms/controller/MemberEnterVeneuLogController.java
View File

@@ -37,9 +37,10 @@ public class MemberEnterVeneuLogController extends OmsController {
@RequestParam(value = "starTime",required = false) String starTime, @RequestParam(value = "starTime",required = false) String starTime,
@RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "endTime",required = false) String endTime,
@RequestParam(value = "orderSn",required = false) String orderSn, @RequestParam(value = "orderSn",required = false) String orderSn,
@RequestParam(value = "venueName",required = false) String venueName,
@RequestParam(value = "state",required = false) Integer state) { @RequestParam(value = "state",required = false) Integer state) {
return ResponseDTO.ok() return ResponseDTO.ok()
.setPagination(memberEnterVeneuLogService.findPage(pagination, starTime, endTime, orderSn, state)); .setPagination(memberEnterVeneuLogService.findPage(pagination, starTime, endTime, orderSn, state,venueName));
} }
/** /**
@@ -50,8 +51,9 @@ public class MemberEnterVeneuLogController extends OmsController {
@RequestParam(value = "starTime",required = false) String starTime, @RequestParam(value = "starTime",required = false) String starTime,
@RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "endTime",required = false) String endTime,
@RequestParam(value = "orderSn",required = false) String orderSn, @RequestParam(value = "orderSn",required = false) String orderSn,
@RequestParam(value = "venueName",required = false) String venueName,
@RequestParam(value = "state",required = false) Integer state) { @RequestParam(value = "state",required = false) Integer state) {
return ResponseDTO.ok().addAttribute("orderSumMoney",memberEnterVeneuLogService.orderPageSum(starTime, endTime, orderSn, state)); return ResponseDTO.ok().addAttribute("orderSumMoney",memberEnterVeneuLogService.orderPageSum(starTime, endTime, orderSn, state,venueName));
} }
/** /**

4
service/src/main/java/com/sv/mapper/BarcodeOrderTimeMapper.java
View File

@@ -40,7 +40,7 @@ public interface BarcodeOrderTimeMapper {
@NoPlatform @NoPlatform
MemberEnterOrderDTO memberOrderEnterDetail(@Param("memberId") Integer memberId,@Param("enterId") Integer enterId); MemberEnterOrderDTO memberOrderEnterDetail(@Param("memberId") Integer memberId,@Param("enterId") Integer enterId);
@NoPlatform @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 @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);
} }

8
service/src/main/java/com/sv/service/oms/MemberEnterVenueLogService.java
View File

@@ -119,10 +119,10 @@ public class MemberEnterVenueLogService extends BaseServiceImpl {
*/ */
public Pagination findPage(Pagination pagination, String starTime, 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()); PageHelper.startPage(pagination.getPage(), pagination.getPageSize());
pagination.setQueryResult(barcodeOrderTimeMapper.findAll(starTime, pagination.setQueryResult(barcodeOrderTimeMapper.findAll(starTime,
endTime, orderSn, state)); endTime, orderSn, state,venueName));
// pagination.setQueryResult(memberEnterVenueLogMapper.findAlls(payStatus, memberId, starTime, endTime, orderSn, payType,venueId)); // pagination.setQueryResult(memberEnterVenueLogMapper.findAlls(payStatus, memberId, starTime, endTime, orderSn, payType,venueId));
return pagination; return pagination;
} }
@@ -134,10 +134,10 @@ public class MemberEnterVenueLogService extends BaseServiceImpl {
*/ */
public BigDecimal orderPageSum(String starTime, public BigDecimal orderPageSum(String starTime,
String endTime, String orderSn, Integer state) { String endTime, String orderSn, Integer state,String venueName) {
BigDecimal result = BigDecimal.ZERO; BigDecimal result = BigDecimal.ZERO;
BigDecimal orderPageSum = barcodeOrderTimeMapper.orderPageSum(starTime, BigDecimal orderPageSum = barcodeOrderTimeMapper.orderPageSum(starTime,
endTime, orderSn, state); endTime, orderSn, state,venueName);
if (orderPageSum != null) { if (orderPageSum != null) {
result = orderPageSum; result = orderPageSum;
} }

8
service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
View File

@@ -314,6 +314,7 @@
t.created_time as createTime, t.created_time as createTime,
1 as payType 1 as payType
from sv_barcode_order_time t LEFT JOIN sv_member m on t.member_id = m.id 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 where 1=1
<if test="state != null and state == 2"> <if test="state != null and state == 2">
AND (t.status = 1 or t.paying = #{state}) AND (t.status = 1 or t.paying = #{state})
@@ -327,6 +328,9 @@
<if test="orderSn != ''"> <if test="orderSn != ''">
AND t.order_sn = #{orderSn} AND t.order_sn = #{orderSn}
</if> </if>
<if test="venueName != ''">
AND svc.name like '%${venueName}%'
</if>
<if test="starTime != ''"> <if test="starTime != ''">
AND t.order_start &gt;= #{starTime} AND t.order_start &gt;= #{starTime}
</if> </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) 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 ) - IFNULL(t.sum_pay_money,0)) orderSumMoney
from sv_barcode_order_time t LEFT JOIN sv_member m on t.member_id = m.id 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 where 1=1
<if test="state != null and state == 2"> <if test="state != null and state == 2">
AND (t.status = 1 or t.paying = #{state}) AND (t.status = 1 or t.paying = #{state})
@@ -355,6 +360,9 @@
<if test="orderSn != ''"> <if test="orderSn != ''">
AND t.order_sn = #{orderSn} AND t.order_sn = #{orderSn}
</if> </if>
<if test="venueName != ''">
AND svc.name like '%${venueName}%'
</if>
<if test="starTime != ''"> <if test="starTime != ''">
AND t.order_start &gt;= #{starTime} AND t.order_start &gt;= #{starTime}
</if> </if>