fixed 修复近期发现的bug

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

@@ -141,7 +141,7 @@ public class BackendFileController extends BaseController {
                 filePath = domain + fileName;
                 url = filePath;
             }
-            
+
             resultMap.put("status", "success");
             resultMap.put("domain", baseImage);
             resultMap.put("filePath", filePath);
@@ -152,6 +152,8 @@ public class BackendFileController extends BaseController {
             resultMap.put("title", fileName);
             resultMap.put("type", file.getContentType());
             resultMap.put("url", url);
+            String ip = CommonUtil.getIPFromHttpRequest(request);
+            logger.info("用户ip:{},上传文件url:{}", ip, url);
         } catch (Exception e) {
             return getFailureResult(201, "上传失败，请检查上传配置及权限");
         }

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

@@ -19,6 +19,7 @@ import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import com.fuint.repository.model.MtBookCate;
 import com.fuint.repository.model.MtBookItem;
+import com.fuint.repository.model.MtStore;
 import com.fuint.repository.model.MtUser;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
@@ -70,18 +71,24 @@ public class ClientBookController extends BaseController {
      */
     private MemberService memberService;
 
+    /**
+     * 店铺服务接口
+     * */
+    private StoreService storeService;
+
     /**
      * 获取预约项目列表
      */
     @ApiOperation(value="获取预约项目列表", notes="获取预约项目列表")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject list(HttpServletRequest request,  @RequestBody BookListParam param) throws BusinessCheckException, InvocationTargetException, IllegalAccessException {
+    public ResponseObject list(HttpServletRequest request, @RequestBody BookListParam param) throws BusinessCheckException, InvocationTargetException, IllegalAccessException {
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
+        Integer storeId = request.getHeader("storeId") == null ? 0 : Integer.parseInt(request.getHeader("storeId"));
         String name = param.getName();
         Integer cateId = param.getCateId();
         Integer page = param.getPage() == null ? Constants.PAGE_NUMBER : param.getPage();
         Integer pageSize = param.getPageSize() == null ? Constants.PAGE_SIZE : param.getPageSize();
-        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -92,8 +99,17 @@ public class ClientBookController extends BaseController {
         if (StringUtil.isNotEmpty(name)) {
             params.put("name", name);
         }
+        Integer merchantId = 0;
         if (StringUtil.isNotEmpty(merchantNo)) {
-            params.put("merchantNo", merchantNo);
+            merchantId = merchantService.getMerchantId(merchantNo);
+        } else if (storeId != null && storeId > 0) {
+            MtStore mtStore = storeService.queryStoreById(storeId);
+            if (mtStore != null && mtStore.getMerchantId() != null) {
+                merchantId = mtStore.getMerchantId();
+            }
+        }
+        if (merchantId > 0) {
+            params.put("merchantId", merchantId);
         }
         if (cateId != null && cateId > 0) {
             params.put("cateId", cateId);

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

@@ -132,7 +132,7 @@ public class ClientFileController extends BaseController {
                 filePath = domain + fileName;
                 url = filePath;
             }
-            
+
             resultMap.put("status", "success");
             resultMap.put("domain", baseImage);
             resultMap.put("filePath", filePath);
@@ -143,6 +143,8 @@ public class ClientFileController extends BaseController {
             resultMap.put("title", fileName);
             resultMap.put("type", file.getContentType());
             resultMap.put("url", url);
+            String ip = CommonUtil.getIPFromHttpRequest(request);
+            logger.info("用户ip:{},上传文件url:{}", ip, url);
         } catch (Exception e) {
             return getFailureResult(201, "上传失败，请检查上传配置及权限");
         }

fuint-repository/src/main/java/com/fuint/repository/model/MtUploadShippingLog.java

@@ -19,7 +19,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("mt_upload_shipping_log")
-@ApiModel(value = "upload_shipping_log表对象", description = "upload_shipping_log表对象")
+@ApiModel(value = "upload_shipping_log表对象", description = "微信小程序上传发货信息对象")
 public class MtUploadShippingLog implements Serializable {
 
     private static final long serialVersionUID = 1L;