对接了app消费记录接口

src/main/java/org/rcisoft/business/memGoldCoinFlow/entity/MemGoldCoinFlow.java

@@ -2,10 +2,14 @@ package org.rcisoft.business.memGoldCoinFlow.entity;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 
 import org.rcisoft.core.entity.CyIdIncreEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigInteger;
+import java.util.Date;
 
 /**
 * Created with cy on 2025年2月7日 上午10:11:22.
@@ -74,5 +78,17 @@ public class MemGoldCoinFlow  extends CyIdIncreEntity<MemGoldCoinFlow> {
      //用户
      @TableField(exist = false)
      private String userNickName;
+
+     /**
+      * 开始时间
+      */
+     @TableField(exist = false)
+     private String beginTime;
+
+     /**
+      * 结束时间
+      */
+     @TableField(exist = false)
+     private String endTime;
 }
 

src/main/java/org/rcisoft/business/memGoldCoinFlow/service/impl/MemGoldCoinFlowServiceImpl.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.memGoldCoinFlow.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.rcisoft.business.memGoldCoinFlow.dao.MemGoldCoinFlowRepository;
 import org.rcisoft.business.memGoldCoinFlow.entity.MemGoldCoinFlow;
 import org.rcisoft.business.memGoldCoinFlow.service.MemGoldCoinFlowService;
@@ -16,6 +17,11 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.rcisoft.core.model.CyPageInfo;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 
@@ -112,6 +118,11 @@ public class MemGoldCoinFlowServiceImpl extends ServiceImpl<MemGoldCoinFlowRepos
         MemGoldCoinFlow memGoldCoinFlow,String type){
         if (type.equals("app")){
             //小程序
+            if (StringUtils.isNotEmpty(memGoldCoinFlow.getBeginTime()) && StringUtils.isNotEmpty(memGoldCoinFlow.getEndTime())){
+                memGoldCoinFlow.setBeginTime(memGoldCoinFlow.getBeginTime()+" 00:00:00");
+                memGoldCoinFlow.setEndTime(memGoldCoinFlow.getEndTime()+" 23:59:59");
+            }
+            memGoldCoinFlow.setCreateBy(CyUserUtil.getAuthenBusinessId());
           return baseMapper.appQueryMemGoldCoinFlowsPaged(paginationUtility,memGoldCoinFlow);
         } else {
             //管理端

src/main/java/org/rcisoft/business/opmBlacklist/entity/OpmBlackList.java

@@ -31,10 +31,10 @@ public class OpmBlackList  extends CyIdIncreNotDataEntity<OpmBlackList> {
      * @default
      */
      @JsonFormat(
-     pattern = "yyyy-MM-dd"
+     pattern = "yyyy-MM-dd HH:mm:ss"
      )
-     @Excel(name = "创建时间", orderNum = "0", width = 20, format = "yyyy-MM-dd")
-     @DateTimeFormat(pattern = "yyyy-MM-dd")
+     @Excel(name = "创建时间", orderNum = "0", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date createDate;
 
      /**

src/main/resources/mapper/business/memGoldCoinFlow.mapper/MemGoldCoinFlowMapper.xml

@@ -81,11 +81,21 @@
     </select>
     <select id="appQueryMemGoldCoinFlowsPaged"
             resultType="org.rcisoft.business.memGoldCoinFlow.entity.MemGoldCoinFlow">
-        select mgcf.*,
+        select mgcf.*
         from mem_gold_coin_flow mgcf
         where 1=1
         and mgcf.del_flag = '0'
         and mgcf.flag = '1'
+        and mgcf.create_by = #{entity.createBy}
+        <if test="entity.beginTime !=null and entity.beginTime != '' ">
+            and mgcf.create_date &gt;= #{entity.beginTime}
+        </if>
+        <if test="entity.endTime !=null and entity.endTime != '' ">
+            and mgcf.create_date &lt;= #{entity.endTime}
+        </if>
+        <if test="entity.type !=null and entity.type != '' ">
+            and mgcf.type = #{entity.type}
+        </if>
         ORDER BY mgcf.business_id DESC
     </select>
     <select id="balance" resultType="java.lang.Integer">