Sfoglia il codice sorgente

Merge branch 'release_toaliyun_real_20230605' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230605

release_toaliyun_real
xhxu 2 anni fa
parent
commit
fafead9f03
1 ha cambiato i file con 14 aggiunte e 4 eliminazioni
  1. +14
    -4
      mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml

+ 14
- 4
mallinkService/src/main/resources/mapper/WxCardDailyLogMapper.xml Vedi File

@@ -14,11 +14,15 @@
<result column="operator_id" jdbcType="BIGINT" property="operatorId"/> <result column="operator_id" jdbcType="BIGINT" property="operatorId"/>
<result column="operator_user" jdbcType="VARCHAR" property="operatorUser"/> <result column="operator_user" jdbcType="VARCHAR" property="operatorUser"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/> <result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="coupon_id" jdbcType="BIGINT" property="couponId"/>
<result column="card_info_id" jdbcType="BIGINT" property="cardInfoId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="count" jdbcType="INTEGER" property="count"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`card_password_id`,`ip`,`create_date`,`update_date`, `id`,`tenant_id`,`parent_tenant_id`,`card_password_id`,`ip`,`create_date`,`update_date`,
`price`,`operator_type`,`operator_id`,`operator_user`, `remark`
`price`,`operator_type`,`operator_id`,`operator_user`, `remark`,`coupon_id`,`card_info_id`,`type`,`count`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -35,8 +39,14 @@
<if test=" null != cardPasswordId "> <if test=" null != cardPasswordId ">
and `card_password_id` = #{cardPasswordId} and `card_password_id` = #{cardPasswordId}
</if> </if>
<if test=" null != operatorType ">
and `operator_type` = #{operatorType}
<if test=" null != couponId ">
and `coupon_id` = #{couponId}
</if>
<if test=" null != cardInfoId ">
and `card_info_id` = #{cardInfoId}
</if>
<if test=" null != type ">
and `type` = #{type}
</if> </if>
<if test=" null != operatorId "> <if test=" null != operatorId ">
and `operator_id` = #{operatorId} and `operator_id` = #{operatorId}
@@ -56,7 +66,7 @@
<select id="findList" parameterType="com.iformall.domain.po.WxCardDailyLog" resultMap="BaseResultMap"> <select id="findList" parameterType="com.iformall.domain.po.WxCardDailyLog" resultMap="BaseResultMap">
select select
<include refid="allColumns"/> <include refid="allColumns"/>
from wx_card_set_price
from wx_card_daily_log
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
</select> </select>




Caricamento…
Annulla
Salva