diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java index 8442660..0d0ae8d 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java @@ -413,6 +413,10 @@ public class MerchantOrderController { public Result scanPay(@RequestBody MerChantOrderDTO merchantOrderDTO) { UserApp tokenUa = userAppService.queryUserAppByToken(); merchantOrderDTO.setMerchantCode(tokenUa.getMerchantCode()); + //校验金额 + if (!StringUtil.isMoney(String.valueOf(merchantOrderDTO.getConsumeFee()))){ + MsgException.throwException("金额异常"); + } try { return merchantOrderService.toActivePay(merchantOrderDTO); } catch (Exception e){ diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java index 5de6654..f7e4b81 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java @@ -391,4 +391,17 @@ public class StringUtil extends StringUtils { return null; } } + + /** + * 金额校验 + * @param str + * @return + */ + public static boolean isMoney(String str) { + // 判断小数点后2位的数字的正则表达式 + Pattern pattern = Pattern.compile("^(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){0,2})?$"); + Matcher match = pattern.matcher(str); + return match.matches(); + } + } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantStaffConnServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantStaffConnServiceImpl.java index 8b83194..9ace274 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantStaffConnServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantStaffConnServiceImpl.java @@ -79,11 +79,11 @@ public class MerchantStaffConnServiceImpl extends ServiceImpl(existUserInfo)); if (existUserInfo != null) {