Skip to content
GitLab
Commit 91b1c1c5 authored by terrfly's avatar terrfly
Browse files

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

parent 10f3c8c3
Show whitespace changes
Inline Side-by-side
jeepay-core/src/main/java/com/jeequan/jeepay/core/ctrls/AbstractCtrl.java
View file @ 91b1c1c5
......@@ -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);
}
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/entity/MchNotifyRecord.java
View file @ 91b1c1c5
......@@ -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(){
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/model/BaseModel.java
View file @ 91b1c1c5
......@@ -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;
}
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/model/security/JeeUserDetails.java
View file @ 91b1c1c5
......@@ -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();
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/AmountUtil.java
View file @ 91b1c1c5
......@@ -75,16 +75,18 @@ 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();
}
}
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/ApiResBodyAdviceKit.java
View file @ 91b1c1c5
......@@ -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();
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/DateKit.java
View file @ 91b1c1c5
......@@ -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表示为空， 占位使用
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/FileKit.java
View file @ 91b1c1c5
......@@ -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);
}
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/JeepayKit.java
View file @ 91b1c1c5
......@@ -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
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/RegKit.java
View file @ 91b1c1c5
......@@ -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);
}
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/StringKit.java
View file @ 91b1c1c5
......@@ -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());
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CurrentUserController.java
View file @ 91b1c1c5
......@@ -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);
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/common/StaticController.java
View file @ 91b1c1c5
......@@ -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();
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/config/SysConfigController.java
View file @ 91b1c1c5
......@@ -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();
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java
View file @ 91b1c1c5
......@@ -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);
}
}
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java
View file @ 91b1c1c5
......@@ -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);
}
}
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchPayPassageConfigController.java
View file @ 91b1c1c5
......@@ -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())) {
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java
View file @ 91b1c1c5
......@@ -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);
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java
View file @ 91b1c1c5
......@@ -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("订单状态不正确");
......
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java
View file @ 91b1c1c5
......@@ -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);
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment