fixed 后台账号管理优化

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

@@ -1013,8 +1013,8 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
             Date sendTime = new Date(nowTime.getTime());
             Map<String, Object> param = new HashMap<>();
             String dateTime = DateUtil.formatDate(Calendar.getInstance().getTime(), "yyyy-MM-dd HH:mm");
-            params.put("name", couponInfo.getName());
-            params.put("time", dateTime);
+            param.put("name", couponInfo.getName());
+            param.put("time", dateTime);
             weixinService.sendSubscribeMessage(userInfo.getMerchantId(), userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.COUPON_CONFIRM.getKey(), "pages/user/index", param, sendTime);
         } catch (Exception e) {
             logger.error("核销卡券发送通知消息出错：", e.getMessage());

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

@@ -81,11 +81,9 @@ public class BackendAccountController extends BaseController {
         String accountName = request.getParameter("accountName") == null ? "" : request.getParameter("accountName");
         String realName = request.getParameter("realName") == null ? "" : request.getParameter("realName");
         String accountStatus = request.getParameter("accountStatus") == null ? "" : request.getParameter("accountStatus");
-
+        String merchantId = request.getParameter("merchantId") == null ? "" : request.getParameter("merchantId");
+        String storeId = request.getParameter("storeId") == null ? "" : request.getParameter("storeId");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
-        if (accountInfo == null) {
-            return getFailureResult(1001, "请先登录");
-        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -106,9 +104,17 @@ public class BackendAccountController extends BaseController {
         }
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             searchParams.put("merchantId", accountInfo.getMerchantId());
+        } else {
+            if (StringUtil.isNotEmpty(merchantId)) {
+                searchParams.put("merchantId", merchantId);
+            }
         }
         if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
             searchParams.put("storeId", accountInfo.getStoreId());
+        } else {
+            if (StringUtil.isNotEmpty(storeId)) {
+                searchParams.put("storeId", storeId);
+            }
         }
 
         paginationRequest.setSearchParams(searchParams);
@@ -431,4 +437,4 @@ public class BackendAccountController extends BaseController {
 
         return getSuccessResult(true);
     }
-}
+}