From 46e642bc01b6f0d5ea9d97bfb9f51a531c3bf0bd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 十二月 2023 11:30:16 +0800
Subject: [PATCH] 1、优化ID生成器 2、通信中间件去除对SpringDoc支持，原因报错斩未解决；
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml | 129 ++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 44 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
index b0bea0e..7ebcb09 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
@@ -1,52 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoSe.SeRechargeMapper">
-
<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
<!--@mbg.generated-->
<!--@Table se_recharge-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="cardId" jdbcType="BIGINT" property="cardid" />
+ <result column="clientId" jdbcType="BIGINT" property="clientid" />
<result column="money" jdbcType="FLOAT" property="money" />
<result column="amount" jdbcType="FLOAT" property="amount" />
<result column="gift" jdbcType="FLOAT" property="gift" />
<result column="afterRecharge" jdbcType="FLOAT" property="afterrecharge" />
<result column="paymentId" jdbcType="BIGINT" property="paymentid" />
+ <result column="price" jdbcType="FLOAT" property="price" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="operator" jdbcType="BIGINT" property="operator" />
<result column="operateDt" jdbcType="TIMESTAMP" property="operatedt" />
</resultMap>
-
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardId, money, amount, gift, afterRecharge, paymentId, remarks, `operator`, operateDt
+ id, cardId, clientId, money, amount, gift, afterRecharge, paymentId, price, remarks,
+ `operator`, operateDt
</sql>
-
-<!-- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">-->
-<!-- <!–@mbg.generated–>-->
-<!-- select -->
-<!-- <include refid="Base_Column_List" />-->
-<!-- from se_recharge-->
-<!-- where id = #{id,jdbcType=BIGINT}-->
-<!-- </select>-->
-
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from se_recharge
+ where id = #{id,jdbcType=BIGINT}
+ </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from se_recharge
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge" useGeneratedKeys="true">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
<!--@mbg.generated-->
- insert into se_recharge (cardId, money, amount,
- gift, afterRecharge, paymentId,
- remarks, `operator`, operateDt
- )
- values (#{cardid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT}, #{amount,jdbcType=FLOAT},
- #{gift,jdbcType=FLOAT}, #{afterrecharge,jdbcType=FLOAT}, #{paymentid,jdbcType=BIGINT},
- #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}
- )
+ insert into se_recharge (id, cardId, clientId, money, amount, gift, afterRecharge, paymentId, price, remarks, `operator`, operateDt)
+ values (#{id,jdbcType=BIGINT},
+ #{cardid,jdbcType=BIGINT},
+ #{clientid,jdbcType=BIGINT},
+ #{money,jdbcType=FLOAT},
+ #{amount,jdbcType=FLOAT},
+ #{gift,jdbcType=FLOAT},
+ #{afterrecharge,jdbcType=FLOAT},
+ #{paymentid,jdbcType=BIGINT},
+ #{price,jdbcType=FLOAT},
+ #{remarks,jdbcType=VARCHAR},
+ #{operator,jdbcType=BIGINT},
+ #{operatedt,jdbcType=TIMESTAMP})
</insert>
+
+<!-- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge" useGeneratedKeys="true">-->
+<!-- <!–@mbg.generated–>-->
+<!-- insert into se_recharge (cardId, clientId, money, -->
+<!-- amount, gift, afterRecharge, -->
+<!-- paymentId, price, remarks, -->
+<!-- `operator`, operateDt)-->
+<!-- values (#{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT}, -->
+<!-- #{amount,jdbcType=FLOAT}, #{gift,jdbcType=FLOAT}, #{afterrecharge,jdbcType=FLOAT}, -->
+<!-- #{paymentid,jdbcType=BIGINT}, #{price,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR}, -->
+<!-- #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP})-->
+<!-- </insert>-->
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge" useGeneratedKeys="true">
<!--@mbg.generated-->
@@ -54,6 +70,9 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="cardid != null">
cardId,
+ </if>
+ <if test="clientid != null">
+ clientId,
</if>
<if test="money != null">
money,
@@ -70,6 +89,9 @@
<if test="paymentid != null">
paymentId,
</if>
+ <if test="price != null">
+ price,
+ </if>
<if test="remarks != null">
remarks,
</if>
@@ -83,6 +105,9 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="cardid != null">
#{cardid,jdbcType=BIGINT},
+ </if>
+ <if test="clientid != null">
+ #{clientid,jdbcType=BIGINT},
</if>
<if test="money != null">
#{money,jdbcType=FLOAT},
@@ -99,6 +124,9 @@
<if test="paymentid != null">
#{paymentid,jdbcType=BIGINT},
</if>
+ <if test="price != null">
+ #{price,jdbcType=FLOAT},
+ </if>
<if test="remarks != null">
#{remarks,jdbcType=VARCHAR},
</if>
@@ -110,13 +138,15 @@
</if>
</trim>
</insert>
-
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
<!--@mbg.generated-->
update se_recharge
<set>
<if test="cardid != null">
cardId = #{cardid,jdbcType=BIGINT},
+ </if>
+ <if test="clientid != null">
+ clientId = #{clientid,jdbcType=BIGINT},
</if>
<if test="money != null">
money = #{money,jdbcType=FLOAT},
@@ -133,6 +163,9 @@
<if test="paymentid != null">
paymentId = #{paymentid,jdbcType=BIGINT},
</if>
+ <if test="price != null">
+ price = #{price,jdbcType=FLOAT},
+ </if>
<if test="remarks != null">
remarks = #{remarks,jdbcType=VARCHAR},
</if>
@@ -145,29 +178,36 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
-
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
<!--@mbg.generated-->
update se_recharge
set cardId = #{cardid,jdbcType=BIGINT},
+ clientId = #{clientid,jdbcType=BIGINT},
money = #{money,jdbcType=FLOAT},
amount = #{amount,jdbcType=FLOAT},
gift = #{gift,jdbcType=FLOAT},
afterRecharge = #{afterrecharge,jdbcType=FLOAT},
paymentId = #{paymentid,jdbcType=BIGINT},
+ price = #{price,jdbcType=FLOAT},
remarks = #{remarks,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=BIGINT},
operateDt = #{operatedt,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
+ <!--鏍规嵁姘村崱缂栧彿鍒犻櫎鍏呭�艰褰�-->
+ <delete id="deleteByCardId" parameterType="java.lang.Long">
+ DELETE FROM se_recharge WHERE cardId = ${cardId}
+ </delete>
+ <!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栧厖鍊艰褰�-->
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
select
- COUNT(*) AS recordCount
- FROM se_client_card card
- INNER JOIN se_recharge rec ON card.id = rec.cardId
- INNER JOIN ba_client cli ON card.clientId = cli.id
+ COUNT(*) AS recordCount
+ FROM se_recharge_history rec
+ INNER JOIN se_client_card card ON rec.cardId = card.id
+ INNER JOIN ba_client cli ON rec.clientId = cli.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
@@ -182,27 +222,28 @@
</if>
<if test = "rechargeTimeStart != null and rechargeTimeStop != null">
- AND card.rechargeDt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
+ AND rec.operateDt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
</if>
</where>
</select>
- <!--鏍规嵁鍒跺畾鐨勬潯浠惰幏鍙栧厖鍊艰褰�-->
- <select id="getRecharges" resultType="com.dy.pipIrrGlobal.pojoSe.VoRecharge">
+ <!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栧厖鍊艰褰�-->
+ <select id="getRecharges" resultType="com.dy.pipIrrGlobal.voSe.VoRecharge">
SELECT
- (@i:=@i+1) AS id,
- cli.`name` AS clientName,
- cli.id AS clientId,
- card.cardAddr,
- rec.amount,
- rec.afterRecharge,
- rec.paymentId,
- rec.price,
- (SELECT `name` FROM ba_user WHERE id = rec.operator) AS operator, rec.operateDt
- FROM se_client_card card
- INNER JOIN se_recharge rec ON card.id = rec.cardId
- INNER JOIN ba_client cli ON card.clientId = cli.id
- , (SELECT @i:=0) AS itable
+ (@i:=@i+1) AS id,
+ cli.name AS clientName,
+ rec.clientId,
+ card.cardAddr,
+ rec.amount,
+ rec.afterRecharge,
+ rec.paymentId,
+ rec.price,
+ (SELECT `name` FROM ba_user WHERE id = rec.operator) AS operator,
+ rec.operateDt
+ FROM se_recharge_history rec
+ INNER JOIN se_client_card card ON rec.cardId = card.id
+ INNER JOIN ba_client cli ON rec.clientId = cli.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
@@ -217,7 +258,7 @@
</if>
<if test = "rechargeTimeStart != null and rechargeTimeStop != null">
- AND card.rechargeDt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
+ AND rec.operateDt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
</if>
</where>
--
Gitblit v1.8.0