zoujiajian 1 год назад
Родитель
Сommit
18eceb5bab

+ 6 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -357,13 +357,17 @@ public class CmsGroupRelationController {
     @GetMapping("/get/recharge/operate/record")
     public Result<List<GptUserRechargeNumRecord>> getGptUserRechargeNumRecord(Long relationId, Long userId) {
         GroupsRelation relation = groupsRelationMapper.selectById(relationId);
-        if (relation.getSubmitTime() == null) {
+        if (relation.getSubmitTime() == null && relation.getStartTime() == null) {
             return GatewayResponse.SUCCESS.newBuilder().toResult();
         }
+        Date filterDate = relation.getSubmitTime();
+        if (filterDate == null) {
+            filterDate = relation.getStartTime();
+        }
         List<GptUserRechargeNumRecord> gptUserRechargeNumRecords = beanSearcher.searchAll(GptUserRechargeNumRecord.class, MapUtils.flatBuilder(request.getParameterMap())
                 .field(GptUserRechargeNumRecord::getRelationId, relationId)
                 .field(GptUserRechargeNumRecord::getUserId, userId)
-                .field(GptUserRechargeNumRecord::getCreatedTime, relation.getSubmitTime()).op(Operator.GreaterEqual)
+                .field(GptUserRechargeNumRecord::getCreatedTime, filterDate).op(Operator.GreaterEqual)
                 .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(gptUserRechargeNumRecords);
     }