Skip to content

G
gxpt_ht
Commit c1ed7fee by hayden
Options

后台管理系统系统管理-日志管理-扫呗支付日志：新增筛选条件门店、房间

parent 987a23da
Showing with 75 additions and 25 deletions
share-admin/src/main/java/share/web/controller/system/SaobeiApiLogController.java
......@@ -17,6 +17,7 @@ import share.common.core.controller.BaseController;
import share.common.core.domain.AjaxResult;
import share.common.enums.BusinessType;
import share.system.domain.SaobeiApiLog;
import share.system.domain.SaobeiApiLogDto;
import share.system.service.SaobeiApiLogService;
import share.common.utils.poi.ExcelUtil;
import share.common.core.page.TableDataInfo;
......@@ -39,10 +40,10 @@ public class SaobeiApiLogController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('system:saobeilog:list')")
@GetMapping("/list")
public TableDataInfo list(SaobeiApiLog saobeiApiLog)
public TableDataInfo list(SaobeiApiLogDto saobeiApiLogDto)
{
startPage();
List<SaobeiApiLog> list = saobeiApiLogService.selectSaobeiApiLogList(saobeiApiLog);
List<SaobeiApiLogDto> list = saobeiApiLogService.selectSaobeiApiLogList(saobeiApiLogDto);
return getDataTable(list);
}
......@@ -52,10 +53,10 @@ public class SaobeiApiLogController extends BaseController
@PreAuthorize("@ss.hasPermi('system:saobeilog:export')")
@Log(title = "扫呗接口调用日志", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SaobeiApiLog saobeiApiLog)
public void export(HttpServletResponse response, SaobeiApiLogDto saobeiApiLog)
{
List<SaobeiApiLog> list = saobeiApiLogService.selectSaobeiApiLogList(saobeiApiLog);
ExcelUtil<SaobeiApiLog> util = new ExcelUtil<SaobeiApiLog>(SaobeiApiLog.class);
List<SaobeiApiLogDto> list = saobeiApiLogService.selectSaobeiApiLogList(saobeiApiLog);
ExcelUtil<SaobeiApiLogDto> util = new ExcelUtil<>(SaobeiApiLogDto.class);
util.exportExcel(response, list, "扫呗接口调用日志数据");
}
......
share-system/src/main/java/share/system/domain/SaobeiApiLogDto.java 0 → 100644
package share.system.domain;
import lombok.Data;
/**
* @author lichenghu
* @date 2024/1/25
*/
@Data
public class SaobeiApiLogDto extends SaobeiApiLog {
/**
* 门店id
*/
private Long storeId;
/**
* 房间id
*/
private Long roomId;
}
share-system/src/main/java/share/system/mapper/SaobeiApiLogMapper.java
......@@ -3,6 +3,7 @@ package share.system.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import share.system.domain.SaobeiApiLog;
import share.system.domain.SaobeiApiLogDto;
/**
* 扫呗接口调用日志Mapper接口
......@@ -26,7 +27,7 @@ public interface SaobeiApiLogMapper extends BaseMapper<SaobeiApiLog>
* @param saobeiApiLog 扫呗接口调用日志
* @return 扫呗接口调用日志集合
*/
public List<SaobeiApiLog> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog);
public List<SaobeiApiLogDto> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog);
/**
* 新增扫呗接口调用日志
......
share-system/src/main/java/share/system/service/SaobeiApiLogService.java
......@@ -3,6 +3,7 @@ package share.system.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import share.system.domain.SaobeiApiLog;
import share.system.domain.SaobeiApiLogDto;
/**
* 扫呗接口调用日志Service接口
......@@ -26,7 +27,7 @@ public interface SaobeiApiLogService extends IService<SaobeiApiLog>
* @param saobeiApiLog 扫呗接口调用日志
* @return 扫呗接口调用日志集合
*/
public List<SaobeiApiLog> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog);
public List<SaobeiApiLogDto> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog);
/**
* 新增扫呗接口调用日志
......
share-system/src/main/java/share/system/service/impl/SaobeiApiLogServiceImpl.java
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import share.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import share.system.domain.SaobeiApiLogDto;
import share.system.mapper.SaobeiApiLogMapper;
import share.system.domain.SaobeiApiLog;
import share.system.service.SaobeiApiLogService;
......@@ -40,7 +41,7 @@ public class SaobeiApiLogServiceImpl extends ServiceImpl<SaobeiApiLogMapper, Sao
* @return 扫呗接口调用日志
*/
@Override
public List<SaobeiApiLog> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog)
public List<SaobeiApiLogDto> selectSaobeiApiLogList(SaobeiApiLog saobeiApiLog)
{
return saobeiApiLogMapper.selectSaobeiApiLogList(saobeiApiLog);
}
......
share-system/src/main/resources/mapper/system/SaobeiApiLogMapper.xml
......@@ -31,23 +31,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, pay_ver, pay_type, service_id, merchant_no, terminal_id, terminal_ip, terminal_trace, terminal_time, out_trade_no, request_params, response_params, result, result_msg, create_time, create_by, update_by, update_time, remark, flag from s_saobei_api_log
</sql>
<select id="selectSaobeiApiLogList" parameterType="SaobeiApiLog" resultMap="SaobeiApiLogResult">
<include refid="selectSaobeiApiLogVo"/>
<where>
<if test="payVer != null and payVer != ''"> and pay_ver = #{payVer}</if>
<if test="payType != null and payType != ''"> and pay_type = #{payType}</if>
<if test="serviceId != null and serviceId != ''"> and service_id = #{serviceId}</if>
<if test="merchantNo != null and merchantNo != ''"> and merchant_no = #{merchantNo}</if>
<if test="terminalId != null and terminalId != ''"> and terminal_id = #{terminalId}</if>
<if test="terminalIp != null and terminalIp != ''"> and terminal_ip = #{terminalIp}</if>
<if test="terminalTrace != null and terminalTrace != ''"> and terminal_trace = #{terminalTrace}</if>
<if test="terminalTime != null and terminalTime != ''"> and terminal_time = #{terminalTime}</if>
<if test="outTradeNo != null and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
<if test="requestParams != null and requestParams != ''"> and request_params = #{requestParams}</if>
<if test="responseParams != null and responseParams != ''"> and response_params = #{responseParams}</if>
<if test="result != null and result != ''"> and result = #{result}</if>
<if test="resultMsg != null and resultMsg != ''"> and result_msg = #{resultMsg}</if>
<if test="flag != null and flag != ''"> and flag = #{flag}</if>
<select id="selectSaobeiApiLogList" parameterType="SaobeiApiLog" resultType="SaobeiApiLogDto">
select
t1.id,
t3.store_id,
t3.room_id,
t1.pay_ver,
t1.pay_type,
t1.service_id,
t1.merchant_no,
t1.terminal_id,
t1.terminal_ip,
t1.terminal_trace,
t1.terminal_time,
t1.out_trade_no,
t1.request_params,
t1.response_params,
t1.result,
t1.result_msg,
t1.create_time,
t1.create_by,
t1.update_by,
t1.update_time,
t1.remark,
t1.flag
from s_saobei_api_log t1
join s_wechat_pay_info t2 on t1.terminal_trace = t2.out_trade_no
join s_order t3 on t2.out_trade_no = t3.out_trade_no
<where>
<if test="storeId != null">and t3.store_id = #{storeId}</if>
<if test="roomId != null">and t3.room_id = #{roomId}</if>
<if test="payVer != null and payVer != ''">and t1.pay_ver = #{payVer}</if>
<if test="payType != null and payType != ''">and t1.pay_type = #{payType}</if>
<if test="serviceId != null and serviceId != ''">and t1.service_id = #{serviceId}</if>
<if test="merchantNo != null and merchantNo != ''">and t1.merchant_no = #{merchantNo}</if>
<if test="terminalId != null and terminalId != ''">and t1.terminal_id = #{terminalId}</if>
<if test="terminalIp != null and terminalIp != ''">and t1.terminal_ip = #{terminalIp}</if>
<if test="terminalTrace != null and terminalTrace != ''">and t1.terminal_trace = #{terminalTrace}</if>
<if test="terminalTime != null and terminalTime != ''">and t1.terminal_time = #{terminalTime}</if>
<if test="outTradeNo != null and outTradeNo != ''">and t1.out_trade_no = #{outTradeNo}</if>
<if test="requestParams != null and requestParams != ''">and t1.request_params = #{requestParams}</if>
<if test="responseParams != null and responseParams != ''">and t1.response_params = #{responseParams}</if>
<if test="result != null and result != ''">and t1.result = #{result}</if>
<if test="resultMsg != null and resultMsg != ''">and t1.result_msg = #{resultMsg}</if>
<if test="flag != null and flag != ''">and t1.flag = #{flag}</if>
</where>
order by create_time desc
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment