From d5d0f26bd64057adb74170480655ca376c25d0eb Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期日, 02 四月 2023 22:07:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-prod-优惠券退款
---
phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java | 3 ++-
phi_platform_common/src/main/resources/mapper/platform/CardEquityMapper.xml | 26 +++++++++++++++-----------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java b/phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java
index aea0413..a29ec3a 100644
--- a/phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java
+++ b/phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java
@@ -3,6 +3,7 @@
import com.hx.auto.GeneratorUtil;
import com.hx.auto.common.UrlData;
+import com.hx.phiappt.model.cardItem.CardEquity;
import com.hx.phiappt.model.project.ProjectShopPrice;
import com.hx.phiappt.model.user.UserCardUsed;
import com.hx.phiappt.model.user.UserProjectDirectRecord;
@@ -36,7 +37,7 @@
urlData.serviceImplUrlData(controllerPackRoot,packageName + ".service.impl");
urlData.mapperUrlData(commonPackRootResourse, "mapper.platform");
- Class<?> clas = UserCardUsed.class;
+ Class<?> clas = CardEquity.class;
//dao
GeneratorUtil.generatorDao(clas,urlData);
//mapper
diff --git a/phi_platform_common/src/main/resources/mapper/platform/CardEquityMapper.xml b/phi_platform_common/src/main/resources/mapper/platform/CardEquityMapper.xml
index 485c5ac..67be1a3 100644
--- a/phi_platform_common/src/main/resources/mapper/platform/CardEquityMapper.xml
+++ b/phi_platform_common/src/main/resources/mapper/platform/CardEquityMapper.xml
@@ -8,7 +8,7 @@
<!-- 鏁翠釜瀹炰綋绫讳慨鏀癸紝琛ㄥ瓧娈�=瀹炰綋绫诲瓧娈�-->
<sql id="Update_Column_All">
<trim prefixOverrides=",">
- ,equityType = #{equityType},groupName = #{groupName},value = #{value},cardItemId = #{cardItemId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
+ ,equityType = #{equityType},groupName = #{groupName},value = #{value},shareMoney = #{shareMoney},indexValue = #{indexValue},cardItemId = #{cardItemId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
</trim>
</sql>
@@ -19,8 +19,12 @@
<selectKey keyProperty="id" resultType="String" order="BEFORE">
select replace(uuid(),'-','') from dual
</selectKey>
- insert into card_Equity (id,equityType,groupName,value,cardItemId,isDel,createTime,editTime) values (#{id},#{equityType},#{groupName},#{value},#{cardItemId},#{isDel},#{createTime},#{editTime})
+ insert into card_equity (id,equityType,groupName,value,shareMoney,indexValue,cardItemId,isDel,createTime,editTime) values (#{id},#{equityType},#{groupName},#{value},#{shareMoney},#{indexValue},#{cardItemId},#{isDel},#{createTime},#{editTime})
</insert>
+
+ <insert id="insertById" parameterType="com.hx.phiappt.model.cardItem.CardEquity">
+ insert into card_equity (id,equityType,groupName,value,shareMoney,indexValue,cardItemId,isDel,createTime,editTime) values (#{id},#{equityType},#{groupName},#{value},#{shareMoney},#{indexValue},#{cardItemId},#{isDel},#{createTime},#{editTime})
+ </insert>
<select id="selectList" resultType="com.hx.phiappt.model.cardItem.CardEquity" parameterType="com.hx.mybatisTool.SqlSentence" >
${sqlSentence}
@@ -41,7 +45,7 @@
<select id="selectCount" resultType="int" parameterType="com.hx.mybatisTool.SqlSentence" >
select
COUNT(*)
- from card_Equity
+ from card_equity
WHERE ${sqlSentence}
</select>
@@ -51,36 +55,36 @@
<select id="selectOneByKey" resultType="com.hx.phiappt.model.cardItem.CardEquity" parameterType="java.lang.Object" >
select
- id,equityType,groupName,value,cardItemId,isDel,createTime,editTime
- from card_Equity
+ id,equityType,groupName,value,shareMoney,indexValue,cardItemId,isDel,createTime,editTime
+ from card_equity
WHERE id = #{value}
</select>
<select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.cardItem.CardEquity" parameterType="java.lang.Object" >
select
- id,equityType,groupName,value,cardItemId,isDel,createTime,editTime
- from card_Equity
+ id,equityType,groupName,value,shareMoney,indexValue,cardItemId,isDel,createTime,editTime
+ from card_equity
WHERE id = #{value}
</select>
<update id="updateWhere" parameterType="com.hx.mybatisTool.SqlSentence">
update
- card_Equity
+ card_equity
SET ${sqlSentence}
</update>
<update id="updateAll" parameterType="com.hx.phiappt.model.cardItem.CardEquity">
- update card_Equity
+ update card_equity
SET <include refid="Update_Column_All"/>
WHERE id = #{id}
</update>
<delete id="deleteWhere" parameterType="com.hx.mybatisTool.SqlSentence">
- delete from card_Equity WHERE ${sqlSentence}
+ delete from card_equity WHERE ${sqlSentence}
</delete>
<delete id="deleteById" parameterType="java.lang.Object">
- delete from card_Equity WHERE id = #{value}
+ delete from card_equity WHERE id = #{value}
</delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0