零星支付加个其他类型

mec-biz/src/main/resources/config/mybatis/SysPaymentConfigMapper.xml

@@ -4,26 +4,25 @@
     <resultMap id="SysPaymentConfig" type="com.ym.mec.biz.dal.entity.SysPaymentConfig">
         <!--@Table sys_payment_config-->
         <id column="id_" jdbcType="INTEGER" property="id"/>
-        <result column="organ_id_" jdbcType="INTEGER" property="organId"/>
-        <result column="pay_type_" jdbcType="VARCHAR" property="payType"/>
-        <result column="yq_mer_no_" jdbcType="VARCHAR" property="yqMerNo"/>
-        <result column="hf_mer_no_" jdbcType="VARCHAR" property="hfMerNo"/>
-        <result column="type_" jdbcType="INTEGER" property="type"/>
-        <result column="route_scale_" jdbcType="VARCHAR" property="routeScale"/>
-        <result column="organ_name" jdbcType="VARCHAR" property="organName"/>
-        <result column="per_scale_" jdbcType="INTEGER" property="perScale"/>
-        <result column="com_scale_" jdbcType="INTEGER" property="comScale"/>
-        <result column="course_fee_" jdbcType="VARCHAR" property="courseFee"/>
-        <result column="instrument_fee_" jdbcType="VARCHAR" property="instrumentFee"/>
-        <result column="accessories_fee_" jdbcType="VARCHAR" property="accessoriesFee"/>
-        <result column="other_fee_" jdbcType="VARCHAR" property="otherFee"/>
-        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="pay_type_" property="payType"/>
+        <result column="yq_mer_no_" property="yqMerNo"/>
+        <result column="hf_mer_no_" property="hfMerNo"/>
+        <result column="type_" property="type"/>
+        <result column="route_scale_" property="routeScale"/>
+        <result column="organ_name" property="organName"/>
+        <result column="per_scale_" property="perScale"/>
+        <result column="com_scale_" property="comScale"/>
+        <result column="course_fee_" property="courseFee"/>
+        <result column="instrument_fee_" property="instrumentFee"/>
+        <result column="accessories_fee_" property="accessoriesFee"/>
+        <result column="other_fee_" property="otherFee"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_, organ_id_,type_, per_scale_, com_scale_, course_fee_, instrument_fee_, accessories_fee_,
-        other_fee_, create_time_, update_time_
+        id_, organ_id_,pay_type_,yq_mer_no_,hf_mer_no_,type_,route_scale_,create_time_, update_time_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SysPaymentConfig">
         <!--@mbg.generated-->
@@ -42,29 +41,23 @@
         <!--@mbg.generated-->
         insert into sys_payment_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="type != null">
-                type_,
-            </if>
             <if test="organId != null">
                 organ_id_,
             </if>
-            <if test="perScale != null">
-                per_scale_,
+            <if test="payType != null">
+                pay_type_,
             </if>
-            <if test="comScale != null">
-                com_scale_,
+            <if test="yqMerNo != null">
+                yq_mer_no_,
             </if>
-            <if test="courseFee != null">
-                course_fee_,
+            <if test="hfMerNo != null">
+                hf_mer_no_,
             </if>
-            <if test="instrumentFee != null">
-                instrument_fee_,
+            <if test="routeScale != null">
+                route_scale_,
             </if>
-            <if test="accessoriesFee != null">
-                accessories_fee_,
-            </if>
-            <if test="otherFee != null">
-                other_fee_,
+            <if test="type != null">
+                type_,
             </if>
             <if test="createTime != null">
                 create_time_,
@@ -74,35 +67,29 @@
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="type != null">
-                #{type,jdbcType=INTEGER},
-            </if>
             <if test="organId != null">
-                #{organId,jdbcType=INTEGER},
-            </if>
-            <if test="perScale != null">
-                #{perScale,jdbcType=INTEGER},
+                #{organId},
             </if>
-            <if test="comScale != null">
-                #{comScale,jdbcType=INTEGER},
+            <if test="payType != null">
+                #{payType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-            <if test="courseFee != null">
-                #{courseFee,jdbcType=VARCHAR},
+            <if test="yqMerNo != null">
+                #{yqMerNo},
             </if>
-            <if test="instrumentFee != null">
-                #{instrumentFee,jdbcType=VARCHAR},
+            <if test="hfMerNo != null">
+                #{hfMerNo},
             </if>
-            <if test="accessoriesFee != null">
-                #{accessoriesFee,jdbcType=VARCHAR},
+            <if test="routeScale != null">
+                #{routeScale},
             </if>
-            <if test="otherFee != null">
-                #{otherFee,jdbcType=VARCHAR},
+            <if test="type != null">
+                #{type},
             </if>
             <if test="createTime != null">
-                #{createTime,jdbcType=TIMESTAMP},
+                #{createTime},
             </if>
             <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
+                #{updateTime},
             </if>
         </trim>
     </insert>
@@ -110,36 +97,25 @@
         <!--@mbg.generated-->
         update sys_payment_config
         <set>
-            <if test="type != null">
-                type_ = #{type,jdbcType=INTEGER},
-            </if>
             <if test="organId != null">
-                organ_id_ = #{organId,jdbcType=INTEGER},
-            </if>
-            <if test="perScale != null">
-                per_scale_ = #{perScale,jdbcType=INTEGER},
-            </if>
-            <if test="comScale != null">
-                com_scale_ = #{comScale,jdbcType=INTEGER},
+                organ_id_ = #{organId},
             </if>
-            <if test="courseFee != null">
-                course_fee_ = #{courseFee,jdbcType=VARCHAR},
+            <if test="payType != null">
+                pay_type_ = #{payType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-            <if test="instrumentFee != null">
-                instrument_fee_ = #{instrumentFee,jdbcType=VARCHAR},
+            <if test="yqMerNo != null">
+                yq_mer_no_ = #{yqMerNo},
             </if>
-            <if test="accessoriesFee != null">
-                accessories_fee_ = #{accessoriesFee,jdbcType=VARCHAR},
+            <if test="hfMerNo != null">
+                hf_mer_no_ = #{hfMerNo},
             </if>
-            <if test="otherFee != null">
-                other_fee_ = #{otherFee,jdbcType=VARCHAR},
+            <if test="routeScale != null">
+                route_scale_ = #{routeScale},
             </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime,jdbcType=TIMESTAMP},
+            <if test="type != null">
+                type_ = #{type},
             </if>
+            update_time_ = now()
         </set>
         where id_ = #{id,jdbcType=INTEGER}
     </update>
@@ -180,6 +156,9 @@
 
     <!-- 根据支付类型获取支付配置 -->
     <select id="getPaymentConfigs" resultMap="SysPaymentConfig">
-        SELECT * FROM sys_payment_config WHERE pay_type_ = #{payType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        SELECT spc.*, o.name_ organ_name
+        FROM sys_payment_config spc
+                 LEFT JOIN organization o on spc.organ_id_ = o.id_
+        WHERE pay_type_ = #{payType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
 </mapper>