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

阿里巴巴代码规范检测整改

This commit is contained in:
terrfly 2021-07-29 11:00:05 +08:00
parent 10f3c8c34a
commit 91b1c1c592
65 changed files with 615 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/constant/MQSendTypeEnum.java
View File

@ -16,14 +16,14 @@
package com.jeequan.jeepay.components.mq.constant;
/**
* 定义MQ消息类型：
* QUEUE - 点对点 （只有1个消费者可消费。 ActiveMQ的queue模式 ）
* BROADCAST - 订阅模式 (所有接收者都可接收到。 ActiveMQ的topic模式, RabbitMQ的fanout类型的交换机, RocketMQ的广播模式 )
*
* 定义MQ消息类型
* @author terrfly
* @site https://www.jeepay.vip
* @date 2021/7/23 16:49
*/
public enum MQSendTypeEnum {
QUEUE, BROADCAST
/** QUEUE - 点对点 （只有1个消费者可消费。 ActiveMQ的queue模式 ） **/
QUEUE,
/** BROADCAST - 订阅模式 (所有接收者都可接收到。 ActiveMQ的topic模式, RabbitMQ的fanout类型的交换机, RocketMQ的广播模式 ) **/
BROADCAST
}

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/activemq/receive/CleanMchLoginAuthCacheActiveMQReceiver.java
View File

