diff --git a/api/src/main/java/com/sv/api/controller/VenueController.java b/api/src/main/java/com/sv/api/controller/VenueController.java index e676264..a494e54 100644 --- a/api/src/main/java/com/sv/api/controller/VenueController.java +++ b/api/src/main/java/com/sv/api/controller/VenueController.java @@ -15,7 +15,6 @@ import com.sv.service.oms.DeviceService; import com.ydd.framework.core.annotation.AccessToken; import com.ydd.framework.core.common.Pagination; import com.ydd.framework.core.common.dto.ResponseDTO; -import com.ydd.framework.core.common.utils.RequestUtils; import com.ydd.framework.core.controller.BaseApiController; import com.ydd.framework.core.exception.ServiceException; import com.ydd.oms.entity.enums.PayStatusEnum; @@ -240,4 +239,14 @@ public class VenueController extends BaseApiController { return ResponseDTO.ok().addAttribute("memberEnterDetail",venueEnterService.memberOrderEnterDetail(getMemberIdByAccessToken(),enterId)); } + /** + * 判断是否支付成功 + * @param barcode 订单号 + * @return + */ + @RequestMapping(value = "/member/barcode/isUsed", method = RequestMethod.POST) + public ResponseDTO isUsed(@RequestParam("barcode") String barcode) { + return ResponseDTO.ok().addAttribute("barcodeDTO", barcodeService.isUsed(barcode)); + } + } diff --git a/entity/src/main/java/com/sv/dto/api/BarcodeDTO.java b/entity/src/main/java/com/sv/dto/api/BarcodeDTO.java new file mode 100644 index 0000000..7841b8d --- /dev/null +++ b/entity/src/main/java/com/sv/dto/api/BarcodeDTO.java @@ -0,0 +1,33 @@ +package com.sv.dto.api; + +import java.io.Serializable; +import java.util.Date; + +/** + * DTO - 扫描完二维码 + * + * @author limqsh + * @since 2024-01-14 + */ +public class BarcodeDTO implements Serializable { + + private boolean isUsed; + + private Integer enterId; + + public boolean isUsed() { + return isUsed; + } + + public void setUsed(boolean used) { + isUsed = used; + } + + public Integer getEnterId() { + return enterId; + } + + public void setEnterId(Integer enterId) { + this.enterId = enterId; + } +} diff --git a/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java b/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java index e67243f..f64ee82 100644 --- a/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java +++ b/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java @@ -126,7 +126,7 @@ public class MemberEnterOrderDTO implements Serializable { private BigDecimal price; /** - * 退款金额 + * 退款金额(总退款金额) */ private BigDecimal payMoney; @@ -156,155 +156,79 @@ public class MemberEnterOrderDTO implements Serializable { private String latitude; /** - * 设置 - * - * @param id + * 新增后台查询字段 */ - public void setId(Integer id){ - this.id = id; - } + private String nickname; /** - * 获取 - * - * @return + * 新增用户电话号码 */ - public Integer getId(){ + private String mobile; + + public Integer getId() { return id; } - - /** - * 设置场馆类型 - * - * @param veneuType 场馆类型 - */ - public void setVeneuType(Integer veneuType){ - this.veneuType = veneuType; + public void setId(Integer id) { + this.id = id; } - /** - * 获取场馆类型 - * - * @return 场馆类型 - */ - public Integer getVeneuType(){ + public Integer getVeneuType() { return veneuType; } - - /** - * 设置场馆ID - * - * @param venueId 场馆ID - */ - public void setVenueId(Integer venueId){ - this.venueId = venueId; + public void setVeneuType(Integer veneuType) { + this.veneuType = veneuType; } - /** - * 获取场馆ID - * - * @return 场馆ID - */ - public Integer getVenueId(){ + public Integer getVenueId() { return venueId; } - /** - * 设置课程ID - * - * @param lessonId 课程ID - */ - public void setLessonId(Integer lessonId){ - this.lessonId = lessonId; + public void setVenueId(Integer venueId) { + this.venueId = venueId; } - /** - * 获取课程ID - * - * @return 课程ID - */ - public Integer getLessonId(){ + public Integer getLessonId() { return lessonId; } - - /** - * 设置用户ID - * - * @param memberId 用户ID - */ - public void setMemberId(Integer memberId){ - this.memberId = memberId; + public void setLessonId(Integer lessonId) { + this.lessonId = lessonId; } - /** - * 获取用户ID - * - * @return 用户ID - */ - public Integer getMemberId(){ + public Integer getMemberId() { return memberId; } - - /** - * 设置预约课程支付订单号 - * - * @param orderSn 预约课程支付订单号 - */ - public void setOrderSn(String orderSn){ - this.orderSn = orderSn; + public void setMemberId(Integer memberId) { + this.memberId = memberId; } - /** - * 获取预约课程支付订单号 - * - * @return 预约课程支付订单号 - */ - public String getOrderSn(){ + public String getOrderSn() { return orderSn; } - - /** - * 设置入场支付方式 - * - * @param payType 入场支付方式 - */ - public void setPayType(Integer payType){ - this.payType = payType; + public void setOrderSn(String orderSn) { + this.orderSn = orderSn; } - /** - * 获取入场支付方式 - * - * @return 入场支付方式 - */ - public Integer getPayType(){ + public Integer getPayType() { return payType; } - - /** - * 设置用户会员卡ID - * - * @param memberCardId 用户会员卡ID - */ - public void setMemberCardId(Integer memberCardId){ - this.memberCardId = memberCardId; + public void setPayType(Integer payType) { + this.payType = payType; } - /** - * 获取用户会员卡ID - * - * @return 用户会员卡ID - */ - public Integer getMemberCardId(){ + public Integer getMemberCardId() { return memberCardId; } + public void setMemberCardId(Integer memberCardId) { + this.memberCardId = memberCardId; + } + public Integer getPaying() { return paying; } @@ -313,140 +237,76 @@ public class MemberEnterOrderDTO implements Serializable { this.paying = paying; } - /** - * 设置使用状态 - * - * @see com.ydd.framework.core.entity.enums.StatusEnum - * @param status 使用状态 - */ - public void setStatus(Integer status){ - this.status = status; - } - - /** - * 获取使用状态 - * - * @see com.ydd.framework.core.entity.enums.StatusEnum - * @return 使用状态 - */ - public Integer getStatus(){ + public Integer getStatus() { return status; } - - /** - * 设置品台来源ID - * - * @param platformId 品台来源ID - */ - public void setPlatformId(Integer platformId){ - this.platformId = platformId; + public void setStatus(Integer status) { + this.status = status; } - /** - * 获取品台来源ID - * - * @return 品台来源ID - */ - public Integer getPlatformId(){ + public Integer getPlatformId() { return platformId; } - - /** - * 设置创建者编号 - * - * @param createdId 创建者编号 - */ - public void setCreatedId(Integer createdId){ - this.createdId = createdId; + public void setPlatformId(Integer platformId) { + this.platformId = platformId; } - /** - * 获取创建者编号 - * - * @return 创建者编号 - */ - public Integer getCreatedId(){ + public Integer getCreatedId() { return createdId; } - - /** - * 设置创建者编号 - * - * @param modifiedId 创建者编号 - */ - public void setModifiedId(Integer modifiedId){ - this.modifiedId = modifiedId; + public void setCreatedId(Integer createdId) { + this.createdId = createdId; } - /** - * 获取创建者编号 - * - * @return 创建者编号 - */ - public Integer getModifiedId(){ + public Integer getModifiedId() { return modifiedId; } - - /** - * 设置创建时间 - * - * @param createdTime 创建时间 - */ - public void setCreatedTime(Date createdTime){ - this.createdTime = createdTime; + public void setModifiedId(Integer modifiedId) { + this.modifiedId = modifiedId; } - /** - * 获取创建时间 - * - * @return 创建时间 - */ - public Date getCreatedTime(){ + public Date getCreatedTime() { return createdTime; } - - /** - * 设置更新时间 - * - * @param modifiedTime 更新时间 - */ - public void setModifiedTime(Date modifiedTime){ - this.modifiedTime = modifiedTime; + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; } - /** - * 获取更新时间 - * - * @return 更新时间 - */ - public Date getModifiedTime(){ + public Date getModifiedTime() { return modifiedTime; } + public void setModifiedTime(Date modifiedTime) { + this.modifiedTime = modifiedTime; + } - /** - * 设置删除标识位 - * - * @see com.ydd.framework.core.entity.enums.DeletedEnum - * @param deleted 删除标识位 - */ - public void setDeleted(Integer deleted){ + public Integer getDeleted() { + return deleted; + } + + public void setDeleted(Integer deleted) { this.deleted = deleted; } - /** - * 获取删除标识位 - * - * @see com.ydd.framework.core.entity.enums.DeletedEnum - * @return 删除标识位 - */ - public Integer getDeleted(){ - return deleted; + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; } public String getLessonName() { diff --git a/entity/src/main/java/com/sv/entity/BarcodeOrderTime.java b/entity/src/main/java/com/sv/entity/BarcodeOrderTime.java index 32ebe1b..70b6253 100644 --- a/entity/src/main/java/com/sv/entity/BarcodeOrderTime.java +++ b/entity/src/main/java/com/sv/entity/BarcodeOrderTime.java @@ -38,6 +38,11 @@ public class BarcodeOrderTime { */ private Integer payMoney; + /** + * 总退款金额 + */ + private Integer sumPayMoney; + private String orderSn; /** @@ -45,7 +50,8 @@ public class BarcodeOrderTime { */ private String orderAddSn; - public BarcodeOrderTime(Integer id, Integer memberId, Integer venueId, Date createdTime, Date modifiedTime, Date orderStart, Date orderEnd, Date lastEnter, Date lastOut, Integer status ,Integer paying, Integer payMoney, String orderSn, String orderAddSn) { + public BarcodeOrderTime(Integer id, Integer memberId, Integer venueId, Date createdTime, Date modifiedTime, Date orderStart, Date orderEnd, Date lastEnter, Date lastOut, Integer status ,Integer paying, + Integer payMoney, Integer sumPayMoney, String orderSn, String orderAddSn) { this.id = id; this.memberId = memberId; this.venueId = venueId; @@ -58,6 +64,7 @@ public class BarcodeOrderTime { this.status = status; this.paying = paying; this.payMoney = payMoney; + this.sumPayMoney = sumPayMoney; this.orderSn = orderSn; this.orderAddSn = orderAddSn; } @@ -177,4 +184,12 @@ public class BarcodeOrderTime { public void setLastOut(Date lastOut) { this.lastOut = lastOut; } + + public Integer getSumPayMoney() { + return sumPayMoney; + } + + public void setSumPayMoney(Integer sumPayMoney) { + this.sumPayMoney = sumPayMoney; + } } 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 9bea787..be3b984 100644 --- a/oms/src/main/java/com/sv/oms/controller/MemberEnterVeneuLogController.java +++ b/oms/src/main/java/com/sv/oms/controller/MemberEnterVeneuLogController.java @@ -1,5 +1,6 @@ package com.sv.oms.controller; import com.sv.entity.MemberEnterVenueLog; +import com.sv.service.api.VenueEnterService; import com.sv.service.oms.MemberEnterVenueLogService; import com.ydd.framework.core.common.Pagination; import com.ydd.framework.core.common.dto.ResponseDTO; @@ -10,6 +11,7 @@ import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.math.BigDecimal; /** * Controller - 篮球进场订单 @@ -21,33 +23,32 @@ import javax.annotation.Resource; public class MemberEnterVeneuLogController extends OmsController { private final Logger logger = LoggerFactory.getLogger(MemberEnterVeneuLogController.class); - + @Resource private MemberEnterVenueLogService memberEnterVeneuLogService; + @Resource + private VenueEnterService venueEnterService; /** * 分页查询篮球进场订单 */ @RequestMapping(value = "/member/enter/veneu/logs", method = RequestMethod.GET) public ResponseDTO findPage(Pagination pagination, - @RequestParam(value = "payStatus",required = false) Integer payStatus, - @RequestParam(value = "memberId",required = false) Integer memberId, @RequestParam(value = "starTime",required = false) String starTime, @RequestParam(value = "endTime",required = false) String endTime, @RequestParam(value = "orderSn",required = false) String orderSn, - @RequestParam(value = "payType",required = false) Integer payType, - @RequestParam(value = "venueId",required = false)Integer venueId) { + @RequestParam(value = "state",required = false) Integer state) { return ResponseDTO.ok() - .setPagination(memberEnterVeneuLogService.findPage(pagination, payStatus, memberId, starTime, endTime, orderSn, payType,venueId)); + .setPagination(memberEnterVeneuLogService.findPage(pagination, starTime, endTime, orderSn, state)); } /** * 查询篮球进场订单信息 */ - @RequestMapping(value = "/member/enter/veneu/log/{id}", method = RequestMethod.GET) - public ResponseDTO findById(@PathVariable("id") Integer id) { + @RequestMapping(value = "/member/find/order/enter/log", method = RequestMethod.GET) + public ResponseDTO findByPageId(Pagination pagination,@RequestParam("id") String id) { return ResponseDTO.ok() - .addAttribute("memberEnterVeneuLog", memberEnterVeneuLogService.findById(id)); + .setPagination(memberEnterVeneuLogService.findByOrderNo(pagination,id)); } /** @@ -68,4 +69,10 @@ public class MemberEnterVeneuLogController extends OmsController { return ResponseDTO.ok("删除成功"); } + @RequestMapping(value = "/member/enter/veneu/account", method = RequestMethod.POST) + public ResponseDTO enterOrderAccount(@RequestParam("EnterId") Integer enterId,@RequestParam("payMoney") Integer payMoney) { + venueEnterService.enterOrderAccount(enterId,payMoney); + return ResponseDTO.ok("结算成功"); + } + } diff --git a/service/src/main/java/com/sv/mapper/BarcodeMapper.java b/service/src/main/java/com/sv/mapper/BarcodeMapper.java index 5f57719..e0eca16 100644 --- a/service/src/main/java/com/sv/mapper/BarcodeMapper.java +++ b/service/src/main/java/com/sv/mapper/BarcodeMapper.java @@ -26,4 +26,7 @@ public interface BarcodeMapper { @NoPlatform Barcode checkCodeStatus(@Param("barcode") String barcode); + + @NoPlatform + Barcode checkIsUsed(@Param("barcode") String barcode); } diff --git a/service/src/main/java/com/sv/mapper/BarcodeOrderTimeMapper.java b/service/src/main/java/com/sv/mapper/BarcodeOrderTimeMapper.java index ebea6ec..a7bc38e 100644 --- a/service/src/main/java/com/sv/mapper/BarcodeOrderTimeMapper.java +++ b/service/src/main/java/com/sv/mapper/BarcodeOrderTimeMapper.java @@ -7,6 +7,9 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; +/** + * 用户入场订单 + */ public interface BarcodeOrderTimeMapper { int deleteByPrimaryKey(Integer id); @@ -33,4 +36,6 @@ public interface BarcodeOrderTimeMapper { List memberOrderEnterList(@Param("memberId") Integer memberId); MemberEnterOrderDTO memberOrderEnterDetail(@Param("memberId") Integer memberId,@Param("enterId") Integer enterId); + + List findAll(@Param("starTime") String starTime,@Param("endTime") String endTime,@Param("orderSn") String orderSn,@Param("state") Integer state); } diff --git a/service/src/main/java/com/sv/mapper/MemberEnterVenueLogMapper.java b/service/src/main/java/com/sv/mapper/MemberEnterVenueLogMapper.java index 90490a2..2f43d9f 100644 --- a/service/src/main/java/com/sv/mapper/MemberEnterVenueLogMapper.java +++ b/service/src/main/java/com/sv/mapper/MemberEnterVenueLogMapper.java @@ -66,7 +66,6 @@ public interface MemberEnterVenueLogMapper { * @return 篮球进场订单集合 */ List findAlls(@Param("payStatus") Integer payStatus,@Param("memberId") Integer memberId, - @Param("starTime") String starTime, @Param("endTime") String endTime, @Param("orderSn") String orderSn, @Param("payType") Integer payType, @Param("venueId")Integer venueId); @@ -78,4 +77,4 @@ public interface MemberEnterVenueLogMapper { List findMemberEnterLogByDate(@Param("memberId") Integer memberId,@Param("venueId") Integer venueId,@Param("date") String date); -} \ No newline at end of file +} diff --git a/service/src/main/java/com/sv/service/api/VenueEnterService.java b/service/src/main/java/com/sv/service/api/VenueEnterService.java index 9c18c6e..f310f92 100644 --- a/service/src/main/java/com/sv/service/api/VenueEnterService.java +++ b/service/src/main/java/com/sv/service/api/VenueEnterService.java @@ -15,6 +15,7 @@ import com.ydd.framework.core.common.utils.ValidationUtils; import com.ydd.framework.core.exception.ServiceException; import com.ydd.framework.core.service.impl.BaseServiceImpl; import com.ydd.oms.entity.enums.PayStatusEnum; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -156,15 +157,16 @@ public class VenueEnterService extends BaseServiceImpl { throw new ServiceException(ExceptionCodeTemplate.VENUE_ERROR); } // 按时出场选择按照分钟四舍五入到角扣款 + BigDecimal basePrice = venuePriceEnter.getPrice(); price = venuePriceEnter.getPrice(); int minutes = DateUtilCard.diffMinute(lastOrder.getOrderStart(), dateNow); int hours = minutes / 60; // 需要补收的价格 price = price.multiply(new BigDecimal(hours - 1)); // 此处修改押金小时数 int mod = new BigDecimal(minutes).divideAndRemainder(new BigDecimal(60))[1].intValue(); - if (hours >= 1 && mod <= 30) { + if (hours >= 1 && mod <= 30 && basePrice.compareTo(BigDecimal.ZERO) > 0) { // 超过一个小时 且不满半小时，只收一半的钱 - price = price.subtract(price.divide(new BigDecimal(2)).setScale(1,BigDecimal.ROUND_HALF_UP)); + price = price.subtract(basePrice.divide(new BigDecimal(2)).setScale(1,BigDecimal.ROUND_HALF_UP)); } logger.info("用户出场$" + memberId + "$经过时间为" + minutes + "分钟,价格为："+ price); if (price.compareTo(BigDecimal.ZERO) > 0 ) { @@ -175,6 +177,7 @@ public class VenueEnterService extends BaseServiceImpl { } else { // 不需要补交钱且需要退钱 lastOrder.setPayMoney(price.abs().intValue()); + lastOrder.setSumPayMoney(price.abs().intValue()); barcodeOrderTimeMapper.updateByPrimaryKey(lastOrder); result.setFlg(888); result.setMsg("如要继续订单，请在10分钟内进入，否则将结束订单"); @@ -326,4 +329,29 @@ public class VenueEnterService extends BaseServiceImpl { return memberEnterOrderDTO; } + public void enterOrderAccount(Integer enterId, Integer payMoney) { + BarcodeOrderTime barcodeOrder = barcodeOrderTimeMapper.selectByPrimaryKey(enterId); + if (barcodeOrder == null) { + throw new ServiceException("订单不存在！"); + } + if (1 == barcodeOrder.getPaying()) { + throw new ServiceException("订单正在结算，无法结算！"); + } + if (barcodeOrder.getPayMoney() <=0 ) { + throw new ServiceException("退款金额不能为负数！"); + } + String orderSn = barcodeOrder.getOrderSn(); + String orderAddSn = barcodeOrder.getOrderAddSn(); + if (!StringUtils.isEmpty(orderAddSn)) { + throw new ServiceException("订单多次支付（使用超时），无法进行退款！"); + } + Order baseOrder = orderMapper.findByOrderSn(orderSn); + if ((barcodeOrder.getSumPayMoney() + payMoney) > baseOrder.getPrice().intValue()) { + throw new ServiceException("退款金额不能超过总支付金额！"); + } + barcodeOrder.setSumPayMoney(barcodeOrder.getSumPayMoney() + payMoney); + barcodeOrder.setPaying(1); + barcodeOrder.setPayMoney(payMoney); // 此次支付金额 + barcodeOrderTimeMapper.updateByPrimaryKey(barcodeOrder); + } } diff --git a/service/src/main/java/com/sv/service/common/BarcodeService.java b/service/src/main/java/com/sv/service/common/BarcodeService.java index 84845a0..1c1ee09 100644 --- a/service/src/main/java/com/sv/service/common/BarcodeService.java +++ b/service/src/main/java/com/sv/service/common/BarcodeService.java @@ -2,9 +2,13 @@ package com.sv.service.common; import com.enums.BarCodeStatusEnum; import com.enums.EnterEnum; +import com.sv.dto.api.BarcodeDTO; import com.sv.entity.Barcode; +import com.sv.entity.BarcodeOrderTime; import com.sv.mapper.BarcodeMapper; +import com.sv.mapper.BarcodeOrderTimeMapper; import com.sv.netty.utils.MakeCode; +import com.ydd.framework.core.exception.ServiceException; import com.ydd.framework.core.service.impl.BaseServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,6 +31,8 @@ public class BarcodeService extends BaseServiceImpl { @Resource BarcodeMapper barcodeMapper; + @Resource + BarcodeOrderTimeMapper barcodeOrderTimeMapper; public String newBarcode (String deviceName, String orderSn, EnterEnum enterEnum, Integer venueId, Integer memberId){ String barcode = ""; @@ -47,5 +53,21 @@ public class BarcodeService extends BaseServiceImpl { } return barcode; } + + public BarcodeDTO isUsed(String barcode){ + BarcodeDTO barcodeDTO = new BarcodeDTO(); + barcodeDTO.setUsed(false); + Barcode code = barcodeMapper.checkIsUsed(barcode); + if (code == null) { + logger.error("二维码不存在！！！"); + throw new ServiceException("二维码不存在！"); + } + if (BarCodeStatusEnum.USED.value == code.getStatus()){ + barcodeDTO.setUsed(true); + BarcodeOrderTime lastEnterOrder = barcodeOrderTimeMapper.findLastOrder(code.getMemberId(), code.getVenueId()); + barcodeDTO.setEnterId(lastEnterOrder.getId()); + } + return barcodeDTO; + } } 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 211ca06..698b6f6 100644 --- a/service/src/main/java/com/sv/service/oms/MemberEnterVenueLogService.java +++ b/service/src/main/java/com/sv/service/oms/MemberEnterVenueLogService.java @@ -2,6 +2,7 @@ package com.sv.service.oms; import com.github.pagehelper.PageHelper; import com.sv.entity.MemberEnterVenueLog; +import com.sv.mapper.BarcodeOrderTimeMapper; import com.sv.mapper.MemberEnterVenueLogMapper; import com.ydd.framework.core.common.Pagination; import com.ydd.framework.core.service.impl.BaseServiceImpl; @@ -26,6 +27,8 @@ public class MemberEnterVenueLogService extends BaseServiceImpl { @Resource private MemberEnterVenueLogMapper memberEnterVenueLogMapper; + @Resource + private BarcodeOrderTimeMapper barcodeOrderTimeMapper; /** * 创建篮球进场订单 @@ -95,6 +98,18 @@ public class MemberEnterVenueLogService extends BaseServiceImpl { return memberEnterVenueLogMapper.findById(id); } + /** + * 查询篮球进场订单 + * + * @param orderId 篮球订单的订单主键 + * @return 篮球进场订单 + */ + public Pagination findByOrderNo(Pagination pagination, String orderId) { + PageHelper.startPage(pagination.getPage(), pagination.getPageSize()); + pagination.setQueryResult(memberEnterVenueLogMapper.findAlls(null,null,orderId,null,null)); + return pagination; + } + /** * 查询篮球进场订单 * @@ -102,11 +117,12 @@ public class MemberEnterVenueLogService extends BaseServiceImpl { * @return 分页结果 */ - public Pagination findPage(Pagination pagination, Integer payStatus, Integer memberId, String starTime, - String endTime, String orderSn, Integer payType,Integer venueId) { + public Pagination findPage(Pagination pagination, String starTime, + String endTime, String orderSn, Integer state) { PageHelper.startPage(pagination.getPage(), pagination.getPageSize()); - PageHelper.orderBy("id desc"); - pagination.setQueryResult(memberEnterVenueLogMapper.findAlls(payStatus, memberId, starTime, endTime, orderSn, payType,venueId)); + pagination.setQueryResult(barcodeOrderTimeMapper.findAll(starTime, + endTime, orderSn, state)); +// pagination.setQueryResult(memberEnterVenueLogMapper.findAlls(payStatus, memberId, starTime, endTime, orderSn, payType,venueId)); return pagination; } diff --git a/service/src/main/resources/mybatis/mapper/sv/BarcodeMapper.xml b/service/src/main/resources/mybatis/mapper/sv/BarcodeMapper.xml index e2db3b0..8b03ed3 100644 --- a/service/src/main/resources/mybatis/mapper/sv/BarcodeMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/BarcodeMapper.xml @@ -187,4 +187,11 @@ and status = 0 + + diff --git a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml index 384526a..1a24f25 100644 --- a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml @@ -15,12 +15,13 @@ + - id, member_id, venue_id, created_time, modified_time, order_start, order_end, last_enter, last_out, status, paying, pay_money, order_sn,order_add_sn + id, member_id, venue_id, created_time, modified_time, order_start, order_end, last_enter, last_out, status, paying, pay_money, sum_pay_money, order_sn,order_add_sn + + diff --git a/service/src/main/resources/mybatis/mapper/sv/MemberEnterVenueLogMapper.xml b/service/src/main/resources/mybatis/mapper/sv/MemberEnterVenueLogMapper.xml index 94e502c..3fab609 100644 --- a/service/src/main/resources/mybatis/mapper/sv/MemberEnterVenueLogMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/MemberEnterVenueLogMapper.xml @@ -122,12 +122,6 @@ AND smevl.order_sn = #{orderSn} - - AND so.created_time >= #{starTime} - - - AND so.created_time <= #{endTime} - AND smevl.pay_type = #{payType}