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

@@ -44,7 +44,7 @@ public class VersionDto extends Page implements Serializable {
     private Date effectiveDate;
 
     @ApiModelProperty("版本id")
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.ID_WORKER)
     private Long id;
 
     @ApiModelProperty("是否强制更新 0否 1是")

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

@@ -362,6 +362,10 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         String password = loginRequest.getPassword();
         String captchaCode = loginRequest.getCaptchaCode();
         String uuid = loginRequest.getUuid();
+        String loginFrom = loginRequest.getLoginFrom();
+
+
+
 
         Boolean captchaVerify = captchaService.checkCodeByUuid(captchaCode, uuid);
         if (!captchaVerify) {
@@ -377,6 +381,11 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
             }
 
             TAccount tAccount = getAccountInfoById(accountInfo.getId());
+
+            if (StringUtils.equals("cashier", loginFrom) && ( tAccount.getStoreId() == null || tAccount.getStoreId() == 0L) ){
+                throw new BusinessCheckException("平台账号暂无权限登录");
+            }
+
             String myPassword = tAccount.getPassword();
             String inputPassword = getEntryptPassword(password, tAccount.getSalt());
             if (!myPassword.equals(inputPassword) || !tAccount.getAccountStatus().toString().equals("1")) {

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

@@ -1,5 +1,6 @@
 package com.fuint.module.backendApi.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fuint.common.Constants;
 import com.fuint.common.dto.AccountDto;
 import com.fuint.common.dto.AccountInfo;
@@ -27,10 +28,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 后台管理员管理
@@ -317,7 +315,7 @@ public class BackendAccountController extends BaseController {
         }
 
         AccountInfo accountInfo = tAccountService.getAccountByName(accountName);
-        if (accountInfo != null && accountInfo.getId() != id.intValue()) {
+        if (accountInfo != null && !Objects.equals(accountInfo.getId(),id)) {
             return getFailureResult(201, "该用户名已存在");
         }
 

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

@@ -3,7 +3,6 @@ package com.fuint.module.backendApi.controller;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.ext.CurrencyDto;
 import com.fuint.common.param.PageParam;
-import com.fuint.common.util.I18nUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.common.vo.CurrencyVo;
 import com.fuint.framework.web.BaseController;
@@ -20,7 +19,6 @@ import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
@@ -45,9 +43,6 @@ public class BackendCurrencyController extends BaseController {
      */
     private CurrencyService currencyService;
 
-    @Autowired
-    private HttpServletRequest request;
-
     /**
      * 货币表列表查询
      *
@@ -57,9 +52,8 @@ public class BackendCurrencyController extends BaseController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('currency:list')")
-    public ResponseObject list(@RequestParam(defaultValue = "") String name, PageParam pageParam) throws BusinessCheckException {
-        String message1 = I18nUtil.getMessage("A00001", request.getHeader("lang"));
-        return getSuccessResult(message1);
+    public PageResult<CurrencyVo> list(@RequestParam(defaultValue = "") String name, PageParam pageParam) throws BusinessCheckException {
+        return currencyService.getCurrencyById(name,pageParam);
     }
 
     /**

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

@@ -211,7 +211,7 @@ public class BackendStoreController extends BaseController {
 		String contact = CommonUtil.replaceXSS(params.get("contact").toString());
 		String phone = CommonUtil.replaceXSS(params.get("phone").toString());
 		String countryId = params.get("countryId") == null ? "" : CommonUtil.replaceXSS(params.get("countryId").toString());
-		String currencyId = params.get("currencyId") == null ? YesOrNoEnum.NO.getKey() : CommonUtil.replaceXSS(params.get("currencyId").toString());
+		String currencyId = params.get("currencyId") == null ? null : CommonUtil.replaceXSS(params.get("currencyId").toString());
 		String serviceFeeRate = params.get("serviceFeeRate") == null ? "" : CommonUtil.replaceXSS(params.get("serviceFeeRate").toString());
 		String description = params.get("description") == null ? "" : CommonUtil.replaceXSS(params.get("description").toString());
 		String isDefault = params.get("isDefault") == null ? YesOrNoEnum.NO.getKey() : CommonUtil.replaceXSS(params.get("isDefault").toString());

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/request/LoginRequest.java

@@ -24,4 +24,7 @@ public class LoginRequest implements Serializable {
 
     @ApiModelProperty(value="图形验证码uuid", name="uuid")
     private String uuid;
+
+    @ApiModelProperty(value="登录入口", name="loginFrom")
+    private String loginFrom;
 }

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

@@ -33,6 +33,14 @@ public class MtVersion implements Serializable {
     @TableField(value = "create_user_id",fill = FieldFill.INSERT)
     private String createUserId;
 
+    @ApiModelProperty("更新时间")
+    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty("修改用户id")
+    @TableField(value = "update_user_id",fill = FieldFill.INSERT_UPDATE)
+    private String updateUserId;
+
     @ApiModelProperty("是否删除 0否 1是")
     private Integer deleteFlag;
 
@@ -46,7 +54,7 @@ public class MtVersion implements Serializable {
     private Date effectiveDate;
 
     @ApiModelProperty("版本id")
-    @TableId(value = "ID", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.ID_WORKER)
     private Long id;
 
     @ApiModelProperty("是否强制更新 0否 1是")
@@ -70,12 +78,6 @@ public class MtVersion implements Serializable {
     @ApiModelProperty("版本类型")
     private String type;
 
-    @ApiModelProperty("更新时间")
-//    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
 
-    @ApiModelProperty("修改用户id")
-//    @TableField(value = "update_user_id",fill = FieldFill.INSERT_UPDATE)
-    private String updateUserId;
 
 }