From 33950f81019d8ce1922a073c744d3e60e022fdd0 Mon Sep 17 00:00:00 2001
From: lyf <1357764963@qq>
Date: Fri, 24 Feb 2023 15:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=8F=8D=E6=89=AB=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MerchantOrderController.java         |  4 ++++
 .../java/cn/pluss/platform/util/StringUtil.java     | 13 +++++++++++++
 .../merchant/impl/MerchantStaffConnServiceImpl.java |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)

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<Object> 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<MerchantStaffConnM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public UserApp createStaff(MerchantStaffDTO staffDTO) {
-        String loginName = staffDTO.getLoginName().replace("@shouyin", "");
+        String loginName = staffDTO.getLoginName().replace("@chaozg", "");
         if (loginName.contains("@")) {
             throw new MsgException("员工账号请不要带@");
         }
-        staffDTO.setLoginName(loginName + "@shouyin");
+        staffDTO.setLoginName(loginName + "@chaozg");
         UserInfo existUserInfo = new UserInfo().setLoginName(staffDTO.getLoginName());
         existUserInfo = userInfoService.getOne(new QueryWrapper<>(existUserInfo));
         if (existUserInfo != null) {