fixed 会员号显示

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

@@ -66,7 +66,6 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
      */
     @Override
     public PaginationResponse<BalanceDto> queryBalanceListByPagination(PaginationRequest paginationRequest) throws BusinessCheckException {
-        Page<MtBanner> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         LambdaQueryWrapper<MtBalance> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtBalance::getStatus, StatusEnum.DISABLE.getKey());
 
@@ -94,6 +93,16 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
         if (StringUtils.isNotBlank(merchantId)) {
             lambdaQueryWrapper.eq(MtBalance::getMerchantId, merchantId);
         }
+        String userNo = paginationRequest.getSearchParams().get("userNo") == null ? "" : paginationRequest.getSearchParams().get("userNo").toString();
+        if (StringUtil.isNotEmpty(userNo)) {
+            if (StringUtil.isEmpty(merchantId)) {
+                merchantId = "0";
+            }
+            MtUser userInfo = memberService.queryMemberByUserNo(Integer.parseInt(merchantId), userNo);
+            if (userInfo != null) {
+                lambdaQueryWrapper.eq(MtBalance::getUserId, userInfo.getId());
+            }
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtBalance::getStoreId, storeId);
@@ -118,6 +127,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
             dataList.add(item);
         }
 
+        Page<MtBanner> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageImpl pageImpl = new PageImpl(dataList, pageRequest, pageHelper.getTotal());
         PaginationResponse<BalanceDto> paginationResponse = new PaginationResponse(pageImpl, BalanceDto.class);

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

@@ -61,7 +61,6 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
      */
     @Override
     public PaginationResponse<PointDto> queryPointListByPagination(PaginationRequest paginationRequest) throws BusinessCheckException {
-        Page<MtPoint> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         LambdaQueryWrapper<MtPoint> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtPoint::getStatus, StatusEnum.DISABLE.getKey());
 
@@ -81,6 +80,16 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         if (StringUtils.isNotBlank(merchantId)) {
             lambdaQueryWrapper.eq(MtPoint::getMerchantId, merchantId);
         }
+        String userNo = paginationRequest.getSearchParams().get("userNo") == null ? "" : paginationRequest.getSearchParams().get("userNo").toString();
+        if (StringUtil.isNotEmpty(userNo)) {
+            if (StringUtil.isEmpty(merchantId)) {
+                merchantId = "0";
+            }
+            MtUser userInfo = memberService.queryMemberByUserNo(Integer.parseInt(merchantId), userNo);
+            if (userInfo != null) {
+                lambdaQueryWrapper.eq(MtPoint::getUserId, userInfo.getId());
+            }
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtPoint::getStoreId, storeId);
@@ -105,7 +114,7 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
             item.setStatus(point.getStatus());
             dataList.add(item);
         }
-
+        Page<MtPoint> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageImpl pageImpl = new PageImpl(dataList, pageRequest, pageHelper.getTotal());
         PaginationResponse<PointDto> paginationResponse = new PaginationResponse(pageImpl, PointDto.class);

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

