Merge remote-tracking branch 'origin/main'

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/StoreDto.java

@@ -26,6 +26,12 @@ public class StoreDto implements Serializable {
     @ApiModelProperty("货币id")
     private Long currencyId;
 
+    @ApiModelProperty("货币名称")
+    private String currencyName;
+
+    @ApiModelProperty("货币符号")
+    private String currencySymbol;
+
     @ApiModelProperty("服务费比率")
     private BigDecimal serviceFeeRate;
 

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/ArticleServiceImpl.java

@@ -134,13 +134,13 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         }
         mtArticle.setMerchantId(articleDto.getMerchantId());
 
-        if (mtArticle.getMerchantId() == null || mtArticle.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        if (mtArticle.getStoreId() == null || mtArticle.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
 
         mtArticle.setStoreId(storeId);
         mtArticle.setUrl(articleDto.getUrl());
-        mtArticle.setClick(0l);
+        mtArticle.setClick(0L);
         mtArticle.setStatus(StatusEnum.ENABLED.getKey());
         mtArticle.setImage(articleDto.getImage());
         mtArticle.setDescription(articleDto.getDescription());

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/BalanceServiceImpl.java

@@ -236,8 +236,8 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
         if (!object.equals("all") && StringUtil.isEmpty(userIds)) {
             throw new BusinessCheckException("请先选择会员");
         }
-        if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台账号不能执行该操作");
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员账号不能执行该操作");
         }
         BigDecimal balanceAmount = new BigDecimal(amount);
         if (balanceAmount.compareTo(new BigDecimal(20000)) > 0) {
@@ -246,9 +246,9 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
 
         List<Long> userIdArr = new ArrayList<>();
         List<String> userIdList = Arrays.asList(userIds.split(","));
-        if (userIdList != null && userIdList.size() > 0) {
+        if (!userIdList.isEmpty()) {
             for (String userId : userIdList) {
-                if (StringUtil.isNotEmpty(userId) && !userIdArr.contains(Integer.parseInt(userId))) {
+                if (StringUtil.isNotEmpty(userId) && !userIdArr.contains(Long.valueOf(userId))) {
                     userIdArr.add(Long.valueOf(userId));
                 }
             }
@@ -259,7 +259,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
         }
         mtUserMapper.updateUserBalance(accountInfo.getMerchantId(), userIdArr, balanceAmount);
 
-        if (userIdArr.size() > 0) {
+        if (!userIdArr.isEmpty()) {
             for (Long userId : userIdArr) {
                 MtBalance mtBalance = new MtBalance();
                 mtBalance.setAmount(new BigDecimal(amount));

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/BannerServiceImpl.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.service.StoreService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -114,8 +116,9 @@ public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> imp
                 mtBanner.setMerchantId(mtStore.getMerchantId());
             }
         }
-        if (mtBanner.getMerchantId() == null || mtBanner.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        AccountInfo accountInfo = AuthUserUtil.get();
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
         mtBanner.setStoreId(storeId);
         mtBanner.setStatus(StatusEnum.ENABLED.getKey());

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/CartServiceImpl.java

@@ -210,7 +210,7 @@ public class CartServiceImpl extends ServiceImpl<MtCartMapper, MtCart> implement
            return;
         }
         for (int i = 0; i < ids.length; i++) {
-            MtCart mtCart = mtCartMapper.selectById(Long.parseLong(ids[i].trim()));
+            MtCart mtCart = mtCartMapper.selectById(Long.valueOf(ids[i]));
             if (mtCart != null) {
                 mtCartMapper.deleteById(mtCart.getId());
             }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/CateServiceImpl.java

@@ -3,10 +3,12 @@ package com.fuint.common.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.GoodsCateDto;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.CateService;
 import com.fuint.common.service.StoreService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -127,8 +129,9 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
                 reqDto.setMerchantId(mtStore.getMerchantId());
             }
         }
-        if (reqDto.getMerchantId() == null || reqDto.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        AccountInfo accountInfo = AuthUserUtil.get();
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员方帐号无法执行该操作，请使用商户帐号操作");
         }
         mtCate.setName(reqDto.getName());
         mtCate.setStatus(StatusEnum.ENABLED.getKey());
@@ -224,8 +227,9 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
         if (reqDto.getMerchantId() != null && reqDto.getMerchantId() > 0) {
             mtCate.setMerchantId(reqDto.getMerchantId());
         }
-        if (mtCate.getMerchantId() == null || mtCate.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        AccountInfo accountInfo = AuthUserUtil.get();
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
         if (reqDto.getStoreId() != null) {
             mtCate.setStoreId(reqDto.getStoreId());

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/GoodsServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.common.Constants;
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.GoodsDto;
 import com.fuint.common.dto.GoodsSpecValueDto;
 import com.fuint.common.dto.GoodsTopDto;
@@ -11,6 +12,7 @@ import com.fuint.common.enums.GoodsTypeEnum;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.enums.YesOrNoEnum;
 import com.fuint.common.service.*;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -223,8 +225,9 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
                 mtGoods.setMerchantId(mtStore.getMerchantId());
             }
         }
-        if (mtGoods.getMerchantId() == null || mtGoods.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        AccountInfo accountInfo = AuthUserUtil.get();
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
         if (StringUtil.isNotEmpty(reqDto.getIsSingleSpec())) {
             mtGoods.setIsSingleSpec(reqDto.getIsSingleSpec());

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/PrinterServiceImpl.java

@@ -1,13 +1,16 @@
 package com.fuint.common.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alipay.api.domain.AuthApiDTO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.OrderGoodsDto;
 import com.fuint.common.dto.UserOrderDto;
 import com.fuint.common.enums.*;
 import com.fuint.common.service.SettingService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.HashSignUtil;
 import com.fuint.common.util.NoteFormatter;
 import com.fuint.common.util.PrinterUtil;
@@ -126,8 +129,9 @@ public class PrinterServiceImpl extends ServiceImpl<MtPrinterMapper, MtPrinter>
         mtPrinter.setStatus(StatusEnum.ENABLED.getKey());
         mtPrinter.setUpdateTime(new Date());
         mtPrinter.setCreateTime(new Date());
-        if (mtPrinter.getMerchantId() == null || mtPrinter.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        AccountInfo accountInfo = AuthUserUtil.get();
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
 
         Integer printerId = mtPrinterMapper.insert(mtPrinter);
@@ -339,8 +343,9 @@ public class PrinterServiceImpl extends ServiceImpl<MtPrinterMapper, MtPrinter>
         if (mtPrinter == null) {
             throw new BusinessCheckException("该打印机状态异常");
         }
-        if (printer.getMerchantId() == null || printer.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        AccountInfo accountInfo = AuthUserUtil.get();
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
 
         if (mtPrinter.getSn() != null && mtPrinter.getName() != null && !mtPrinter.getStatus().equals(StatusEnum.DISABLE.getKey())) {

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/StoreServiceImpl.java

@@ -15,8 +15,10 @@ import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.repository.bean.StoreDistanceBean;
+import com.fuint.repository.mapper.MtCurrencyMapper;
 import com.fuint.repository.mapper.MtMerchantMapper;
 import com.fuint.repository.mapper.MtStoreMapper;
+import com.fuint.repository.model.MtCurrency;
 import com.fuint.repository.model.MtMerchant;
 import com.fuint.repository.model.MtStore;
 import com.fuint.utils.StringUtil;
@@ -50,6 +52,8 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
 
     private MtMerchantMapper mtMerchantMapper;
 
+    private MtCurrencyMapper currencyMapper;
+
     /**
      * 商户接口
      */
@@ -100,7 +104,12 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
              if (mtMerchant != null) {
                  storeDto.setMerchantName(mtMerchant.getName());
              }
-             dataList.add(storeDto);
+            MtCurrency mtCurrency = currencyMapper.selectById(mtStore.getCurrencyId());
+             if (mtCurrency != null){
+                 storeDto.setCurrencyName(mtCurrency.getName());
+                 storeDto.setCurrencySymbol(mtCurrency.getSymbol());
+             }
+            dataList.add(storeDto);
         }
 
         PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/UserGradeServiceImpl.java

@@ -3,9 +3,11 @@ package com.fuint.common.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.enums.UserGradeCatchTypeEnum;
 import com.fuint.common.service.UserGradeService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -94,8 +96,9 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "新增会员等级")
     public MtUserGrade addUserGrade(MtUserGrade mtUserGrade) throws BusinessCheckException {
-        if (mtUserGrade.getMerchantId() == null || mtUserGrade.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        AccountInfo accountInfo = AuthUserUtil.get();
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
         if (mtUserGrade.getGrade() != null && (mtUserGrade.getGrade() <= 0)) {
             throw new BusinessCheckException("会员等级需大于0");

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBookCateController.java

@@ -3,6 +3,7 @@ package com.fuint.module.backendApi.controller;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.service.BookCateService;
 import com.fuint.common.service.StoreService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
@@ -179,8 +180,8 @@ public class BackendBookCateController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
 
         MtBookCate mtBookCate = new MtBookCate();

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBookController.java

@@ -5,6 +5,7 @@ import com.fuint.common.dto.BookDto;
 import com.fuint.common.service.BookCateService;
 import com.fuint.common.service.BookService;
 import com.fuint.common.service.StoreService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
@@ -199,8 +200,8 @@ public class BackendBookController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() < 1) {
-            throw new BusinessCheckException("平台方帐号无法执行该操作，请使用商户帐号操作");
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
 
         MtBook mtBook = new MtBook();

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCashierController.java

@@ -7,6 +7,7 @@ import com.fuint.common.enums.PlatformTypeEnum;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.enums.YesOrNoEnum;
 import com.fuint.common.service.*;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.DateUtil;
 import com.fuint.common.util.PhoneFormatCheckUtils;
 import com.fuint.common.util.TokenUtil;
@@ -368,8 +369,8 @@ public class BackendCashierController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台账号不能执行该操作");
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
 
         String isVisitor = YesOrNoEnum.NO.getKey();

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberGroupController.java

@@ -6,6 +6,7 @@ import com.fuint.common.dto.MemberGroupDto;
 import com.fuint.common.dto.UserGroupDto;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.MemberGroupService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -117,8 +118,8 @@ public class BackendMemberGroupController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台方帐号无法执行该操作，请使用商户帐号操作");
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
 
         memberGroupDto.setMerchantId(accountInfo.getMerchantId());

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendPointController.java

@@ -10,6 +10,7 @@ import com.fuint.common.enums.YesOrNoEnum;
 import com.fuint.common.service.MemberService;
 import com.fuint.common.service.PointService;
 import com.fuint.common.service.SettingService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.CommonUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.exception.BusinessCheckException;
@@ -194,10 +195,9 @@ public class BackendPointController extends BaseController {
         if (accountInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
-        if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台方帐号无法执行该操作，请使用商户帐号操作");
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
-
         String operator = accountInfo.getAccountName();
 
         PointSettingEnum[] settingList = PointSettingEnum.values();

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSmsController.java

@@ -6,6 +6,7 @@ import com.fuint.common.enums.SettingTypeEnum;
 import com.fuint.common.enums.SmsSettingEnum;
 import com.fuint.common.service.SendSmsService;
 import com.fuint.common.service.SettingService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -158,8 +159,9 @@ public class BackendSmsController extends BaseController {
         if (accountInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
-        if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台方帐号无法执行该操作，请使用商户帐号操作");
+
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
 
         SmsSettingEnum[] settingList = SmsSettingEnum.values();

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java

@@ -6,6 +6,7 @@ import com.fuint.common.dto.ParamDto;
 import com.fuint.common.enums.StaffCategoryEnum;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.StaffService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.CommonUtil;
 import com.fuint.common.util.PhoneFormatCheckUtils;
 import com.fuint.common.util.TokenUtil;
@@ -163,8 +164,9 @@ public class BackendStaffController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() <= 0) {
-            return getFailureResult(201, "平台方帐号无法执行该操作，请使用商户帐号操作");
+
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
 
         MtStaff mtStaff = new MtStaff();

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendTableController.java

@@ -4,6 +4,7 @@ import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.service.SettingService;
 import com.fuint.common.service.StoreService;
 import com.fuint.common.service.TableService;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
@@ -186,8 +187,9 @@ public class BackendTableController extends BaseController {
         mtTable.setCode(code);
         mtTable.setDescription(description);
         mtTable.setMaxPeople(Integer.parseInt(maxPeople));
-        if (accountInfo.getMerchantId() == null || accountInfo.getMerchantId() < 1) {
-            return getFailureResult(201, "平台方账户无操作权限");
+
+        if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+            throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
         }
         if (mtTable.getStoreId() == null || mtTable.getStoreId() < 1) {
             return getFailureResult(201, "所属店铺不能为空");

fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java

@@ -9,6 +9,7 @@ import com.fuint.common.param.CartClearParam;
 import com.fuint.common.param.CartListParam;
 import com.fuint.common.param.CartSaveParam;
 import com.fuint.common.service.*;
+import com.fuint.common.util.AuthUserUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.web.BaseController;
@@ -143,8 +144,9 @@ public class ClientCartController extends BaseController {
             AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
             if (accountInfo != null) {
                 merchantId = accountInfo.getMerchantId();
-                if (merchantId == null || merchantId <= 0) {
-                    return getFailureResult(201, "平台方账户无操作权限");
+
+                if (accountInfo.getStoreId() == null || accountInfo.getStoreId() < 1) {
+                    throw new BusinessCheckException("超级管理员帐号无法执行该操作，请使用商户帐号操作");
                 }
             }
         }

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCurrency.java

@@ -42,6 +42,9 @@ public class MtCurrency implements Serializable {
     @ApiModelProperty("货币名称")
     private String name;
 
+    @ApiModelProperty("货币符号")
+    private String symbol;
+
     @ApiModelProperty("项目标识")
     private String project;