@ -43,6 +43,7 @@ public class CleanMchLoginAuthCacheActiveMQReceiver implements IMQMsgReceiver {
private CleanMchLoginAuthCacheMQ.IMQReceiver mqReceiver;
/** 接收 【 queue 】 类型的消息 **/
@Override
@Async(MqThreadExecutor.EXECUTOR_PAYORDER_MCH_NOTIFY)
@JmsListener(destination = CleanMchLoginAuthCacheMQ.MQ_NAME)
public void receiveMsg(String msg){

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/activemq/receive/PayOrderMchNotifyActiveMQReceiver.java
View File

@ -43,6 +43,7 @@ public class PayOrderMchNotifyActiveMQReceiver implements IMQMsgReceiver {
private PayOrderMchNotifyMQ.IMQReceiver mqReceiver;
/** 接收 【 queue 】 类型的消息 **/
@Override
@Async(MqThreadExecutor.EXECUTOR_PAYORDER_MCH_NOTIFY)
@JmsListener(destination = PayOrderMchNotifyMQ.MQ_NAME)
public void receiveMsg(String msg){

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/activemq/receive/PayOrderReissueActiveMQReceiver.java
View File

@ -43,6 +43,7 @@ public class PayOrderReissueActiveMQReceiver implements IMQMsgReceiver {
private PayOrderReissueMQ.IMQReceiver mqReceiver;
/** 接收 【 queue 】 类型的消息 **/
@Override
@Async(MqThreadExecutor.EXECUTOR_PAYORDER_MCH_NOTIFY)
@JmsListener(destination = PayOrderReissueMQ.MQ_NAME)
public void receiveMsg(String msg){

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/activemq/receive/ResetAppConfigActiveMQReceiver.java
View File

@ -42,6 +42,7 @@ public class ResetAppConfigActiveMQReceiver implements IMQMsgReceiver {
private ResetAppConfigMQ.IMQReceiver mqReceiver;
/** 接收 【 MQSendTypeEnum.BROADCAST 】 广播类型的消息 **/
@Override
@JmsListener(destination = ResetAppConfigMQ.MQ_NAME, containerFactory = ActiveMQConfig.TOPIC_LISTENER_CONTAINER)
public void receiveMsg(String msg){
mqReceiver.receive(ResetAppConfigMQ.parse(msg));

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/activemq/receive/ResetIsvMchAppInfoActiveMQReceiver.java
View File

@ -42,6 +42,7 @@ public class ResetIsvMchAppInfoActiveMQReceiver implements IMQMsgReceiver {
private ResetIsvMchAppInfoConfigMQ.IMQReceiver mqReceiver;
/** 接收 【 MQSendTypeEnum.BROADCAST 】 广播类型的消息 **/
@Override
@JmsListener(destination = ResetIsvMchAppInfoConfigMQ.MQ_NAME, containerFactory = ActiveMQConfig.TOPIC_LISTENER_CONTAINER)
public void receiveMsg(String msg){
mqReceiver.receive(ResetIsvMchAppInfoConfigMQ.parse(msg));

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rabbitmq/receive/CleanMchLoginAuthCacheRabbitMQReceiver.java
View File

@ -43,6 +43,7 @@ public class CleanMchLoginAuthCacheRabbitMQReceiver implements IMQMsgReceiver {
private CleanMchLoginAuthCacheMQ.IMQReceiver mqReceiver;
/** 接收 【 queue 】 类型的消息 **/
@Override
@Async(MqThreadExecutor.EXECUTOR_PAYORDER_MCH_NOTIFY)
@RabbitListener(queues = CleanMchLoginAuthCacheMQ.MQ_NAME)
public void receiveMsg(String msg){

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rabbitmq/receive/PayOrderMchNotifyRabbitMQReceiver.java
View File

@ -43,6 +43,7 @@ public class PayOrderMchNotifyRabbitMQReceiver implements IMQMsgReceiver {
private PayOrderMchNotifyMQ.IMQReceiver mqReceiver;
/** 接收 【 queue 】 类型的消息 **/
@Override
@Async(MqThreadExecutor.EXECUTOR_PAYORDER_MCH_NOTIFY)
@RabbitListener(queues = PayOrderMchNotifyMQ.MQ_NAME)
public void receiveMsg(String msg){

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rabbitmq/receive/PayOrderReissueRabbitMQReceiver.java
View File

@ -43,6 +43,7 @@ public class PayOrderReissueRabbitMQReceiver implements IMQMsgReceiver {
private PayOrderReissueMQ.IMQReceiver mqReceiver;
/** 接收 【 queue 】 类型的消息 **/
@Override
@Async(MqThreadExecutor.EXECUTOR_PAYORDER_MCH_NOTIFY)
@RabbitListener(queues = PayOrderReissueMQ.MQ_NAME)
public void receiveMsg(String msg){

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rabbitmq/receive/ResetAppConfigRabbitMQReceiver.java
View File

@ -55,6 +55,7 @@ public class ResetAppConfigRabbitMQReceiver implements IMQMsgReceiver {
* 参考： https://bbs.csdn.net/topics/392509262?list=70088931
*
* **/
@Override
@RabbitListener(
bindings = {@QueueBinding(value = @Queue(), // 注意这里不要定义队列名称,系统会随机产生
exchange = @Exchange(name = RabbitMQConfig.FANOUT_EXCHANGE_NAME_PREFIX + ResetAppConfigMQ.MQ_NAME,

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rabbitmq/receive/ResetIsvMchAppInfoRabbitMQReceiver.java
View File

@ -55,6 +55,7 @@ public class ResetIsvMchAppInfoRabbitMQReceiver implements IMQMsgReceiver {
* 参考： https://bbs.csdn.net/topics/392509262?list=70088931
*
* **/
@Override
@RabbitListener(
bindings = {@QueueBinding(value = @Queue(), // 注意这里不要定义队列名称,系统会随机产生
exchange = @Exchange(name = RabbitMQConfig.FANOUT_EXCHANGE_NAME_PREFIX + ResetIsvMchAppInfoConfigMQ.MQ_NAME,

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rocketmq/receive/CleanMchLoginAuthCacheRocketMQReceiver.java
View File

@ -43,6 +43,7 @@ public class CleanMchLoginAuthCacheRocketMQReceiver implements IMQMsgReceiver, R
private CleanMchLoginAuthCacheMQ.IMQReceiver mqReceiver;
/** 接收 【 queue 】 类型的消息 **/
@Override
public void receiveMsg(String msg){
mqReceiver.receive(CleanMchLoginAuthCacheMQ.parse(msg));
}

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rocketmq/receive/PayOrderMchNotifyRocketMQReceiver.java
View File

@ -45,6 +45,7 @@ public class PayOrderMchNotifyRocketMQReceiver implements IMQMsgReceiver, Rocket
private PayOrderMchNotifyMQ.IMQReceiver mqReceiver;
/** 接收 【 queue 】 类型的消息 **/
@Override
public void receiveMsg(String msg){
mqReceiver.receive(PayOrderMchNotifyMQ.parse(msg));
}

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rocketmq/receive/PayOrderReissueRocketMQReceiver.java
View File

@ -45,6 +45,7 @@ public class PayOrderReissueRocketMQReceiver implements IMQMsgReceiver, RocketMQ
private PayOrderReissueMQ.IMQReceiver mqReceiver;
/** 接收 【 queue 】 类型的消息 **/
@Override
public void receiveMsg(String msg){
mqReceiver.receive(PayOrderReissueMQ.parse(msg));
}

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rocketmq/receive/ResetAppConfigRocketMQReceiver.java
View File

@ -44,6 +44,7 @@ public class ResetAppConfigRocketMQReceiver implements IMQMsgReceiver, RocketMQL
private ResetAppConfigMQ.IMQReceiver mqReceiver;
/** 接收 【 MQSendTypeEnum.BROADCAST 】 广播类型的消息 **/
@Override
public void receiveMsg(String msg){
mqReceiver.receive(ResetAppConfigMQ.parse(msg));
}

1
jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rocketmq/receive/ResetIsvMchAppInfoRocketMQReceiver.java
View File

@ -44,6 +44,7 @@ public class ResetIsvMchAppInfoRocketMQReceiver implements IMQMsgReceiver, Rocke
private ResetIsvMchAppInfoConfigMQ.IMQReceiver mqReceiver;
/** 接收 【 MQSendTypeEnum.BROADCAST 】 广播类型的消息 **/
@Override
public void receiveMsg(String msg){
mqReceiver.receive(ResetIsvMchAppInfoConfigMQ.parse(msg));
}

4
jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/components/oss/ctrl/OssFileController.java
View File

@ -44,7 +44,9 @@ public class OssFileController extends AbstractCtrl {
@PostMapping("/{bizType}")
public ApiRes singleFileUpload(@RequestParam("file") MultipartFile file, @PathVariable("bizType") String bizType) {
if( file == null ) return ApiRes.fail(ApiCodeEnum.SYSTEM_ERROR, "选择文件不存在");
if( file == null ) {
return ApiRes.fail(ApiCodeEnum.SYSTEM_ERROR, "选择文件不存在");
}
try {
OssFileConfig ossFileConfig = OssFileConfig.getOssFileConfigByBizType(bizType);

4
jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/components/oss/service/LocalFileService.java
View File

@ -53,7 +53,9 @@ public class LocalFileService implements IOssService{
//如果文件夹不存在则创建文件夹
File dir = saveFile.getParentFile();
if(!dir.exists()) dir.mkdirs();
if(!dir.exists()) {
dir.mkdirs();
}
multipartFile.transferTo(saveFile);
} catch (Exception e) {

4
jeepay-core/src/main/java/com/jeequan/jeepay/core/beans/RequestKitBean.java
View File

@ -88,7 +88,9 @@ public class RequestKitBean {
body += str;
}
if(StringUtils.isEmpty(body)) return returnObject;
if(StringUtils.isEmpty(body)) {
return returnObject;
}
return JSONObject.parseObject(body);
} catch (Exception e) {

4
jeepay-core/src/main/java/com/jeequan/jeepay/core/cache/RedisUtil.java vendored
View File

@ -51,7 +51,9 @@ public class RedisUtil {
/** 获取缓存数据, String类型 */
public static String getString(String key) {
if(key == null) return null;
if(key == null) {
return null;
}
return (String)getStringRedisTemplate().opsForValue().get(key);
}

28
jeepay-core/src/main/java/com/jeequan/jeepay/core/ctrls/AbstractCtrl.java
View File

@ -77,7 +77,9 @@ public abstract class AbstractCtrl {
/** 获取页码 **/
protected int getPageIndex() {
Integer pageIndex = getReqParamJSON().getInteger(PAGE_INDEX_PARAM_NAME);
if(pageIndex == null) return DEFAULT_PAGE_INDEX;
if(pageIndex == null) {
return DEFAULT_PAGE_INDEX;
}
return pageIndex;
}
@ -90,8 +92,12 @@ public abstract class AbstractCtrl {
protected int getPageSize(boolean allowQueryAll) {
Integer pageSize = getReqParamJSON().getInteger(PAGE_SIZE_PARAM_NAME);
if(allowQueryAll && pageSize != null && pageSize == -1) return Integer.MAX_VALUE; // -1代表获取全部数据，查询int最大值的数据
if(pageSize == null || pageSize < 0) return DEFAULT_PAGE_SIZE;
if(allowQueryAll && pageSize != null && pageSize == -1) {
return Integer.MAX_VALUE; // -1代表获取全部数据，查询int最大值的数据
}
if(pageSize == null || pageSize < 0) {
return DEFAULT_PAGE_SIZE;
}
return pageSize;
}
@ -135,7 +141,9 @@ public abstract class AbstractCtrl {
/** 获取请求参数值 [ T 类型 ], [ 如为null返回默认值 ] **/
protected <T> T getValDefault(String key, T defaultValue, Class<T> cls) {
T value = getVal(key, cls);
if(value == null) return defaultValue;
if(value == null) {
return defaultValue;
}
return value;
}
@ -222,7 +230,9 @@ public abstract class AbstractCtrl {
for(String key : keys) {
String value = getReqParamJSON().getString(key);
if(StringUtils.isEmpty(value)) throw new BizException(ApiCodeEnum.PARAMS_ERROR, genParamRequiredMsg(key));
if(StringUtils.isEmpty(value)) {
throw new BizException(ApiCodeEnum.PARAMS_ERROR, genParamRequiredMsg(key));
}
}
}
@ -236,7 +246,9 @@ public abstract class AbstractCtrl {
/** 得到前端传入的金额元,转换成长整型分 (非必填) **/
public Long getAmountL(String name) {
String amountStr = getValString(name); // 前端填写的为元,可以为小数点2位
if(StringUtils.isEmpty(amountStr)) return null;
if(StringUtils.isEmpty(amountStr)) {
return null;
}
Long amountL = new BigDecimal(amountStr.trim()).multiply(new BigDecimal(100)).longValue(); // // 转成分
return amountL;
}
@ -288,7 +300,9 @@ public abstract class AbstractCtrl {
//如果文件夹不存在则创建文件夹
File dir = saveFile.getParentFile();
if(!dir.exists()) dir.mkdirs();
if(!dir.exists()) {
dir.mkdirs();
}
file.transferTo(saveFile);
}

10
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchNotifyRecord.java
View File

@ -42,13 +42,13 @@ import java.util.Date;
public class MchNotifyRecord extends BaseModel implements Serializable {
//订单类型:1-支付,2-退款
public static final Byte TYPE_PAY_ORDER = 1;
public static final Byte TYPE_REFUND_ORDER = 2;
public static final byte TYPE_PAY_ORDER = 1;
public static final byte TYPE_REFUND_ORDER = 2;
//通知状态
public static final Byte STATE_ING = 1;
public static final Byte STATE_SUCCESS = 2;
public static final Byte STATE_FAIL = 3;
public static final byte STATE_ING = 1;
public static final byte STATE_SUCCESS = 2;
public static final byte STATE_FAIL = 3;
//gw
public static final LambdaQueryWrapper<MchNotifyRecord> gw(){

6
jeepay-core/src/main/java/com/jeequan/jeepay/core/model/BaseModel.java
View File

@ -22,7 +22,7 @@ import java.io.Serializable;
/*
* BaseModel 封装公共处理函数
*
*
* @author terrfly
* @site https://www.jeepay.vip
* @date 2021/6/8 16:49
@ -47,7 +47,9 @@ public class BaseModel<T> implements Serializable{
//设置扩展字段
public BaseModel addExt(String key, Object val) {
if(ext == null) ext = new JSONObject();
if(ext == null) {
ext = new JSONObject();
}
ext.put(key,val);
return this;
}

4
jeepay-core/src/main/java/com/jeequan/jeepay/core/model/security/JeeUserDetails.java
View File

@ -110,7 +110,9 @@ public class JeeUserDetails implements UserDetails {
public static JeeUserDetails getCurrentUserDetails() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) return null;
if (authentication == null) {
return null;
}
try {
return (JeeUserDetails) authentication.getPrincipal();

32
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/AmountUtil.java
View File

@ -75,15 +75,17 @@ public class AmountUtil {
l = Math.abs(l);
}
s = Long.toString(l);
if(s.length() == 1)
if(s.length() == 1) {
return(negative ? ("-0.0" + s) : ("0.0" + s));
if(s.length() == 2)
}
if(s.length() == 2) {
return(negative ? ("-0." + s) : ("0." + s));
else
} else {
return(negative ? ("-" + s.substring(0, s.length() - 2) + "." + s
.substring(s.length() - 2)) : (s.substring(0,
s.length() - 2)
+ "." + s.substring(s.length() - 2)));
}
}
@ -94,7 +96,9 @@ public class AmountUtil {
* @return
*/
public static String convertCent2Dollar(Long s){
if(s == null) return "";
if(s == null) {
return "";
}
return new BigDecimal(s).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
}
@ -106,24 +110,14 @@ public class AmountUtil {
public static String convertCent2DollarShort(String s) {
String ss = convertCent2Dollar(s);
ss = "" + Double.parseDouble(ss);
if(ss.endsWith(".0"))
if(ss.endsWith(".0")) {
return ss.substring(0, ss.length() - 2);
if(ss.endsWith(".00"))
}
if(ss.endsWith(".00")) {
return ss.substring(0, ss.length() - 3);
else
} else {
return ss;
}
/**
* 判断金额为2位小数
* @param str
* @return
*/
public static boolean isAmount(String str){
if(str == null) return false;
Pattern pattern = Pattern.compile("^(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){0,2})?$"); // 判断小数点后2位的数字的正则表达式
Matcher match = pattern.matcher(str);
return match.matches();
}
}
}

4
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/ApiResBodyAdviceKit.java
View File

@ -42,7 +42,9 @@ public class ApiResBodyAdviceKit {
public static Object beforeBodyWrite(Object body) {
//空的情况 不处理
if(body == null ) return null;
if(body == null ) {
return null;
}
if(body instanceof OriginalRes){
return ((OriginalRes) body).getData();

14
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/DateKit.java
View File

@ -23,7 +23,7 @@ import java.util.Date;
/*
* 时间工具类
*
*
* @author terrfly
* @site https://www.jeepay.vip
* @date 2021/6/8 16:58
@ -33,13 +33,17 @@ public class DateKit {
/** 获取参数时间当天的开始时间 **/
public static Date getBegin(Date date){
if(date == null) return null;
if(date == null) {
return null;
}
return DateUtil.beginOfDay(date).toJdkDate();
}
/** 获取参数时间当天的结束时间 **/
public static Date getEnd(Date date){
if(date == null) return null;
if(date == null) {
return null;
}
return DateUtil.endOfDay(date).toJdkDate();
}
@ -98,7 +102,9 @@ public class DateKit {
}else if("customDate".equals(dateType) || "customDateTime".equals(dateType)){ //自定义格式
String[] timeArray = dateVal.split(","); //以逗号分割
if(timeArray.length != 2) throw new BizException("查询自定义时间参数有误");
if(timeArray.length != 2) {
throw new BizException("查询自定义时间参数有误");
}
String timeStr1 = "N".equalsIgnoreCase(timeArray[0]) ? null : timeArray[0] ; //开始时间，
String timeStr2 = "N".equalsIgnoreCase(timeArray[1]) ? null : timeArray[1]; //结束时间， N表示为空， 占位使用

6
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/FileKit.java
View File

@ -20,7 +20,7 @@ import com.jeequan.jeepay.core.exception.BizException;
/*
* 文件工具类
*
*
* @author terrfly
* @site https://www.jeepay.vip
* @date 2021/6/8 16:50
@ -34,7 +34,9 @@ public class FileKit {
* @return
*/
public static String getFileSuffix(String fullFileName, boolean appendDot){
if(fullFileName == null || fullFileName.indexOf(".") < 0 || fullFileName.length() <= 1) return "";
if(fullFileName == null || fullFileName.indexOf(".") < 0 || fullFileName.length() <= 1) {
return "";
}
return (appendDot? "." : "") + fullFileName.substring(fullFileName.lastIndexOf(".") + 1);
}

18
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/JeepayKit.java
View File

@ -109,13 +109,15 @@ public class JeepayKit {
}
public static String toHex(byte input[]) {
if (input == null)
if (input == null) {
return null;
}
StringBuffer output = new StringBuffer(input.length * 2);
for (int i = 0; i < input.length; i++) {
int current = input[i] & 0xff;
if (current < 16)
if (current < 16) {
output.append("0");
}
output.append(Integer.toString(current, 16));
}
@ -124,13 +126,17 @@ public class JeepayKit {
/** map 转换为 url参数 **/
public static String genUrlParams(Map<String, Object> paraMap) {
if(paraMap == null || paraMap.isEmpty()) return "";
if(paraMap == null || paraMap.isEmpty()) {
return "";
}
StringBuffer urlParam = new StringBuffer();
Set<String> keySet = paraMap.keySet();
int i = 0;
for(String key:keySet) {
urlParam.append(key).append("=").append( paraMap.get(key) == null ? "" : paraMap.get(key) );
if(++i == keySet.size()) break;
if(++i == keySet.size()) {
break;
}
urlParam.append("&");
}
return urlParam.toString();
@ -139,7 +145,9 @@ public class JeepayKit {
/** 校验微信/支付宝二维码是否符合规范， 并根据支付类型返回对应的支付方式 **/
public static String getPayWayCodeByBarCode(String barCode){
if(StringUtils.isEmpty(barCode)) throw new BizException("条码为空");
if(StringUtils.isEmpty(barCode)) {
throw new BizException("条码为空");
}
//微信 ： 用户付款码条形码规则：18位纯数字，以10、11、12、13、14、15开头
//文档： https://pay.weixin.qq.com/wiki/doc/api/micropay.php?chapter=5_1

4
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/RegKit.java
View File

@ -32,7 +32,9 @@ public class RegKit {
/** 正则验证 */
public static boolean match(String text, String reg){
if(text == null) return false;
if(text == null) {
return false;
}
return text.matches(reg);
}

2
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/StringKit.java
View File

@ -45,7 +45,7 @@ public class StringKit {
if(StringUtils.isEmpty(url) || map == null || map.isEmpty()){
return url;
}
UrlBuilder result = UrlBuilder.create().of(url);
UrlBuilder result = UrlBuilder.of(url);
map.forEach((k, v) -> {
if(k != null && v != null){
result.addQuery(k, v.toString());

12
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java
View File

@ -99,9 +99,15 @@ public class CurrentUserController extends CommonCtrl{
Byte sex = getValByte("sex");
SysUser updateRecord = new SysUser();
updateRecord.setSysUserId(getCurrentUser().getSysUser().getSysUserId());
if (StringUtils.isNotEmpty(avatarUrl)) updateRecord.setAvatarUrl(avatarUrl);
if (StringUtils.isNotEmpty(realname)) updateRecord.setRealname(realname);
if (sex != null) updateRecord.setSex(sex);
if (StringUtils.isNotEmpty(avatarUrl)) {
updateRecord.setAvatarUrl(avatarUrl);
}
if (StringUtils.isNotEmpty(realname)) {
updateRecord.setRealname(realname);
}
if (sex != null) {
updateRecord.setSex(sex);
}
sysUserService.updateById(updateRecord);

4
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/common/StaticController.java
View File

@ -50,7 +50,9 @@ public class StaticController extends CommonCtrl {
//查找图片文件
File imgFile = new File(ossYmlConfig.getOss().getFilePublicPath() + File.separator + request.getRequestURI().substring(24));
if(!imgFile.isFile() || !imgFile.exists()) return new ResponseEntity<>(HttpStatus.NOT_FOUND);
if(!imgFile.isFile() || !imgFile.exists()) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
}
//输出文件流（图片格式）
HttpHeaders httpHeaders = new HttpHeaders();

4
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/SysConfigController.java
View File

@ -83,7 +83,9 @@ public class SysConfigController extends CommonCtrl {
JSONObject paramJSON = getReqParamJSON();
Map<String, String> updateMap = JSONObject.toJavaObject(paramJSON, Map.class);
int update = sysConfigService.updateByConfigKey(updateMap);
if(update <= 0) return ApiRes.fail(ApiCodeEnum.SYSTEM_ERROR, "更新失败");
if(update <= 0) {
return ApiRes.fail(ApiCodeEnum.SYSTEM_ERROR, "更新失败");
}
mqSender.send(ResetAppConfigMQ.build(groupKey));
return ApiRes.ok();

24
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java
View File

@ -58,9 +58,15 @@ public class IsvInfoController extends CommonCtrl {
public ApiRes list() {
IsvInfo isvInfo = getObject(IsvInfo.class);
LambdaQueryWrapper<IsvInfo> wrapper = IsvInfo.gw();
if (StringUtils.isNotEmpty(isvInfo.getIsvNo())) wrapper.eq(IsvInfo::getIsvNo, isvInfo.getIsvNo());
if (StringUtils.isNotEmpty(isvInfo.getIsvName())) wrapper.eq(IsvInfo::getIsvName, isvInfo.getIsvName());
if (isvInfo.getState() != null) wrapper.eq(IsvInfo::getState, isvInfo.getState());
if (StringUtils.isNotEmpty(isvInfo.getIsvNo())) {
wrapper.eq(IsvInfo::getIsvNo, isvInfo.getIsvNo());
}
if (StringUtils.isNotEmpty(isvInfo.getIsvName())) {
wrapper.eq(IsvInfo::getIsvName, isvInfo.getIsvName());
}
if (isvInfo.getState() != null) {
wrapper.eq(IsvInfo::getState, isvInfo.getState());
}
wrapper.orderByDesc(IsvInfo::getCreatedAt);
IPage<IsvInfo> pages = isvInfoService.page(getIPage(true), wrapper);
@ -82,7 +88,9 @@ public class IsvInfoController extends CommonCtrl {
isvInfo.setCreatedUid(getCurrentUser().getSysUser().getSysUserId());
isvInfo.setCreatedBy(getCurrentUser().getSysUser().getRealname());
boolean result = isvInfoService.save(isvInfo);
if (!result) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
if (!result) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
}
return ApiRes.ok();
}
@ -118,7 +126,9 @@ public class IsvInfoController extends CommonCtrl {
// 推送mq到目前节点进行更新数据
mqSender.send(ResetIsvMchAppInfoConfigMQ.build(ResetIsvMchAppInfoConfigMQ.RESET_TYPE_ISV_INFO, isvNo, null, null));
if (!result) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE);
if (!result) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_UPDATE);
}
return ApiRes.ok();
}
@ -131,7 +141,9 @@ public class IsvInfoController extends CommonCtrl {
@RequestMapping(value="/{isvNo}", method = RequestMethod.GET)
public ApiRes detail(@PathVariable("isvNo") String isvNo) {
IsvInfo isvInfo = isvInfoService.getById(isvNo);
if (isvInfo == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (isvInfo == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
return ApiRes.ok(isvInfo);
}
}

28
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java
View File

@ -70,11 +70,21 @@ public class MchInfoController extends CommonCtrl {
MchInfo mchInfo = getObject(MchInfo.class);
LambdaQueryWrapper<MchInfo> wrapper = MchInfo.gw();
if (StringUtils.isNotEmpty(mchInfo.getMchNo())) wrapper.eq(MchInfo::getMchNo, mchInfo.getMchNo());
if (StringUtils.isNotEmpty(mchInfo.getIsvNo())) wrapper.eq(MchInfo::getIsvNo, mchInfo.getIsvNo());
if (StringUtils.isNotEmpty(mchInfo.getMchName())) wrapper.eq(MchInfo::getMchName, mchInfo.getMchName());
if (mchInfo.getType() != null) wrapper.eq(MchInfo::getType, mchInfo.getType());
if (mchInfo.getState() != null) wrapper.eq(MchInfo::getState, mchInfo.getState());
if (StringUtils.isNotEmpty(mchInfo.getMchNo())) {
wrapper.eq(MchInfo::getMchNo, mchInfo.getMchNo());
}
if (StringUtils.isNotEmpty(mchInfo.getIsvNo())) {
wrapper.eq(MchInfo::getIsvNo, mchInfo.getIsvNo());
}
if (StringUtils.isNotEmpty(mchInfo.getMchName())) {
wrapper.eq(MchInfo::getMchName, mchInfo.getMchName());
}
if (mchInfo.getType() != null) {
wrapper.eq(MchInfo::getType, mchInfo.getType());
}
if (mchInfo.getState() != null) {
wrapper.eq(MchInfo::getState, mchInfo.getState());
}
wrapper.orderByDesc(MchInfo::getCreatedAt);
IPage<MchInfo> pages = mchInfoService.page(getIPage(), wrapper);
@ -187,10 +197,14 @@ public class MchInfoController extends CommonCtrl {
@RequestMapping(value="/{mchNo}", method = RequestMethod.GET)
public ApiRes detail(@PathVariable("mchNo") String mchNo) {
MchInfo mchInfo = mchInfoService.getById(mchNo);
if (mchInfo == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (mchInfo == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
SysUser sysUser = sysUserService.getById(mchInfo.getInitUserId());
if (sysUser != null) mchInfo.addExt("loginUserName", sysUser.getLoginUsername());
if (sysUser != null) {
mchInfo.addExt("loginUserName", sysUser.getLoginUsername());
}
return ApiRes.ok(mchInfo);
}
}

8
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayPassageConfigController.java
View File

@ -69,8 +69,12 @@ public class MchPayPassageConfigController extends CommonCtrl {
//支付方式集合
LambdaQueryWrapper<PayWay> wrapper = PayWay.gw();
if (StrUtil.isNotBlank(wayCode)) wrapper.eq(PayWay::getWayCode, wayCode);
if (StrUtil.isNotBlank(wayName)) wrapper.like(PayWay::getWayName, wayName);
if (StrUtil.isNotBlank(wayCode)) {
wrapper.eq(PayWay::getWayCode, wayCode);
}
if (StrUtil.isNotBlank(wayName)) {
wrapper.like(PayWay::getWayName, wayName);
}
IPage<PayWay> payWayPage = payWayService.page(getIPage(), wrapper);
if (!CollectionUtils.isEmpty(payWayPage.getRecords())) {

48
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java
View File

@ -61,17 +61,35 @@ public class MchNotifyController extends CommonCtrl {
MchNotifyRecord mchNotify = getObject(MchNotifyRecord.class);
JSONObject paramJSON = getReqParamJSON();
LambdaQueryWrapper<MchNotifyRecord> wrapper = MchNotifyRecord.gw();
if (StringUtils.isNotEmpty(mchNotify.getOrderId())) wrapper.eq(MchNotifyRecord::getOrderId, mchNotify.getOrderId());
if (StringUtils.isNotEmpty(mchNotify.getMchNo())) wrapper.eq(MchNotifyRecord::getMchNo, mchNotify.getMchNo());
if (StringUtils.isNotEmpty(mchNotify.getIsvNo())) wrapper.eq(MchNotifyRecord::getIsvNo, mchNotify.getIsvNo());
if (StringUtils.isNotEmpty(mchNotify.getMchOrderNo())) wrapper.eq(MchNotifyRecord::getMchOrderNo, mchNotify.getMchOrderNo());
if (mchNotify.getOrderType() != null) wrapper.eq(MchNotifyRecord::getOrderType, mchNotify.getOrderType());
if (mchNotify.getState() != null) wrapper.eq(MchNotifyRecord::getState, mchNotify.getState());
if (StringUtils.isNotEmpty(mchNotify.getAppId())) wrapper.eq(MchNotifyRecord::getAppId, mchNotify.getAppId());
if (StringUtils.isNotEmpty(mchNotify.getOrderId())) {
wrapper.eq(MchNotifyRecord::getOrderId, mchNotify.getOrderId());
}
if (StringUtils.isNotEmpty(mchNotify.getMchNo())) {
wrapper.eq(MchNotifyRecord::getMchNo, mchNotify.getMchNo());
}
if (StringUtils.isNotEmpty(mchNotify.getIsvNo())) {
wrapper.eq(MchNotifyRecord::getIsvNo, mchNotify.getIsvNo());
}
if (StringUtils.isNotEmpty(mchNotify.getMchOrderNo())) {
wrapper.eq(MchNotifyRecord::getMchOrderNo, mchNotify.getMchOrderNo());
}
if (mchNotify.getOrderType() != null) {
wrapper.eq(MchNotifyRecord::getOrderType, mchNotify.getOrderType());
}
if (mchNotify.getState() != null) {
wrapper.eq(MchNotifyRecord::getState, mchNotify.getState());
}
if (StringUtils.isNotEmpty(mchNotify.getAppId())) {
wrapper.eq(MchNotifyRecord::getAppId, mchNotify.getAppId());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) wrapper.ge(MchNotifyRecord::getCreatedAt, paramJSON.getString("createdStart"));
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) wrapper.le(MchNotifyRecord::getCreatedAt, paramJSON.getString("createdEnd"));
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
wrapper.ge(MchNotifyRecord::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
wrapper.le(MchNotifyRecord::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
wrapper.orderByDesc(MchNotifyRecord::getCreatedAt);
IPage<MchNotifyRecord> pages = mchNotifyService.page(getIPage(), wrapper);
@ -88,7 +106,9 @@ public class MchNotifyController extends CommonCtrl {
@RequestMapping(value="/{notifyId}", method = RequestMethod.GET)
public ApiRes detail(@PathVariable("notifyId") String notifyId) {
MchNotifyRecord mchNotify = mchNotifyService.getById(notifyId);
if (mchNotify == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (mchNotify == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
return ApiRes.ok(mchNotify);
}
@ -101,8 +121,12 @@ public class MchNotifyController extends CommonCtrl {
@RequestMapping(value="resend/{notifyId}", method = RequestMethod.POST)
public ApiRes resend(@PathVariable("notifyId") Long notifyId) {
MchNotifyRecord mchNotify = mchNotifyService.getById(notifyId);
if (mchNotify == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (mchNotify.getState() != MchNotifyRecord.STATE_FAIL) throw new BizException("请选择失败的通知记录");
if (mchNotify == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
if (mchNotify.getState() != MchNotifyRecord.STATE_FAIL) {
throw new BizException("请选择失败的通知记录");
}
//更新通知中
mchNotifyService.getBaseMapper().updateIngAndAddNotifyCountLimit(notifyId);

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

@ -73,18 +73,40 @@ 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 (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 (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 (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);
@ -114,7 +136,9 @@ public class PayOrderController extends CommonCtrl {
@RequestMapping(value="/{payOrderId}", method = RequestMethod.GET)
public ApiRes detail(@PathVariable("payOrderId") String payOrderId) {
PayOrder payOrder = payOrderService.getById(payOrderId);
if (payOrder == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (payOrder == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
return ApiRes.ok(payOrder);
}
@ -134,7 +158,9 @@ public class PayOrderController extends CommonCtrl {
String refundReason = getValStringRequired("refundReason");
PayOrder payOrder = payOrderService.getById(payOrderId);
if (payOrder == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (payOrder == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
if(payOrder.getState() != PayOrder.STATE_SUCCESS){
throw new BizException("订单状态不正确");

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

@ -56,18 +56,40 @@ 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 (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 (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);
@ -84,7 +106,9 @@ public class RefundOrderController extends CommonCtrl {
@RequestMapping(value="/{refundOrderId}", method = RequestMethod.GET)
public ApiRes detail(@PathVariable("refundOrderId") String refundOrderId) {
RefundOrder refundOrder = refundOrderService.getById(refundOrderId);
if (refundOrder == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (refundOrder == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
return ApiRes.ok(refundOrder);
}
}

28
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java
View File

@ -62,12 +62,22 @@ public class SysLogController extends CommonCtrl {
// 查询列表
LambdaQueryWrapper<SysLog> condition = SysLog.gw();
condition.orderByDesc(SysLog::getCreatedAt);
if (sysLog.getUserId() != null) condition.eq(SysLog::getUserId, sysLog.getUserId());
if (sysLog.getUserName() != null) condition.eq(SysLog::getUserName, sysLog.getUserName());
if (StringUtils.isNotEmpty(sysLog.getSysType())) condition.eq(SysLog::getSysType, sysLog.getSysType());
if (sysLog.getUserId() != null) {
condition.eq(SysLog::getUserId, sysLog.getUserId());
}
if (sysLog.getUserName() != null) {
condition.eq(SysLog::getUserName, sysLog.getUserName());
}
if (StringUtils.isNotEmpty(sysLog.getSysType())) {
condition.eq(SysLog::getSysType, sysLog.getSysType());
}
if (paramJSON != null) {
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) condition.ge(SysLog::getCreatedAt, paramJSON.getString("createdStart"));
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) condition.le(SysLog::getCreatedAt, paramJSON.getString("createdEnd"));
if (StringUtils.isNotEmpty(paramJSON.getString("createdStart"))) {
condition.ge(SysLog::getCreatedAt, paramJSON.getString("createdStart"));
}
if (StringUtils.isNotEmpty(paramJSON.getString("createdEnd"))) {
condition.le(SysLog::getCreatedAt, paramJSON.getString("createdEnd"));
}
}
IPage<SysLog> pages = sysLogService.page(getIPage(), condition);
return ApiRes.page(pages);
@ -82,7 +92,9 @@ public class SysLogController extends CommonCtrl {
@RequestMapping(value="/{sysLogId}", method = RequestMethod.GET)
public ApiRes detail(@PathVariable("sysLogId") String sysLogId) {
SysLog sysLog = sysLogService.getById(sysLogId);
if (sysLog == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (sysLog == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
return ApiRes.ok(sysLog);
}
@ -101,7 +113,9 @@ public class SysLogController extends CommonCtrl {
idsList.add(Long.valueOf(id));
}
boolean result = sysLogService.removeByIds(idsList);
if (!result) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_DELETE);
if (!result) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_DELETE);
}
return ApiRes.ok();
}
}

12
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/CurrentUserController.java
View File

@ -103,9 +103,15 @@ public class CurrentUserController extends CommonCtrl{
Byte sex = getValByte("sex");
SysUser updateRecord = new SysUser();
updateRecord.setSysUserId(getCurrentUser().getSysUser().getSysUserId());
if (StringUtils.isNotEmpty(avatarUrl)) updateRecord.setAvatarUrl(avatarUrl);
if (StringUtils.isNotEmpty(realname)) updateRecord.setRealname(realname);
if (sex != null) updateRecord.setSex(sex);
if (StringUtils.isNotEmpty(avatarUrl)) {
updateRecord.setAvatarUrl(avatarUrl);
}
if (StringUtils.isNotEmpty(realname)) {
updateRecord.setRealname(realname);
}
if (sex != null) {
updateRecord.setSex(sex);
}
sysUserService.updateById(updateRecord);

16
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchPayPassageConfigController.java
View File

@ -70,8 +70,12 @@ public class MchPayPassageConfigController extends CommonCtrl {
//支付方式集合
LambdaQueryWrapper<PayWay> wrapper = PayWay.gw();
if (StrUtil.isNotBlank(wayCode)) wrapper.eq(PayWay::getWayCode, wayCode);
if (StrUtil.isNotBlank(wayName)) wrapper.like(PayWay::getWayName, wayName);
if (StrUtil.isNotBlank(wayCode)) {
wrapper.eq(PayWay::getWayCode, wayCode);
}
if (StrUtil.isNotBlank(wayName)) {
wrapper.like(PayWay::getWayName, wayName);
}
IPage<PayWay> payWayPage = payWayService.page(getIPage(), wrapper);
if (!CollectionUtils.isEmpty(payWayPage.getRecords())) {
@ -131,8 +135,12 @@ public class MchPayPassageConfigController extends CommonCtrl {
@GetMapping("/{id}")
public ApiRes detail(@PathVariable("id") Long id) {
MchPayPassage payPassage = mchPayPassageService.getById(id);
if (payPassage == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (!payPassage.getMchNo().equals(getCurrentUser().getSysUser().getBelongInfoId())) return ApiRes.fail(ApiCodeEnum.SYS_PERMISSION_ERROR);
if (payPassage == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
if (!payPassage.getMchNo().equals(getCurrentUser().getSysUser().getBelongInfoId())) {
return ApiRes.fail(ApiCodeEnum.SYS_PERMISSION_ERROR);
}
payPassage.setRate(payPassage.getRate().multiply(new BigDecimal("100")));
return ApiRes.ok(payPassage);
}

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

@ -67,15 +67,31 @@ 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 (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 (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 (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);
@ -110,7 +126,9 @@ public class PayOrderController extends CommonCtrl {
@GetMapping("/{payOrderId}")
public ApiRes detail(@PathVariable("payOrderId") String payOrderId) {
PayOrder payOrder = payOrderService.getById(payOrderId);
if (payOrder == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (payOrder == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
if (!payOrder.getMchNo().equals(getCurrentMchNo())) {
return ApiRes.fail(ApiCodeEnum.SYS_PERMISSION_ERROR);
}

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

@ -57,15 +57,31 @@ 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 (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"));
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);
@ -82,7 +98,9 @@ public class RefundOrderController extends CommonCtrl {
@GetMapping("/{refundOrderId}")
public ApiRes detail(@PathVariable("refundOrderId") String refundOrderId) {
RefundOrder refundOrder = refundOrderService.getById(refundOrderId);
if (refundOrder == null) return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (refundOrder == null) {
return ApiRes.fail(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
if (!refundOrder.getMchNo().equals(getCurrentUser().getSysUser().getBelongInfoId())) {
return ApiRes.fail(ApiCodeEnum.SYS_PERMISSION_ERROR);
}

8
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/paytest/PaytestController.java
View File

@ -108,8 +108,12 @@ public class PaytestController extends CommonCtrl {
//设置扩展参数
JSONObject extParams = new JSONObject();
if(StringUtils.isNotEmpty(payDataType)) extParams.put("payDataType", payDataType.trim());
if(StringUtils.isNotEmpty(authCode)) extParams.put("authCode", authCode.trim());
if(StringUtils.isNotEmpty(payDataType)) {
extParams.put("payDataType", payDataType.trim());
}
if(StringUtils.isNotEmpty(authCode)) {
extParams.put("authCode", authCode.trim());
}
model.setChannelExtra(extParams.toString());
JeepayClient jeepayClient = new JeepayClient(sysConfigService.getDBApplicationConfig().getPaySiteUrl(), mchApp.getAppSecret());

8
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleController.java
View File

@ -92,7 +92,9 @@ public class SysRoleController extends CommonCtrl {
@RequestMapping(value="/{recordId}", method = RequestMethod.GET)
public ApiRes detail(@PathVariable("recordId") String recordId) {
SysRole sysRole = sysRoleService.getOne(SysRole.gw().eq(SysRole::getRoleId, recordId).eq(SysRole::getBelongInfoId, getCurrentMchNo()));
if (sysRole == null) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (sysRole == null) {
throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
return ApiRes.ok(sysRole);
}
@ -158,7 +160,9 @@ public class SysRoleController extends CommonCtrl {
@RequestMapping(value="/{recordId}", method = RequestMethod.DELETE)
public ApiRes del(@PathVariable("recordId") String recordId) {
SysRole sysRole = sysRoleService.getOne(SysRole.gw().eq(SysRole::getRoleId, recordId).eq(SysRole::getBelongInfoId, getCurrentMchNo()));
if (sysRole == null) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (sysRole == null) {
throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
if(sysUserRoleRelaService.count(SysUserRoleRela.gw().eq(SysUserRoleRela::getRoleId, recordId)) > 0){
throw new BizException("当前角色已分配到用户， 不可删除！");

4
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysRoleEntRelaController.java
View File

@ -80,7 +80,9 @@ public class SysRoleEntRelaController extends CommonCtrl {
public ApiRes relas(@PathVariable("roleId") String roleId) {
SysRole sysRole = sysRoleService.getOne(SysRole.gw().eq(SysRole::getRoleId, roleId).eq(SysRole::getBelongInfoId, getCurrentMchNo()));
if (sysRole == null) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (sysRole == null) {
throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
List<String> entIdList = JSONArray.parseArray(getValStringRequired("entIdListStr"), String.class);

12
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
View File

@ -87,7 +87,9 @@ public class SysUserController extends CommonCtrl {
public ApiRes detail(@PathVariable("recordId") Integer recordId) {
SysUser sysUser = sysUserService.getById(recordId);
if (sysUser == null) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (sysUser == null) {
throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
if (!sysUser.getBelongInfoId().equals(getCurrentUser().getSysUser().getBelongInfoId())) {
throw new BizException(ApiCodeEnum.SYS_PERMISSION_ERROR);
}
@ -140,9 +142,13 @@ public class SysUserController extends CommonCtrl {
SysUser sysUser = getObject(SysUser.class);
sysUser.setSysUserId(recordId);
// 如果当前用户为非超管则用户状态为普通用户
if (getCurrentUser().getSysUser().getIsAdmin() != CS.YES) sysUser.setIsAdmin(CS.NO);
if (getCurrentUser().getSysUser().getIsAdmin() != CS.YES) {
sysUser.setIsAdmin(CS.NO);
}
SysUser dbRecord = sysUserService.getOne(SysUser.gw().eq(SysUser::getSysUserId, recordId).eq(SysUser::getBelongInfoId, getCurrentMchNo()));
if (dbRecord == null) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (dbRecord == null) {
throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
//判断是否自己禁用自己
if(recordId.equals(getCurrentUser().getSysUser().getSysUserId()) && sysUser.getState() != null && sysUser.getState() == CS.PUB_DISABLE){

4
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserRoleRelaController.java
View File

@ -76,7 +76,9 @@ public class SysUserRoleRelaController extends CommonCtrl {
@RequestMapping(value="relas/{sysUserId}", method = RequestMethod.POST)
public ApiRes relas(@PathVariable("sysUserId") Long sysUserId) {
SysUser dbRecord = sysUserService.getOne(SysUser.gw().eq(SysUser::getSysUserId, sysUserId).eq(SysUser::getBelongInfoId, getCurrentMchNo()));
if (dbRecord == null) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
if (dbRecord == null) {
throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_SELETE);
}
List<String> roleIdList = JSONArray.parseArray(getValStringRequired("roleIdListStr"), String.class);

8
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/websocket/server/WsPayOrderServer.java
View File

@ -74,7 +74,9 @@ public class WsPayOrderServer {
this.session = session;
Set<WsPayOrderServer> wsServerSet = wsOrderIdMap.get(payOrderId);
if(wsServerSet == null) wsServerSet = new CopyOnWriteArraySet<>();
if(wsServerSet == null) {
wsServerSet = new CopyOnWriteArraySet<>();
}
wsServerSet.add(this);
wsOrderIdMap.put(payOrderId, wsServerSet);
@ -94,7 +96,9 @@ public class WsPayOrderServer {
Set wsSet = wsOrderIdMap.get(this.payOrderId);
wsSet.remove(this);
if(wsSet.isEmpty()) wsOrderIdMap.remove(this.payOrderId);
if(wsSet.isEmpty()) {
wsOrderIdMap.remove(this.payOrderId);
}
subOnlineCount(); //在线数减1
logger.info("cid[{}],payOrderId[{}]连接关闭！当前在线人数为{}", cid, payOrderId, onlineClientSize);

47
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/alipay/AlipayKit.java
View File

@ -49,26 +49,43 @@ public class AlipayKit {
AlipayIsvsubMchParams isvsubMchParams = mchAppConfigContext.getIsvsubMchParamsByIfCode(CS.IF_CODE.ALIPAY, AlipayIsvsubMchParams.class);
// 子商户信息
if(req instanceof AlipayTradePayRequest) ((AlipayTradePayRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
else if(req instanceof AlipayTradeAppPayRequest) ((AlipayTradeAppPayRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
else if(req instanceof AlipayTradeCreateRequest) ((AlipayTradeCreateRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
else if(req instanceof AlipayTradePagePayRequest) ((AlipayTradePagePayRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
else if(req instanceof AlipayTradePrecreateRequest) ((AlipayTradePrecreateRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
else if(req instanceof AlipayTradeWapPayRequest) ((AlipayTradeWapPayRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
else if(req instanceof AlipayTradeQueryRequest) ((AlipayTradeQueryRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
else if(req instanceof AlipayTradeRefundRequest) ((AlipayTradeRefundRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
else if(req instanceof AlipayTradeFastpayRefundQueryRequest) ((AlipayTradeFastpayRefundQueryRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
if(req instanceof AlipayTradePayRequest) {
((AlipayTradePayRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
} else if(req instanceof AlipayTradeAppPayRequest) {
((AlipayTradeAppPayRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
} else if(req instanceof AlipayTradeCreateRequest) {
((AlipayTradeCreateRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
} else if(req instanceof AlipayTradePagePayRequest) {
((AlipayTradePagePayRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
} else if(req instanceof AlipayTradePrecreateRequest) {
((AlipayTradePrecreateRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
} else if(req instanceof AlipayTradeWapPayRequest) {
((AlipayTradeWapPayRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
} else if(req instanceof AlipayTradeQueryRequest) {
((AlipayTradeQueryRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
} else if(req instanceof AlipayTradeRefundRequest) {
((AlipayTradeRefundRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
} else if(req instanceof AlipayTradeFastpayRefundQueryRequest) {
((AlipayTradeFastpayRefundQueryRequest)req).putOtherTextParam("app_auth_token", isvsubMchParams.getAppAuthToken());
}
// 服务商信息
ExtendParams extendParams = new ExtendParams();
extendParams.setSysServiceProviderId(isvParams.getPid());
if(model instanceof AlipayTradePayModel) ((AlipayTradePayModel)model).setExtendParams(extendParams);
else if(model instanceof AlipayTradeAppPayModel) ((AlipayTradeAppPayModel)model).setExtendParams(extendParams);
else if(model instanceof AlipayTradeCreateModel) ((AlipayTradeCreateModel)model).setExtendParams(extendParams);
else if(model instanceof AlipayTradePagePayModel) ((AlipayTradePagePayModel)model).setExtendParams(extendParams);
else if(model instanceof AlipayTradePrecreateModel) ((AlipayTradePrecreateModel)model).setExtendParams(extendParams);
else if(model instanceof AlipayTradeWapPayModel) ((AlipayTradeWapPayModel)model).setExtendParams(extendParams);
if(model instanceof AlipayTradePayModel) {
((AlipayTradePayModel)model).setExtendParams(extendParams);
} else if(model instanceof AlipayTradeAppPayModel) {
((AlipayTradeAppPayModel)model).setExtendParams(extendParams);
} else if(model instanceof AlipayTradeCreateModel) {
((AlipayTradeCreateModel)model).setExtendParams(extendParams);
} else if(model instanceof AlipayTradePagePayModel) {
((AlipayTradePagePayModel)model).setExtendParams(extendParams);
} else if(model instanceof AlipayTradePrecreateModel) {
((AlipayTradePrecreateModel)model).setExtendParams(extendParams);
} else if(model instanceof AlipayTradeWapPayModel) {
((AlipayTradeWapPayModel)model).setExtendParams(extendParams);
}
}

1
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/AliJsapi.java
View File

@ -49,6 +49,7 @@ public class AliJsapi extends YsfpayPaymentService {
return null;
}
@Override
public AbstractRS pay(UnifiedOrderRQ rq, PayOrder payOrder, MchAppConfigContext mchAppConfigContext) throws Exception {
String logPrefix = "【云闪付(alipayJs)jsapi支付】";
JSONObject reqParams = new JSONObject();

1
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/WxBar.java
View File

@ -49,6 +49,7 @@ public class WxBar extends YsfpayPaymentService {
return null;
}
@Override
public AbstractRS pay(UnifiedOrderRQ rq, PayOrder payOrder, MchAppConfigContext mchAppConfigContext) throws Exception {
String logPrefix = "【云闪付条码(wechat)支付】";

1
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/ysfpay/payway/YsfBar.java
View File

@ -50,6 +50,7 @@ public class YsfBar extends YsfpayPaymentService {
return null;
}
@Override
public AbstractRS pay(UnifiedOrderRQ rq, PayOrder payOrder, MchAppConfigContext mchAppConfigContext) throws Exception {
String logPrefix = "【云闪付条码(unionpay)支付】";

4
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/qr/ChannelUserIdController.java
View File

@ -121,7 +121,9 @@ public class ChannelUserIdController extends AbstractPayOrderController {
String ua = request.getHeader("User-Agent");
// 无法识别扫码客户端
if (StringUtils.isBlank(ua)) return null;
if (StringUtils.isBlank(ua)) {
return null;
}
if(ua.contains("Alipay")) {
return CS.IF_CODE.ALIPAY; //支付宝服务窗支付

4
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/mq/PayOrderReissueMQReceiver.java
View File

@ -63,7 +63,9 @@ public class PayOrderReissueMQReceiver implements PayOrderReissueMQ.IMQReceiver
return;
}
if (payOrder == null) return;
if (payOrder == null) {
return;
}
ChannelRetMsg channelRetMsg = channelOrderReissueService.processPayOrder(payOrder);
//返回null 可能为接口报错等， 需要再次轮询

116
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/util/CodeImgUtil.java
View File

@ -44,18 +44,18 @@ import java.util.Map;
/*
* 二维码生成器
*
*
* @author terrfly
* @site https://www.jeepay.vip
* @date 2021/6/8 17:54
*/
public class CodeImgUtil {
private static final Logger _log = LoggerFactory.getLogger(CodeImgUtil.class);
// 二维码尺寸List
private static List<Integer> sizeList = new ArrayList<Integer>();
static {
sizeList.add(258);
sizeList.add(344);
@ -63,13 +63,13 @@ public class CodeImgUtil {
sizeList.add(860);
sizeList.add(1280);
}
public static List<Integer> getEwmSizeList() {
return sizeList;
}
//TODO
//TODO
// 图片宽度的一般
private static final int IMAGE_WIDTH = 25;
private static final int IMAGE_HEIGHT = 25;
@ -80,7 +80,7 @@ public class CodeImgUtil {
private static MultiFormatWriter mutiWriter = new MultiFormatWriter();
/**
*
*
* @param content
* 二维码显示的文本
* @param width
@ -114,7 +114,7 @@ public class CodeImgUtil {
/**
* 得到BufferedImage
*
*
* @param content
* 二维码显示的文本
* @param width
@ -134,7 +134,7 @@ public class CodeImgUtil {
// 读取源图像
BufferedImage scaleImage = scale(srcImagePath, IMAGE_WIDTH,
IMAGE_HEIGHT, false);
int[][] srcPixels = new int[IMAGE_WIDTH][IMAGE_HEIGHT];
for (int i = 0; i < scaleImage.getWidth(); i++) {
for (int j = 0; j < scaleImage.getHeight(); j++) {
@ -200,7 +200,7 @@ public class CodeImgUtil {
/**
* 把传入的原始图像按高度和宽度进行缩放，生成符合要求的图标
*
*
* @param srcImageFile
* 源文件地址
* @param height
@ -214,9 +214,9 @@ public class CodeImgUtil {
private static BufferedImage scale(String srcImageFile, int height,
int width, boolean hasFiller) throws IOException {
double ratio = 0.0; // 缩放比例
URL url = new URL(srcImageFile);
BufferedImage srcImage = ImageIO.read(url);
Image destImage = srcImage.getScaledInstance(width, height,
BufferedImage.SCALE_SMOOTH);
@ -239,38 +239,39 @@ public class CodeImgUtil {
Graphics2D graphic = image.createGraphics();
graphic.setColor(Color.white);
graphic.fillRect(0, 0, width, height);
if (width == destImage.getWidth(null))
graphic.drawImage(destImage, 0, (height - destImage
.getHeight(null)) / 2, destImage.getWidth(null),
destImage.getHeight(null), Color.white, null);
else
graphic.drawImage(destImage,
(width - destImage.getWidth(null)) / 2, 0, destImage
.getWidth(null), destImage.getHeight(null),
Color.white, null);
if (width == destImage.getWidth(null)) {
graphic.drawImage(destImage, 0, (height - destImage
.getHeight(null)) / 2, destImage.getWidth(null),
destImage.getHeight(null), Color.white, null);
} else {
graphic.drawImage(destImage,
(width - destImage.getWidth(null)) / 2, 0, destImage
.getWidth(null), destImage.getHeight(null),
Color.white, null);
}
graphic.dispose();
destImage = image;
}
return (BufferedImage) destImage;
}
/**
* 生成图像
/**
* 生成图像
* filePath 存放图片的路径
* fileName 图片的名称
* info 生成图片的链接地址（例如：weixin://wxpay/s/Anp43md）
* width 图片的宽度
* height 图片的高度
* @throws WriterException
* @throws IOException
*/
* @throws WriterException
* @throws IOException
*/
public static String codeImgEncode(String filePath, String fileName, String info, int width, int height) throws WriterException, IOException {
String format="png";
Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>();
hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
BitMatrix bitMatrix = new MultiFormatWriter().encode(info,
BarcodeFormat.QR_CODE, width, height, hints);// 生成矩阵
Path path = FileSystems.getDefault().getPath(filePath, fileName);
Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>();
hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
BitMatrix bitMatrix = new MultiFormatWriter().encode(info,
BarcodeFormat.QR_CODE, width, height, hints);// 生成矩阵
Path path = FileSystems.getDefault().getPath(filePath, fileName);
File dir = new File(filePath);
_log.error("==================" + filePath);
if (!dir.exists()) {
@ -299,30 +300,30 @@ public class CodeImgUtil {
/**
* 解析图像
*/
* 解析图像
*/
public static void codeImgDecode() {
String filePath = "D://zxing.png";
BufferedImage image;
try {
image = ImageIO.read(new File(filePath));
String filePath = "D://zxing.png";
BufferedImage image;
try {
image = ImageIO.read(new File(filePath));
LuminanceSource source = new BufferedImageLuminanceSource(image);
Binarizer binarizer = new HybridBinarizer(source);
BinaryBitmap binaryBitmap = new BinaryBitmap(binarizer);
Map<DecodeHintType, Object> hints = new HashMap<DecodeHintType, Object>();
hints.put(DecodeHintType.CHARACTER_SET, "UTF-8");
Result result = new MultiFormatReader().decode(binaryBitmap, hints);// 对图像进行解码
Binarizer binarizer = new HybridBinarizer(source);
BinaryBitmap binaryBitmap = new BinaryBitmap(binarizer);
Map<DecodeHintType, Object> hints = new HashMap<DecodeHintType, Object>();
hints.put(DecodeHintType.CHARACTER_SET, "UTF-8");
Result result = new MultiFormatReader().decode(binaryBitmap, hints);// 对图像进行解码
JSONObject content = JSON.parseObject(result.getText());
System.out.println("图片中内容： ");
System.out.println("author： " + content.getString("author"));
System.out.println("zxing： " + content.getString("zxing"));
System.out.println("图片中格式： ");
System.out.println("encode： " + result.getBarcodeFormat());
} catch (IOException e) {
e.printStackTrace();
} catch (NotFoundException e) {
e.printStackTrace();
}
System.out.println("图片中内容： ");
System.out.println("author： " + content.getString("author"));
System.out.println("zxing： " + content.getString("zxing"));
System.out.println("图片中格式： ");
System.out.println("encode： " + result.getBarcodeFormat());
} catch (IOException e) {
e.printStackTrace();
} catch (NotFoundException e) {
e.printStackTrace();
}
}
/**
@ -337,8 +338,9 @@ public class CodeImgUtil {
resMatrix.clear();
for (int i = 0; i < resWidth; i++) {
for (int j = 0; j < resHeight; j++) {
if (matrix.get(i + rec[0], j + rec[1]))
resMatrix.set(i, j);
if (matrix.get(i + rec[0], j + rec[1])) {
resMatrix.set(i, j);
}
}
}
return resMatrix;

12
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/IsvInfoService.java
View File

@ -47,11 +47,15 @@ public class IsvInfoService extends ServiceImpl<IsvInfoMapper, IsvInfo> {
public void removeByIsvNo(String isvNo) {
// 0.当前服务商是否存在
IsvInfo isvInfo = isvInfoService.getById(isvNo);
if (isvInfo == null) throw new BizException("该服务商不存在");
if (isvInfo == null) {
throw new BizException("该服务商不存在");
}
// 1.查询当前服务商下是否存在商户
int mchCount = mchInfoService.count(MchInfo.gw().eq(MchInfo::getIsvNo, isvNo).eq(MchInfo::getType, CS.INFO_TYPE_ISV));
if (mchCount > 0) throw new BizException("该服务商下存在商户，不可删除");
if (mchCount > 0) {
throw new BizException("该服务商下存在商户，不可删除");
}
// 2.删除当前服务商支付接口配置参数
payInterfaceConfigService.remove(PayInterfaceConfig.gw()
@ -61,6 +65,8 @@ public class IsvInfoService extends ServiceImpl<IsvInfoMapper, IsvInfo> {
// 3.删除该服务商
boolean remove = isvInfoService.removeById(isvNo);
if (!remove) throw new BizException("删除服务商失败");
if (!remove) {
throw new BizException("删除服务商失败");
}
}
}

20
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchAppService.java
View File

@ -37,7 +37,9 @@ public class MchAppService extends ServiceImpl<MchAppMapper, MchApp> {
// 1.查看当前应用是否存在交易数据
int payCount = payOrderService.count(PayOrder.gw().eq(PayOrder::getAppId, appId));
if (payCount > 0) throw new BizException("该应用已存在交易数据，不可删除");
if (payCount > 0) {
throw new BizException("该应用已存在交易数据，不可删除");
}
// 2.删除应用关联的支付通道
mchPayPassageService.remove(MchPayPassage.gw().eq(MchPayPassage::getAppId, appId));
@ -67,10 +69,18 @@ public class MchAppService extends ServiceImpl<MchAppMapper, MchApp> {
public IPage<MchApp> selectPage(IPage iPage, MchApp mchApp) {
LambdaQueryWrapper<MchApp> wrapper = MchApp.gw();
if (StringUtils.isNotBlank(mchApp.getMchNo())) wrapper.eq(MchApp::getMchNo, mchApp.getMchNo());
if (StringUtils.isNotEmpty(mchApp.getAppId())) wrapper.eq(MchApp::getAppId, mchApp.getAppId());
if (StringUtils.isNotEmpty(mchApp.getAppName())) wrapper.eq(MchApp::getAppName, mchApp.getAppName());
if (mchApp.getState() != null) wrapper.eq(MchApp::getState, mchApp.getState());
if (StringUtils.isNotBlank(mchApp.getMchNo())) {
wrapper.eq(MchApp::getMchNo, mchApp.getMchNo());
}
if (StringUtils.isNotEmpty(mchApp.getAppId())) {
wrapper.eq(MchApp::getAppId, mchApp.getAppId());
}
if (StringUtils.isNotEmpty(mchApp.getAppName())) {
wrapper.eq(MchApp::getAppName, mchApp.getAppName());
}
if (mchApp.getState() != null) {
wrapper.eq(MchApp::getState, mchApp.getState());
}
wrapper.orderByDesc(MchApp::getCreatedAt);
IPage<MchApp> pages = this.page(iPage, wrapper);

24
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchInfoService.java
View File

@ -74,7 +74,9 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
// 插入商户基本信息
boolean saveResult = save(mchInfo);
if (!saveResult) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
if (!saveResult) {
throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
}
// 插入用户信息
SysUser sysUser = new SysUser();
@ -98,14 +100,18 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
mchApp.setCreatedBy(sysUser.getRealname());
mchApp.setCreatedUid(sysUser.getSysUserId());
saveResult = mchAppService.save(mchApp);
if (!saveResult) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
if (!saveResult) {
throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
}
// 存入商户默认用户ID
MchInfo updateRecord = new MchInfo();
updateRecord.setMchNo(mchInfo.getMchNo());
updateRecord.setInitUserId(sysUser.getSysUserId());
saveResult = updateById(updateRecord);
if (!saveResult) throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
if (!saveResult) {
throw new BizException(ApiCodeEnum.SYS_OPERATION_FAIL_CREATE);
}
}
@ -115,11 +121,15 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
try {
// 0.当前商户是否存在
MchInfo mchInfo = getById(mchNo);
if (mchInfo == null) throw new BizException("该商户不存在");
if (mchInfo == null) {
throw new BizException("该商户不存在");
}
// 1.查看当前商户是否存在交易数据
int payCount = payOrderService.count(PayOrder.gw().eq(PayOrder::getMchNo, mchNo));
if (payCount > 0) throw new BizException("该商户已存在交易数据，不可删除");
if (payCount > 0) {
throw new BizException("该商户已存在交易数据，不可删除");
}
// 2.删除当前商户配置的支付通道
mchPayPassageService.remove(MchPayPassage.gw().eq(MchPayPassage::getMchNo, mchNo));
@ -158,7 +168,9 @@ public class MchInfoService extends ServiceImpl<MchInfoMapper, MchInfo> {
// 7.删除当前商户
boolean removeMchInfo = removeById(mchNo);
if (!removeMchInfo) throw new BizException("删除当前商户失败");
if (!removeMchInfo) {
throw new BizException("删除当前商户失败");
}
return userIdList;
}catch (Exception e) {
throw new BizException(e.getMessage());

4
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/MchPayPassageService.java
View File

@ -54,7 +54,9 @@ public class MchPayPassageService extends ServiceImpl<MchPayPassageMapper, MchPa
params.put("infoType", infoType);
params.put("mchType", mchType);
List<JSONObject> list = baseMapper.selectAvailablePayInterfaceList(params);
if (CollectionUtils.isEmpty(list)) return null;
if (CollectionUtils.isEmpty(list)) {
return null;
}
// 添加通道状态
for (JSONObject object : list) {

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

@ -127,21 +127,41 @@ public class PayOrderService extends ServiceImpl<PayOrderMapper, PayOrder> {
public Map payCount(String mchNo, Byte state, Byte refundState, String dayStart, String dayEnd) {
Map param = new HashMap<>();
if (state != null) param.put("state", state);
if (refundState != null) param.put("refundState", refundState);
if (StrUtil.isNotBlank(mchNo)) param.put("mchNo", mchNo);
if (StrUtil.isNotBlank(dayStart)) param.put("createTimeStart", dayStart);
if (StrUtil.isNotBlank(dayEnd)) param.put("createTimeEnd", dayEnd);
if (state != null) {
param.put("state", state);
}
if (refundState != null) {
param.put("refundState", refundState);
}
if (StrUtil.isNotBlank(mchNo)) {
param.put("mchNo", mchNo);
}
if (StrUtil.isNotBlank(dayStart)) {
param.put("createTimeStart", dayStart);
}
if (StrUtil.isNotBlank(dayEnd)) {
param.put("createTimeEnd", dayEnd);
}
return payOrderMapper.payCount(param);
}
public List<Map> payTypeCount(String mchNo, Byte state, Byte refundState, String dayStart, String dayEnd) {
Map param = new HashMap<>();
if (state != null) param.put("state", state);
if (refundState != null) param.put("refundState", refundState);
if (StrUtil.isNotBlank(mchNo)) param.put("mchNo", mchNo);
if (StrUtil.isNotBlank(dayStart)) param.put("createTimeStart", dayStart);
if (StrUtil.isNotBlank(dayEnd)) param.put("createTimeEnd", dayEnd);
if (state != null) {
param.put("state", state);
}
if (refundState != null) {
param.put("refundState", refundState);
}
if (StrUtil.isNotBlank(mchNo)) {
param.put("mchNo", mchNo);
}
if (StrUtil.isNotBlank(dayStart)) {
param.put("createTimeStart", dayStart);
}
if (StrUtil.isNotBlank(dayEnd)) {
param.put("createTimeEnd", dayEnd);
}
return payOrderMapper.payTypeCount(param);
}
@ -183,12 +203,16 @@ public class PayOrderService extends ServiceImpl<PayOrderMapper, PayOrder> {
String dayEnd = DateUtil.endOfDay(date).toString(DatePattern.NORM_DATETIME_MINUTE_PATTERN);
// 每日交易金额查询
dayAmount = payCount(mchNo, PayOrder.STATE_SUCCESS, null, dayStart, dayEnd);
if (dayAmount != null) payAmount = new BigDecimal(dayAmount.get("payAmount").toString());
if (dayAmount != null) {
payAmount = new BigDecimal(dayAmount.get("payAmount").toString());
}
if (i == 0) {
todayAmount = dayAmount.get("payAmount").toString();
todayPayCount = dayAmount.get("payCount").toString();
}
if (i == 1) yesterdayAmount = dayAmount.get("payAmount").toString();
if (i == 1) {
yesterdayAmount = dayAmount.get("payAmount").toString();
}
payWeek = payWeek.add(payAmount);
array.add(payAmount);
}
@ -234,7 +258,9 @@ public class PayOrderService extends ServiceImpl<PayOrderMapper, PayOrder> {
createdEnd = DateUtil.formatDate(today) + " 23:59:59";
}
if (StrUtil.isNotBlank(mchNo)) param.put("mchNo", mchNo);
if (StrUtil.isNotBlank(mchNo)) {
param.put("mchNo", mchNo);
}
param.put("createTimeStart", createdStart);
param.put("createTimeEnd", createdEnd);
// 查询收款的记录

5
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysConfigService.java
View File

@ -53,6 +53,7 @@ public class SysConfigService extends ServiceImpl<SysConfigMapper, SysConfig> im
}
/** 获取实际的数据 **/
@Override
public DBApplicationConfig getDBApplicationConfig() {
if(APPLICATION_CONFIG.getRight() == null ){
@ -80,7 +81,9 @@ public class SysConfigService extends ServiceImpl<SysConfigMapper, SysConfig> im
sysConfig.setConfigKey(k);
sysConfig.setConfigVal(updateMap.get(k));
boolean update = sysConfigService.saveOrUpdate(sysConfig);
if (update) count ++;
if (update) {
count ++;
}
}
return count;
}

20
jeepay-service/src/main/java/com/jeequan/jeepay/service/impl/SysUserService.java
View File

@ -57,10 +57,18 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
// if(roleIdList.isEmpty()) throw new BizException("请选择角色信息！");
// 判断数据来源
if( StringUtils.isEmpty(sysUser.getLoginUsername()) ) throw new BizException("登录用户名不能为空！");
if( StringUtils.isEmpty(sysUser.getRealname()) )throw new BizException("姓名不能为空！");
if( StringUtils.isEmpty(sysUser.getTelphone()) ) throw new BizException("手机号不能为空！");
if(sysUser.getSex() == null ) throw new BizException("性别不能为空！");
if( StringUtils.isEmpty(sysUser.getLoginUsername()) ) {
throw new BizException("登录用户名不能为空！");
}
if( StringUtils.isEmpty(sysUser.getRealname()) ) {
throw new BizException("姓名不能为空！");
}
if( StringUtils.isEmpty(sysUser.getTelphone()) ) {
throw new BizException("手机号不能为空！");
}
if(sysUser.getSex() == null ) {
throw new BizException("性别不能为空！");
}
//登录用户名不可重复
if( count(SysUser.gw().eq(SysUser::getSysType, sysType).eq(SysUser::getLoginUsername, sysUser.getLoginUsername())) > 0 ){
@ -105,7 +113,9 @@ public class SysUserService extends ServiceImpl<SysUserMapper, SysUser> {
Long sysUserId = sysUser.getSysUserId();
SysUser dbRecord = getById(sysUserId);
if (dbRecord == null) throw new BizException("该用户不存在");
if (dbRecord == null) {
throw new BizException("该用户不存在");
}
//修改了手机号， 需要修改auth表信息
if(!dbRecord.getTelphone().equals(sysUser.getTelphone())){