diff --git a/oms/src/main/java/com/sv/oms/controller/MemberEnterVeneuLogController.java b/oms/src/main/java/com/sv/oms/controller/MemberEnterVeneuLogController.java index e516bfa..7e1faa0 100644 --- a/oms/src/main/java/com/sv/oms/controller/MemberEnterVeneuLogController.java +++ b/oms/src/main/java/com/sv/oms/controller/MemberEnterVeneuLogController.java @@ -37,9 +37,10 @@ public class MemberEnterVeneuLogController extends OmsController { @RequestParam(value = "starTime",required = false) String starTime, @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "orderSn",required = false) String orderSn, + @RequestParam(value = "venueName",required = false) String venueName, @RequestParam(value = "state",required = false) Integer state) { 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 = "endTime",required = false) String endTime, @RequestParam(value = "orderSn",required = false) String orderSn, + @RequestParam(value = "venueName",required = false) String venueName, @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)); } /** diff --git a/service/src/main/java/com/sv/mapper/BarcodeOrderTimeMapper.java b/service/src/main/java/com/sv/mapper/BarcodeOrderTimeMapper.java index 174f9a6..48ca927 100644 --- a/service/src/main/java/com/sv/mapper/BarcodeOrderTimeMapper.java +++ b/service/src/main/java/com/sv/mapper/BarcodeOrderTimeMapper.java @@ -40,7 +40,7 @@ public interface BarcodeOrderTimeMapper { @NoPlatform MemberEnterOrderDTO memberOrderEnterDetail(@Param("memberId") Integer memberId,@Param("enterId") Integer enterId); @NoPlatform - List findAll(@Param("starTime") String starTime,@Param("endTime") String endTime,@Param("orderSn") String orderSn,@Param("state") Integer state); + List 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); } diff --git a/service/src/main/java/com/sv/service/oms/MemberEnterVenueLogService.java b/service/src/main/java/com/sv/service/oms/MemberEnterVenueLogService.java index ed4c309..44bd380 100644 --- a/service/src/main/java/com/sv/service/oms/MemberEnterVenueLogService.java +++ b/service/src/main/java/com/sv/service/oms/MemberEnterVenueLogService.java @@ -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; } diff --git a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml index d200248..c441699 100644 --- a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml @@ -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 AND (t.status = 1 or t.paying = #{state}) @@ -327,6 +328,9 @@ AND t.order_sn = #{orderSn} + + AND svc.name like '%${venueName}%' + AND t.order_start >= #{starTime} @@ -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 AND (t.status = 1 or t.paying = #{state}) @@ -355,6 +360,9 @@ AND t.order_sn = #{orderSn} + + AND svc.name like '%${venueName}%' + AND t.order_start >= #{starTime}