lisang
/
jeepay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单列表代码优化；增加多合一查询条件；增加登录验证码默认超时时间

This commit is contained in:
xiaoyu 2021-11-16 16:44:12 +08:00
parent de8e09fb22
commit f5b8cfd592
12 changed files with 170 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeepay-core/src/main/java/com/jeequan/jeepay/core/constants/CS.java
View File

@ -27,6 +27,9 @@ import java.util.Set;
**/
public class CS {
//登录图形验证码缓存时间，单位：s
public static final int VERCODE_CACHE_TIME = 60;
/** 系统类型定义 **/
public interface SYS_TYPE{
String MCH = "MCH";

3
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/anon/AuthController.java
View File

@ -81,11 +81,12 @@ public class AuthController extends CommonCtrl {
//redis
String vercodeToken = UUID.fastUUID().toString();
RedisUtil.setString(CS.getCacheKeyImgCode(vercodeToken), lineCaptcha.getCode(), 60 ); //图片验证码缓存时间: 1分钟
RedisUtil.setString(CS.getCacheKeyImgCode(vercodeToken), lineCaptcha.getCode(), CS.VERCODE_CACHE_TIME ); //图片验证码缓存时间: 1分钟
JSONObject result = new JSONObject();
result.put("imageBase64Data", lineCaptcha.getImageBase64Data());
result.put("vercodeToken", vercodeToken);
result.put("expireTime", CS.VERCODE_CACHE_TIME);
return ApiRes.ok(result);
}

42
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java
View File

@ -73,46 +73,8 @@ public class PayOrderController extends CommonCtrl {
PayOrder payOrder = getObject(PayOrder.class);
JSONObject paramJSON = getReqParamJSON();
LambdaQueryWrapper<PayOrder> wrapper = PayOrder.gw();
if (StringUtils.isNotEmpty(payOrder.getPayOrderId())) {
wrapper.eq(PayOrder::getPayOrderId, payOrder.getPayOrderId());
}
if (StringUtils.isNotEmpty(payOrder.getMchNo())) {
wrapper.eq(PayOrder::getMchNo, payOrder.getMchNo());
}
if (StringUtils.isNotEmpty(payOrder.getIsvNo())) {
wrapper.eq(PayOrder::getIsvNo, payOrder.getIsvNo());
}
if (payOrder.getMchType() != null) {
wrapper.eq(PayOrder::getMchType, payOrder.getMchType());
}
if (StringUtils.isNotEmpty(payOrder.getWayCode())) {
wrapper.eq(PayOrder::getWayCode, payOrder.getWayCode());
}
if (StringUtils.isNotEmpty(payOrder.getMchOrderNo())) {
wrapper.eq(PayOrder::getMchOrderNo, payOrder.getMchOrderNo());
}
if (payOrder.getState() != null) {
wrapper.eq(PayOrder::getState, payOrder.getState());
}
if (payOrder.getNotifyState() != null) {
wrapper.eq(PayOrder::getNotifyState, payOrder.getNotifyState());
}
if (StringUtils.isNotEmpty(payOrder.getAppId())) {
wrapper.eq(PayOrder::getAppId, payOrder.getAppId());
}
if (payOrder.getDivisionState() != null) {
wrapper.eq(PayOrder::getDivisionState, payOrder.getDivisionState());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(PayOrder::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(PayOrder::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
wrapper.orderByDesc(PayOrder::getCreatedAt);
IPage<PayOrder> pages = payOrderService.page(getIPage(), wrapper);
IPage<PayOrder> pages = payOrderService.listByPage(getIPage(), payOrder, paramJSON, wrapper);
// 得到所有支付方式
Map<String, String> payWayNameMap = new HashMap<>();
List<PayWay> payWayList = payWayService.list();

39
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java
View File

@ -23,7 +23,6 @@ import com.jeequan.jeepay.core.entity.RefundOrder;
import com.jeequan.jeepay.core.model.ApiRes;
import com.jeequan.jeepay.mgr.ctrl.CommonCtrl;
import com.jeequan.jeepay.service.impl.RefundOrderService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
@ -56,43 +55,7 @@ public class RefundOrderController extends CommonCtrl {
RefundOrder refundOrder = getObject(RefundOrder.class);
JSONObject paramJSON = getReqParamJSON();
LambdaQueryWrapper<RefundOrder> wrapper = RefundOrder.gw();
if (StringUtils.isNotEmpty(refundOrder.getRefundOrderId())) {
wrapper.eq(RefundOrder::getRefundOrderId, refundOrder.getRefundOrderId());
}
if (StringUtils.isNotEmpty(refundOrder.getPayOrderId())) {
wrapper.eq(RefundOrder::getPayOrderId, refundOrder.getPayOrderId());
}
if (StringUtils.isNotEmpty(refundOrder.getChannelPayOrderNo())) {
wrapper.eq(RefundOrder::getChannelPayOrderNo, refundOrder.getChannelPayOrderNo());
}
if (StringUtils.isNotEmpty(refundOrder.getMchNo())) {
wrapper.eq(RefundOrder::getMchNo, refundOrder.getMchNo());
}
if (StringUtils.isNotEmpty(refundOrder.getIsvNo())) {
wrapper.eq(RefundOrder::getIsvNo, refundOrder.getIsvNo());
}
if (refundOrder.getMchType() != null) {
wrapper.eq(RefundOrder::getMchType, refundOrder.getMchType());
}
if (StringUtils.isNotEmpty(refundOrder.getMchRefundNo())) {
wrapper.eq(RefundOrder::getMchRefundNo, refundOrder.getMchRefundNo());
}
if (refundOrder.getState() != null) {
wrapper.eq(RefundOrder::getState, refundOrder.getState());
}
if (StringUtils.isNotEmpty(refundOrder.getAppId())) {
wrapper.eq(RefundOrder::getAppId, refundOrder.getAppId());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(RefundOrder::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(RefundOrder::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
wrapper.orderByDesc(RefundOrder::getCreatedAt);
IPage<RefundOrder> pages = refundOrderService.page(getIPage(), wrapper);
IPage<RefundOrder> pages = refundOrderService.pageList(getIPage(), wrapper, refundOrder, paramJSON);
return ApiRes.page(pages);
}

32
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/TransferOrderController.java
View File

@ -23,7 +23,6 @@ import com.jeequan.jeepay.core.entity.TransferOrder;
import com.jeequan.jeepay.core.model.ApiRes;
import com.jeequan.jeepay.mgr.ctrl.CommonCtrl;
import com.jeequan.jeepay.service.impl.TransferOrderService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
@ -50,37 +49,10 @@ public class TransferOrderController extends CommonCtrl {
@RequestMapping(value="", method = RequestMethod.GET)
public ApiRes list() {
TransferOrder refundOrder = getObject(TransferOrder.class);
TransferOrder transferOrder = getObject(TransferOrder.class);
JSONObject paramJSON = getReqParamJSON();
LambdaQueryWrapper<TransferOrder> wrapper = TransferOrder.gw();
if (StringUtils.isNotEmpty(refundOrder.getTransferId())) {
wrapper.eq(TransferOrder::getTransferId, refundOrder.getTransferId());
}
if (StringUtils.isNotEmpty(refundOrder.getMchOrderNo())) {
wrapper.eq(TransferOrder::getMchOrderNo, refundOrder.getMchOrderNo());
}
if (StringUtils.isNotEmpty(refundOrder.getChannelOrderNo())) {
wrapper.eq(TransferOrder::getChannelOrderNo, refundOrder.getChannelOrderNo());
}
if (StringUtils.isNotEmpty(refundOrder.getMchNo())) {
wrapper.eq(TransferOrder::getMchNo, refundOrder.getMchNo());
}
if (refundOrder.getState() != null) {
wrapper.eq(TransferOrder::getState, refundOrder.getState());
}
if (StringUtils.isNotEmpty(refundOrder.getAppId())) {
wrapper.eq(TransferOrder::getAppId, refundOrder.getAppId());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(TransferOrder::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(TransferOrder::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
wrapper.orderByDesc(TransferOrder::getCreatedAt);
IPage<TransferOrder> pages = transferOrderService.page(getIPage(), wrapper);
IPage<TransferOrder> pages = transferOrderService.pageList(getIPage(), wrapper, transferOrder, paramJSON);
return ApiRes.page(pages);
}

3
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/anon/AuthController.java
View File

@ -81,11 +81,12 @@ public class AuthController extends CommonCtrl {
//redis
String vercodeToken = UUID.fastUUID().toString();
RedisUtil.setString(CS.getCacheKeyImgCode(vercodeToken), lineCaptcha.getCode(), 60 ); //图片验证码缓存时间: 1分钟
RedisUtil.setString(CS.getCacheKeyImgCode(vercodeToken), lineCaptcha.getCode(), CS.VERCODE_CACHE_TIME ); //图片验证码缓存时间: 1分钟
JSONObject result = new JSONObject();
result.put("imageBase64Data", lineCaptcha.getImageBase64Data());
result.put("vercodeToken", vercodeToken);
result.put("expireTime", CS.VERCODE_CACHE_TIME);
return ApiRes.ok(result);
}

32
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java
View File

@ -76,38 +76,8 @@ public class PayOrderController extends CommonCtrl {
LambdaQueryWrapper<PayOrder> wrapper = PayOrder.gw();
wrapper.eq(PayOrder::getMchNo, getCurrentMchNo());
if (StringUtils.isNotEmpty(payOrder.getPayOrderId())) {
wrapper.eq(PayOrder::getPayOrderId, payOrder.getPayOrderId());
}
if (StringUtils.isNotEmpty(payOrder.getMchOrderNo())) {
wrapper.eq(PayOrder::getMchOrderNo, payOrder.getMchOrderNo());
}
if (StringUtils.isNotEmpty(payOrder.getWayCode())) {
wrapper.eq(PayOrder::getWayCode, payOrder.getWayCode());
}
if (payOrder.getState() != null) {
wrapper.eq(PayOrder::getState, payOrder.getState());
}
if (payOrder.getNotifyState() != null) {
wrapper.eq(PayOrder::getNotifyState, payOrder.getNotifyState());
}
if (StringUtils.isNotEmpty(payOrder.getAppId())) {
wrapper.eq(PayOrder::getAppId, payOrder.getAppId());
}
if (payOrder.getDivisionState() != null) {
wrapper.eq(PayOrder::getDivisionState, payOrder.getDivisionState());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(PayOrder::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(PayOrder::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
wrapper.orderByDesc(PayOrder::getCreatedAt);
IPage<PayOrder> pages = payOrderService.page(getIPage(), wrapper);
IPage<PayOrder> pages = payOrderService.listByPage(getIPage(), payOrder, paramJSON, wrapper);
// 得到所有支付方式
Map<String, String> payWayNameMap = new HashMap<>();

29
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java
View File

@ -57,34 +57,7 @@ public class RefundOrderController extends CommonCtrl {
JSONObject paramJSON = getReqParamJSON();
LambdaQueryWrapper<RefundOrder> wrapper = RefundOrder.gw();
wrapper.eq(RefundOrder::getMchNo, getCurrentMchNo());
if (StringUtils.isNotEmpty(refundOrder.getRefundOrderId())) {
wrapper.eq(RefundOrder::getRefundOrderId, refundOrder.getRefundOrderId());
}
if (StringUtils.isNotEmpty(refundOrder.getPayOrderId())) {
wrapper.eq(RefundOrder::getPayOrderId, refundOrder.getPayOrderId());
}
if (StringUtils.isNotEmpty(refundOrder.getMchRefundNo())) {
wrapper.eq(RefundOrder::getMchRefundNo, refundOrder.getMchRefundNo());
}
if (refundOrder.getState() != null) {
wrapper.eq(RefundOrder::getState, refundOrder.getState());
}
if (StringUtils.isNotEmpty(refundOrder.getChannelPayOrderNo())) {
wrapper.eq(RefundOrder::getChannelPayOrderNo, refundOrder.getChannelPayOrderNo());
}
if (StringUtils.isNotEmpty(refundOrder.getAppId())) {
wrapper.eq(RefundOrder::getAppId, refundOrder.getAppId());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(RefundOrder::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(RefundOrder::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
wrapper.orderByDesc(RefundOrder::getCreatedAt);
IPage<RefundOrder> pages = refundOrderService.page(getIPage(), wrapper);
IPage<RefundOrder> pages = refundOrderService.pageList(getIPage(), wrapper, refundOrder, paramJSON);
return ApiRes.page(pages);
}

34
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/TransferOrderController.java
View File

@ -23,7 +23,6 @@ import com.jeequan.jeepay.core.entity.TransferOrder;
import com.jeequan.jeepay.core.model.ApiRes;
import com.jeequan.jeepay.mch.ctrl.CommonCtrl;
import com.jeequan.jeepay.service.impl.TransferOrderService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
@ -50,40 +49,11 @@ public class TransferOrderController extends CommonCtrl {
@RequestMapping(value="", method = RequestMethod.GET)
public ApiRes list() {
TransferOrder refundOrder = getObject(TransferOrder.class);
TransferOrder transferOrder = getObject(TransferOrder.class);
JSONObject paramJSON = getReqParamJSON();
LambdaQueryWrapper<TransferOrder> wrapper = TransferOrder.gw();
if (StringUtils.isNotEmpty(refundOrder.getTransferId())) {
wrapper.eq(TransferOrder::getTransferId, refundOrder.getTransferId());
}
if (StringUtils.isNotEmpty(refundOrder.getMchOrderNo())) {
wrapper.eq(TransferOrder::getMchOrderNo, refundOrder.getMchOrderNo());
}
if (StringUtils.isNotEmpty(refundOrder.getChannelOrderNo())) {
wrapper.eq(TransferOrder::getChannelOrderNo, refundOrder.getChannelOrderNo());
}
if (StringUtils.isNotEmpty(refundOrder.getMchNo())) {
wrapper.eq(TransferOrder::getMchNo, refundOrder.getMchNo());
}
if (refundOrder.getState() != null) {
wrapper.eq(TransferOrder::getState, refundOrder.getState());
}
if (StringUtils.isNotEmpty(refundOrder.getAppId())) {
wrapper.eq(TransferOrder::getAppId, refundOrder.getAppId());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(TransferOrder::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(TransferOrder::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
wrapper.eq(TransferOrder::getMchNo, getCurrentMchNo());
wrapper.orderByDesc(TransferOrder::getCreatedAt);
IPage<TransferOrder> pages = transferOrderService.page(getIPage(), wrapper);
IPage<TransferOrder> pages = transferOrderService.pageList(getIPage(), wrapper, transferOrder, paramJSON);
return ApiRes.page(pages);
}

64
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayOrderService.java
View File

@ -20,14 +20,15 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.IsvInfo;
import com.jeequan.jeepay.core.entity.MchInfo;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.entity.PayWay;
import com.jeequan.jeepay.core.utils.AmountUtil;
import com.jeequan.jeepay.service.mapper.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -374,5 +375,64 @@ public class PayOrderService extends ServiceImpl<PayOrderMapper, PayOrder> {
}
/**
* 通用列表查询条件
* @param iPage
* @param payOrder
* @param paramJSON
* @param wrapper
* @return
*/
public IPage<PayOrder> listByPage(IPage iPage, PayOrder payOrder, JSONObject paramJSON, LambdaQueryWrapper<PayOrder> wrapper) {
if (StringUtils.isNotEmpty(payOrder.getPayOrderId())) {
wrapper.eq(PayOrder::getPayOrderId, payOrder.getPayOrderId());
}
if (StringUtils.isNotEmpty(payOrder.getMchNo())) {
wrapper.eq(PayOrder::getMchNo, payOrder.getMchNo());
}
if (StringUtils.isNotEmpty(payOrder.getIsvNo())) {
wrapper.eq(PayOrder::getIsvNo, payOrder.getIsvNo());
}
if (payOrder.getMchType() != null) {
wrapper.eq(PayOrder::getMchType, payOrder.getMchType());
}
if (StringUtils.isNotEmpty(payOrder.getWayCode())) {
wrapper.eq(PayOrder::getWayCode, payOrder.getWayCode());
}
if (StringUtils.isNotEmpty(payOrder.getMchOrderNo())) {
wrapper.eq(PayOrder::getMchOrderNo, payOrder.getMchOrderNo());
}
if (payOrder.getState() != null) {
wrapper.eq(PayOrder::getState, payOrder.getState());
}
if (payOrder.getNotifyState() != null) {
wrapper.eq(PayOrder::getNotifyState, payOrder.getNotifyState());
}
if (StringUtils.isNotEmpty(payOrder.getAppId())) {
wrapper.eq(PayOrder::getAppId, payOrder.getAppId());
}
if (payOrder.getDivisionState() != null) {
wrapper.eq(PayOrder::getDivisionState, payOrder.getDivisionState());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(PayOrder::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(PayOrder::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
// 三合一订单
if (paramJSON != null && StringUtils.isNotEmpty(paramJSON.getString("unionOrderId"))) {
wrapper.and(wr -> {
wr.eq(PayOrder::getPayOrderId, paramJSON.getString("unionOrderId"))
.or().eq(PayOrder::getMchOrderNo, paramJSON.getString("unionOrderId"))
.or().eq(PayOrder::getChannelOrderNo, paramJSON.getString("unionOrderId"));
});
}
wrapper.orderByDesc(PayOrder::getCreatedAt);
return page(iPage, wrapper);
}
}

52
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/RefundOrderService.java
View File

@ -15,7 +15,10 @@
*/
package com.jeequan.jeepay.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jeequan.jeepay.core.entity.RefundOrder;
import com.jeequan.jeepay.core.exception.BizException;
@ -136,4 +139,53 @@ public class RefundOrderService extends ServiceImpl<RefundOrderMapper, RefundOrd
}
public IPage<RefundOrder> pageList(IPage iPage, LambdaQueryWrapper<RefundOrder> wrapper, RefundOrder refundOrder, JSONObject paramJSON) {
if (StringUtils.isNotEmpty(refundOrder.getRefundOrderId())) {
wrapper.eq(RefundOrder::getRefundOrderId, refundOrder.getRefundOrderId());
}
if (StringUtils.isNotEmpty(refundOrder.getPayOrderId())) {
wrapper.eq(RefundOrder::getPayOrderId, refundOrder.getPayOrderId());
}
if (StringUtils.isNotEmpty(refundOrder.getChannelPayOrderNo())) {
wrapper.eq(RefundOrder::getChannelPayOrderNo, refundOrder.getChannelPayOrderNo());
}
if (StringUtils.isNotEmpty(refundOrder.getMchNo())) {
wrapper.eq(RefundOrder::getMchNo, refundOrder.getMchNo());
}
if (StringUtils.isNotEmpty(refundOrder.getIsvNo())) {
wrapper.eq(RefundOrder::getIsvNo, refundOrder.getIsvNo());
}
if (refundOrder.getMchType() != null) {
wrapper.eq(RefundOrder::getMchType, refundOrder.getMchType());
}
if (StringUtils.isNotEmpty(refundOrder.getMchRefundNo())) {
wrapper.eq(RefundOrder::getMchRefundNo, refundOrder.getMchRefundNo());
}
if (refundOrder.getState() != null) {
wrapper.eq(RefundOrder::getState, refundOrder.getState());
}
if (StringUtils.isNotEmpty(refundOrder.getAppId())) {
wrapper.eq(RefundOrder::getAppId, refundOrder.getAppId());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(RefundOrder::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(RefundOrder::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
// 三合一订单
if (paramJSON != null && StringUtils.isNotEmpty(paramJSON.getString("unionOrderId"))) {
wrapper.and(wr -> {
wr.eq(RefundOrder::getPayOrderId, paramJSON.getString("unionOrderId"))
.or().eq(RefundOrder::getRefundOrderId, paramJSON.getString("unionOrderId"))
.or().eq(RefundOrder::getChannelPayOrderNo, paramJSON.getString("unionOrderId"))
.or().eq(RefundOrder::getMchRefundNo, paramJSON.getString("unionOrderId"));
});
}
wrapper.orderByDesc(RefundOrder::getCreatedAt);
return page(iPage, wrapper);
}
}

44
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/TransferOrderService.java
View File

@ -15,7 +15,10 @@
*/
package com.jeequan.jeepay.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jeequan.jeepay.core.entity.TransferOrder;
import com.jeequan.jeepay.service.mapper.TransferOrderMapper;
@ -112,6 +115,43 @@ public class TransferOrderService extends ServiceImpl<TransferOrderMapper, Trans
}
public IPage<TransferOrder> pageList(IPage iPage, LambdaQueryWrapper<TransferOrder> wrapper, TransferOrder transferOrder, JSONObject paramJSON) {
if (StringUtils.isNotEmpty(transferOrder.getTransferId())) {
wrapper.eq(TransferOrder::getTransferId, transferOrder.getTransferId());
}
if (StringUtils.isNotEmpty(transferOrder.getMchOrderNo())) {
wrapper.eq(TransferOrder::getMchOrderNo, transferOrder.getMchOrderNo());
}
if (StringUtils.isNotEmpty(transferOrder.getChannelOrderNo())) {
wrapper.eq(TransferOrder::getChannelOrderNo, transferOrder.getChannelOrderNo());
}
if (StringUtils.isNotEmpty(transferOrder.getMchNo())) {
wrapper.eq(TransferOrder::getMchNo, transferOrder.getMchNo());
}
if (transferOrder.getState() != null) {
wrapper.eq(TransferOrder::getState, transferOrder.getState());
}
if (StringUtils.isNotEmpty(transferOrder.getAppId())) {
wrapper.eq(TransferOrder::getAppId, transferOrder.getAppId());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(TransferOrder::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(TransferOrder::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
// 三合一订单
if (paramJSON != null && StringUtils.isNotEmpty(paramJSON.getString("unionOrderId"))) {
wrapper.and(wr -> {
wr.eq(TransferOrder::getTransferId, paramJSON.getString("unionOrderId"))
.or().eq(TransferOrder::getMchOrderNo, paramJSON.getString("unionOrderId"))
.or().eq(TransferOrder::getChannelOrderNo, paramJSON.getString("unionOrderId"));
});
}
wrapper.orderByDesc(TransferOrder::getCreatedAt);
return page(iPage, wrapper);
}
}