浏览代码

fixed 后台查询的bug

fushengqian 1 年之前
父节点
当前提交
ff2dd485e5

+ 10 - 3
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

@@ -163,6 +163,7 @@ public class BackendMemberController extends BaseController {
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             searchParams.put("merchantId", accountInfo.getMerchantId());
         }
+        searchParams.put("status", StatusEnum.ENABLED.getKey());
         PaginationRequest groupRequest = new PaginationRequest();
         groupRequest.setCurrentPage(1);
         groupRequest.setPageSize(Constants.MAX_ROWS);
@@ -254,6 +255,7 @@ public class BackendMemberController extends BaseController {
         String name = param.get("name") == null ? "" : param.get("name").toString();
         String gradeId = param.get("gradeId") == null ? "0" :param.get("gradeId").toString();
         String groupId = param.get("groupId") == null ? "0" :param.get("groupId").toString();
+        String storeId = param.get("storeId") == null ? "0" :param.get("storeId").toString();
         String userNo = param.get("userNo") == null ? "" : param.get("userNo").toString();
         String mobile = param.get("mobile") == null ? "" : param.get("mobile").toString();
         String sex = param.get("sex") == null ? "0" : param.get("sex").toString();
@@ -295,10 +297,15 @@ public class BackendMemberController extends BaseController {
         memberInfo.setDescription(description);
         memberInfo.setStartTime(DateUtil.parseDate(startTime));
         memberInfo.setEndTime(DateUtil.parseDate(endTime));
+        if (StringUtil.isNotEmpty(storeId)) {
+            memberInfo.setStoreId(Integer.parseInt(storeId));
+        }
+        TAccount account = accountService.getAccountInfoById(accountInfo.getId());
+        Integer myStoreId = account.getStoreId();
+        if (myStoreId != null && myStoreId > 0) {
+            memberInfo.setStoreId(myStoreId);
+        }
         if (StringUtil.isEmpty(id)) {
-            TAccount account = accountService.getAccountInfoById(accountInfo.getId());
-            Integer storeId = account.getStoreId();
-            memberInfo.setStoreId(storeId);
             memberService.addMember(memberInfo);
         } else {
             memberService.updateMember(memberInfo, false);

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

@@ -61,7 +61,7 @@ public class BackendStaffController extends BaseController {
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
         String mobile = request.getParameter("mobile");
         String realName = request.getParameter("realName");
-        String auditedStatus = request.getParameter("status");
+        String auditedStatus = request.getParameter("auditedStatus");
         String storeId = request.getParameter("storeId");
         String category = request.getParameter("category");