@@ -351,9 +351,11 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
         Integer pageNumber = paramMap.get("pageNumber") == null ? Constants.PAGE_NUMBER : Integer.parseInt(paramMap.get("pageNumber").toString());
         Integer pageSize = paramMap.get("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(paramMap.get("pageSize").toString());
         String userId = paramMap.get("userId") == null ? "" : paramMap.get("userId").toString();
+        String userNo = paramMap.get("userNo") == null ? "" : paramMap.get("userNo").toString();
         String status =  paramMap.get("status") == null ? "" : paramMap.get("status").toString();
         String type =  paramMap.get("type") == null ? "": paramMap.get("type").toString();
         String mobile = paramMap.get("mobile") == null ? "" : paramMap.get("mobile").toString();
+        String merchantId = paramMap.get("merchantId") == null ? "" : paramMap.get("merchantId").toString();
         String storeId = paramMap.get("storeId") == null ? "" : paramMap.get("storeId").toString();
         String couponId = paramMap.get("couponId") == null ? "" : paramMap.get("couponId").toString();
         String code = paramMap.get("code") == null ? "" : paramMap.get("code").toString();
@@ -394,12 +396,24 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
         if (StringUtil.isNotEmpty(userId)) {
             lambdaQueryWrapper.eq(MtUserCoupon::getUserId, userId);
         }
+        if (StringUtil.isNotEmpty(userNo)) {
+            if (StringUtil.isEmpty(merchantId)) {
+                merchantId = "0";
+            }
+            MtUser userInfo = memberService.queryMemberByUserNo(Integer.parseInt(merchantId), userNo);
+            if (userInfo != null) {
+                lambdaQueryWrapper.eq(MtUserCoupon::getUserId, userInfo.getId());
+            }
+        }
         if (StringUtil.isNotEmpty(mobile)) {
             lambdaQueryWrapper.eq(MtUserCoupon::getMobile, mobile);
         }
         if (StringUtil.isNotEmpty(type)) {
             lambdaQueryWrapper.eq(MtUserCoupon::getType, type);
         }
+        if (StringUtil.isNotEmpty(merchantId)) {
+            lambdaQueryWrapper.eq(MtUserCoupon::getMerchantId, merchantId);
+        }
         if (StringUtil.isNotEmpty(storeId)) {
             lambdaQueryWrapper.eq(MtUserCoupon::getStoreId, storeId);
         }

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

@@ -73,6 +73,7 @@ public class BackendBalanceController extends BaseController {
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
         String mobile = request.getParameter("mobile") == null ? "" : request.getParameter("mobile");
         String userId = request.getParameter("userId") == null ? "" : request.getParameter("userId");
+        String userNo = request.getParameter("userNo") == null ? "" : request.getParameter("userNo");
         String orderSn = request.getParameter("orderSn") == null ? "" : request.getParameter("orderSn");
         String status = request.getParameter("status") == null ? StatusEnum.ENABLED.getKey() : request.getParameter("status");
 
@@ -87,6 +88,9 @@ public class BackendBalanceController extends BaseController {
         if (StringUtil.isNotEmpty(userId)) {
             searchParams.put("userId", userId);
         }
+        if (StringUtil.isNotEmpty(userNo)) {
+            searchParams.put("userNo", userNo);
+        }
         if (StringUtil.isNotEmpty(orderSn)) {
             searchParams.put("orderSn", orderSn);
         }

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

@@ -75,6 +75,7 @@ public class BackendPointController extends BaseController {
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
         String mobile = request.getParameter("mobile") == null ? "" : request.getParameter("mobile");
         String userId = request.getParameter("userId") == null ? "" : request.getParameter("userId");
+        String userNo = request.getParameter("userNo") == null ? "" : request.getParameter("userNo");
         String status = request.getParameter("status") == null ? StatusEnum.ENABLED.getKey() : request.getParameter("status");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
@@ -93,25 +94,23 @@ public class BackendPointController extends BaseController {
                 searchParams.put("userId", userInfo.getId());
             }
         }
-
         if (StringUtil.isNotEmpty(userId)) {
             searchParams.put("userId", userId);
         }
-
+        if (StringUtil.isNotEmpty(userNo)) {
+            searchParams.put("userNo", userNo);
+        }
         if (StringUtil.isNotEmpty(status)) {
             searchParams.put("status", status);
         }
-
         Integer merchantId = accountInfo.getMerchantId();
         if (merchantId != null && merchantId > 0) {
             searchParams.put("merchantId", merchantId);
         }
-
         Integer storeId = accountInfo.getStoreId();
         if (storeId != null && storeId > 0) {
             searchParams.put("storeId", storeId);
         }
-
         paginationRequest.setSearchParams(searchParams);
         PaginationResponse<PointDto> paginationResponse = pointService.queryPointListByPagination(paginationRequest);
 

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

@@ -102,8 +102,15 @@ public class BackendUserCouponController extends BaseController {
         param.put("pageSize", pageSize);
         param.put("status", request.getParameter("status"));
         param.put("userId", request.getParameter("userId"));
+        param.put("userNo", request.getParameter("userNo"));
         param.put("mobile", request.getParameter("mobile"));
         param.put("storeId", request.getParameter("storeId"));
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            param.put("merchantId", accountInfo.getMerchantId());
+        }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            param.put("storeId", accountInfo.getStoreId());
+        }
         param.put("couponId", request.getParameter("couponId"));
         param.put("id", request.getParameter("id"));
         param.put("type", request.getParameter("type"));