From f5b8cfd5928f83a2585801b8c2d339fcbeecb73a Mon Sep 17 00:00:00 2001 From: xiaoyu <17601026937@163.com> Date: Tue, 16 Nov 2021 16:44:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=9B=E5=A2=9E=E5=8A=A0=E5=A4=9A?= =?UTF-8?q?=E5=90=88=E4=B8=80=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeequan/jeepay/core/constants/CS.java | 3 + .../jeepay/mgr/ctrl/anon/AuthController.java | 3 +- .../mgr/ctrl/order/PayOrderController.java | 42 +------------ .../mgr/ctrl/order/RefundOrderController.java | 39 +----------- .../ctrl/order/TransferOrderController.java | 32 +--------- .../jeepay/mch/ctrl/anon/AuthController.java | 3 +- .../mch/ctrl/order/PayOrderController.java | 32 +--------- .../mch/ctrl/order/RefundOrderController.java | 29 +-------- .../ctrl/order/TransferOrderController.java | 34 +--------- .../jeepay/service/impl/PayOrderService.java | 62 ++++++++++++++++++- .../service/impl/RefundOrderService.java | 52 ++++++++++++++++ .../service/impl/TransferOrderService.java | 42 ++++++++++++- 12 files changed, 170 insertions(+), 203 deletions(-) diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/constants/CS.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/constants/CS.java index e821101..f423b70 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/constants/CS.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/constants/CS.java @@ -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"; diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/anon/AuthController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/anon/AuthController.java index c3f1486..d5c2d99 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/anon/AuthController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/anon/AuthController.java @@ -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); } diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java index a66d73e..d5409dc 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java @@ -73,46 +73,8 @@ public class PayOrderController extends CommonCtrl { PayOrder payOrder = getObject(PayOrder.class); JSONObject paramJSON = getReqParamJSON(); LambdaQueryWrapper 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 pages = payOrderService.page(getIPage(), wrapper); + + IPage pages = payOrderService.listByPage(getIPage(), payOrder, paramJSON, wrapper); // 得到所有支付方式 Map payWayNameMap = new HashMap<>(); List payWayList = payWayService.list(); diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java index e392878..15f879f 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java @@ -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 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 pages = refundOrderService.page(getIPage(), wrapper); + IPage pages = refundOrderService.pageList(getIPage(), wrapper, refundOrder, paramJSON); return ApiRes.page(pages); } diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/TransferOrderController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/TransferOrderController.java index 3f742b0..1db8a8a 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/TransferOrderController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/TransferOrderController.java @@ -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 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 pages = transferOrderService.page(getIPage(), wrapper); + IPage pages = transferOrderService.pageList(getIPage(), wrapper, transferOrder, paramJSON); return ApiRes.page(pages); } diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/anon/AuthController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/anon/AuthController.java index 900ea19..b6d845b 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/anon/AuthController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/anon/AuthController.java @@ -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); } diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java index 83f5a44..adf7213 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java @@ -76,38 +76,8 @@ public class PayOrderController extends CommonCtrl { LambdaQueryWrapper 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 pages = payOrderService.page(getIPage(), wrapper); + IPage pages = payOrderService.listByPage(getIPage(), payOrder, paramJSON, wrapper); // 得到所有支付方式 Map payWayNameMap = new HashMap<>(); diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java index fadfb0c..dc77b46 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java @@ -57,34 +57,7 @@ public class RefundOrderController extends CommonCtrl { JSONObject paramJSON = getReqParamJSON(); LambdaQueryWrapper 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 pages = refundOrderService.page(getIPage(), wrapper); + IPage pages = refundOrderService.pageList(getIPage(), wrapper, refundOrder, paramJSON); return ApiRes.page(pages); } diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/TransferOrderController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/TransferOrderController.java index b4654aa..597feb6 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/TransferOrderController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/TransferOrderController.java @@ -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 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 pages = transferOrderService.page(getIPage(), wrapper); + IPage pages = transferOrderService.pageList(getIPage(), wrapper, transferOrder, paramJSON); return ApiRes.page(pages); } diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayOrderService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayOrderService.java index 07e03fc..ee91d94 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayOrderService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/PayOrderService.java @@ -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 { } + /** + * 通用列表查询条件 + * @param iPage + * @param payOrder + * @param paramJSON + * @param wrapper + * @return + */ + public IPage listByPage(IPage iPage, PayOrder payOrder, JSONObject paramJSON, LambdaQueryWrapper 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); + } } diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/RefundOrderService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/RefundOrderService.java index e6ebae1..1b25d4f 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/RefundOrderService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/RefundOrderService.java @@ -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 pageList(IPage iPage, LambdaQueryWrapper 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); + } } diff --git a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/TransferOrderService.java b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/TransferOrderService.java index a4b7f1c..7324c0c 100644 --- a/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/TransferOrderService.java +++ b/jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/TransferOrderService.java @@ -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 pageList(IPage iPage, LambdaQueryWrapper 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); + } }