fixed 商户端会员查询 活跃时间、注册时间

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

@@ -222,6 +222,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtUser::getStatus, status);
         }
+        // 注册开始、结束时间
         String startTime = paginationRequest.getSearchParams().get("startTime") == null ? "" : paginationRequest.getSearchParams().get("startTime").toString();
         String endTime = paginationRequest.getSearchParams().get("endTime") == null ? "" : paginationRequest.getSearchParams().get("endTime").toString();
         if (StringUtil.isNotEmpty(startTime)) {
@@ -230,6 +231,34 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         if (StringUtil.isNotEmpty(endTime)) {
             lambdaQueryWrapper.le(MtUser::getCreateTime, endTime);
         }
+        // 注册时间
+        String regTime = paginationRequest.getSearchParams().get("regTime") == null ? "" : paginationRequest.getSearchParams().get("regTime").toString();
+        if (StringUtil.isNotEmpty(regTime)) {
+            String[] dateTime = regTime.split("~");
+            if (dateTime.length == 2) {
+                lambdaQueryWrapper.ge(MtUser::getCreateTime, dateTime[0]);
+                lambdaQueryWrapper.le(MtUser::getCreateTime, dateTime[1]);
+            }
+        }
+        // 活跃时间
+        String activeTime = paginationRequest.getSearchParams().get("activeTime") == null ? "" : paginationRequest.getSearchParams().get("activeTime").toString();
+        if (StringUtil.isNotEmpty(activeTime)) {
+            String[] dateTime = activeTime.split("~");
+            if (dateTime.length == 2) {
+                lambdaQueryWrapper.ge(MtUser::getUpdateTime, dateTime[0]);
+                lambdaQueryWrapper.le(MtUser::getUpdateTime, dateTime[1]);
+            }
+        }
+        // 会员有效期
+        String memberTime = paginationRequest.getSearchParams().get("memberTime") == null ? "" : paginationRequest.getSearchParams().get("memberTime").toString();
+        if (StringUtil.isNotEmpty(memberTime)) {
+            String[] dateTime = memberTime.split("~");
+            if (dateTime.length == 2) {
+                lambdaQueryWrapper.ge(MtUser::getStartTime, dateTime[0]);
+                lambdaQueryWrapper.le(MtUser::getEndTime, dateTime[1]);
+            }
+        }
+
         lambdaQueryWrapper.orderByDesc(MtUser::getUpdateTime);
         List<MtUser> userList = mtUserMapper.selectList(lambdaQueryWrapper);
         List<UserDto> dataList = new ArrayList<>();

fuint-application/src/main/java/com/fuint/module/merchantApi/controller/MerchantMemberController.java

@@ -83,9 +83,9 @@ public class MerchantMemberController extends BaseController {
 
         // 今日注册、今日活跃
         if (dataType.equals("todayRegister")) {
-            regTime = DateUtil.formatDate(new Date(), "yyyy-MM-dd") + "~" + DateUtil.formatDate(new Date(), "yyyy-MM-dd");
+            regTime = DateUtil.formatDate(new Date(), "yyyy-MM-dd") + " 00:00:00~" + DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
         } else if (dataType.equals("todayActive")) {
-            activeTime = DateUtil.formatDate(new Date(), "yyyy-MM-dd") + "~" + DateUtil.formatDate(new Date(), "yyyy-MM-dd");
+            activeTime = DateUtil.formatDate(new Date(), "yyyy-MM-dd") + " 00:00:00~" + DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
         }
 
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
@@ -134,21 +134,17 @@ public class MerchantMemberController extends BaseController {
 
         // 注册时间比对
         if (StringUtil.isNotEmpty(regTime)) {
-            params.put("createTime", regTime);
+            params.put("regTime", regTime);
         }
 
         // 活跃时间比对
         if (StringUtil.isNotEmpty(activeTime)) {
-            params.put("updateTime", activeTime);
+            params.put("activeTime", activeTime);
         }
 
         // 会员有效期比对
         if (StringUtil.isNotEmpty(memberTime)) {
-            String[] dateTime = memberTime.split("~");
-            if (dateTime.length == 2) {
-                params.put("startTime", dateTime[0].trim());
-                params.put("endTime", dateTime[1].trim());
-            }
+            params.put("memberTime", memberTime);
         }
 
         // 会员排序方式