classic_blue преди 1 седмица
родител
ревизия
c3750fb5fd

+ 1 - 0
fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/CurrencyServiceImpl.java

@@ -68,6 +68,7 @@ public class CurrencyServiceImpl extends ServiceImpl<MtCurrencyMapper, MtCurrenc
         MtCurrency mtCurrency = new MtCurrency();
         mtCurrency.setId(currencyDto.getId());
         mtCurrency.setName(currencyDto.getName());
+        mtCurrency.setSymbol(currencyDto.getSymbol());
         return updateById(mtCurrency);
     }
 

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

@@ -162,7 +162,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
             item.setId(mtGoods.getId());
             item.setInitSale(mtGoods.getInitSale());
             if (StringUtil.isNotEmpty(mtGoods.getLogo())) {
-                item.setLogo(basePath + mtGoods.getLogo());
+                item.setLogo(mtGoods.getLogo());
             }
             item.setStoreId(mtGoods.getStoreId());
             if (mtGoods.getStoreId() != null) {

+ 2 - 3
fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendFileController.java

@@ -40,7 +40,7 @@
 //@RestController
 //@AllArgsConstructor
 //@RequestMapping(value = "/backendApi/file")
-//public class BackendFileController extends BaseController {
+//public class Backend extends BaseController {
 //
 //    private static final Logger logger = LoggerFactory.getLogger(BackendFileController.class);
 //
@@ -247,7 +247,6 @@ public class BackendFileController extends BaseController {
      * 后台上传文件
      *
      * @param file
-     * @param token
      * @return ResponseObject
      */
     @ApiOperation(value = "后台上传文件")
@@ -277,7 +276,7 @@ public class BackendFileController extends BaseController {
 
         // 获取上传文件的最大允许大小
         String maxSizeStr = env.getProperty("images.upload.maxSize");
-        float maxSize = 2;  // 默认限制 2MB
+        float maxSize = 20;  // 默认限制 2MB
         try {
             maxSize = Float.parseFloat(maxSizeStr);
         } catch (NumberFormatException e) {

+ 3 - 0
fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java

@@ -342,6 +342,9 @@ public class BackendGoodsController extends BaseController {
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             param.put("merchantId", accountInfo.getMerchantId());
         }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            param.put("storeId", accountInfo.getStoreId());
+        }
         List<MtGoodsCate> cateList = cateService.queryCateListByParams(param);
         result.put("cateList", cateList);
 

+ 3 - 2
fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.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.AccountInfo;
 import com.fuint.common.dto.ParamDto;
@@ -151,7 +152,7 @@ public class BackendStaffController extends BaseController {
     @PreAuthorize("@pms.hasPermission('staff:list')")
     public ResponseObject saveHandler(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
-        Long id = Long.valueOf(params.get("id") == null ? "0" : params.get("id").toString());
+        Long id = params.get("id") == null ||params.get("id").equals("") ? null :Long.parseLong( params.get("id").toString());
         Long storeId = Long.valueOf(params.get("storeId") == null ? "0" : params.get("storeId").toString());
         String category = params.get("category") == null ? "0" : params.get("category").toString();
         String mobile = params.get("mobile") == null ? "" : CommonUtil.replaceXSS(params.get("mobile").toString());
@@ -170,7 +171,7 @@ public class BackendStaffController extends BaseController {
         }
 
         MtStaff mtStaff = new MtStaff();
-        if (StringUtil.isNotEmpty(String.valueOf(id))) {
+        if (ObjectUtils.isNotEmpty(id)) {
             mtStaff = staffService.queryStaffById(Long.valueOf(id));
         }