yonge 5 years ago
parent
commit
c5def60505

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/StudentWithdrawMapper.xml

@@ -20,7 +20,7 @@
         <result column="withdraw_no_" property="withdrawNo"/>
         <result column="create_time_" property="createTime"/>
         <result column="modify_time_" property="modifyTime"/>
-        <result column="channel_" property="detail.channel"/>
+        <result column="trans_type_" property="detail.transType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="platform_account_no_" property="detail.platformAccountNo"/>
         <result column="balance_" property="detail.balance"/>
         <result column="real_name_" property="user.realName"/>
@@ -93,7 +93,7 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="StudentWithdraw" parameterType="map">
-        SELECT sw.*,cad.platform_account_no_,cad.channel_,su.real_name_,cad.balance_
+        SELECT sw.*,cad.platform_account_no_,cad.trans_type_,su.real_name_,cad.balance_
         FROM student_withdraw sw
         LEFT JOIN sys_user_cash_account_detail cad ON sw.id_ = cad.attribute1_
         LEFT JOIN sys_user su ON su.id_ = sw.user_id_

+ 12 - 4
mec-biz/src/main/resources/config/mybatis/SysUserCashAccountDetailMapper.xml

@@ -20,6 +20,8 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="attribute_" property="attribute"/>
+        <result column="channel_" property="channel"/>
+        <result column="platform_account_no_" property="platformAccountNo"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -41,17 +43,17 @@
         </selectKey>
         -->
         INSERT INTO sys_user_cash_account_detail
-        (user_id_,trans_no_,type_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_)
-        VALUES(#{userId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},#{comment},now(),now(),#{attribute})
+        (user_id_,trans_no_,type_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_,channel_,platform_account_no_)
+        VALUES(#{userId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},#{comment},now(),now(),#{attribute},#{channel},#{platformAccountNo})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountDetail" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account_detail
-        (user_id_,trans_no_,type_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_)
+        (user_id_,trans_no_,type_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_,channel_,platform_account_no_)
         VALUE
         <foreach collection="sysUserCashAccountDetails" item="sysUserCashAccountDetail" separator=",">
-            (#{sysUserCashAccountDetail.userId},#{sysUserCashAccountDetail.transNo},#{sysUserCashAccountDetail.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.amount},#{sysUserCashAccountDetail.balance},#{sysUserCashAccountDetail.description},#{sysUserCashAccountDetail.comment},now(),now(),#{sysUserCashAccountDetail.attribute})
+            (#{sysUserCashAccountDetail.userId},#{sysUserCashAccountDetail.transNo},#{sysUserCashAccountDetail.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.amount},#{sysUserCashAccountDetail.balance},#{sysUserCashAccountDetail.description},#{sysUserCashAccountDetail.comment},now(),now(),#{sysUserCashAccountDetail.attribute},#{sysUserCashAccountDetail.channel},#{sysUserCashAccountDetail.platformAccountNo})
         </foreach>
     </insert>
 
@@ -92,6 +94,12 @@
             <if test="attribu != null">
                 attribu1_ = #{attribu},
             </if>
+            <if test="channel != null">
+                channel_ = #{channel},
+            </if>
+            <if test="platformAccountNo != null">
+                platform_account_no_ = #{platformAccountNo},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>