加入反扫金额校验

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){

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();
+    }
+
 }

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) {