From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:40:34 +0800
Subject: [PATCH] #获取正常还车
---
server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
index 6e0e3a2..00b01c8 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.WxBillDetailMapper;
import com.doumee.dao.business.model.WxBill;
import com.doumee.dao.business.model.WxBillDetail;
@@ -77,7 +78,7 @@
@Override
public WxBillDetail findOne(WxBillDetail wxBillDetail) {
QueryWrapper<WxBillDetail> wrapper = new QueryWrapper<>(wxBillDetail);
- return wxBillDetailMapper.selectOne(wrapper);
+ return wxBillDetailMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -189,6 +190,10 @@
}
queryWrapper.lambda().ge(pageWrap.getModel().getStartDate() !=null, WxBillDetail::getPid,DateUtil.getShortDateStr(pageWrap.getModel().getStartDate()));
queryWrapper.lambda().le(pageWrap.getModel().getEndDate() !=null,WxBillDetail::getPid, DateUtil.getShortDateStr(pageWrap.getModel().getEndDate()));
+ //鑷杞︿氦鏄�
+ queryWrapper.lambda().eq(pageWrap.getModel().getIsBikeFee() != null&&pageWrap.getModel().getIsBikeFee().intValue() ==0, WxBillDetail::getAppid, WxMiniConfig.wxPayService.getConfig().getAppId());
+ //闈炶嚜琛岃溅浜ゆ槗
+ queryWrapper.lambda().ne(pageWrap.getModel().getIsBikeFee() != null&&pageWrap.getModel().getIsBikeFee().intValue() ==1, WxBillDetail::getAppid, WxMiniConfig.wxPayService.getConfig().getAppId());
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
--
Gitblit v1.9.3