修复返回值问题

2024-01-08 16:47:50 +08:00
parent 1caa45c706
commit af89778792
1 changed files with 56 additions and 55 deletions
--- a/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/ChargeRecordMapper.xml
+++ b/accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/ChargeRecordMapper.xml
@@ -103,12 +103,12 @@
        </where>
    </sql>
    <sql id="Base_Column_List">
-    charge_record_id, uid, room_uid, pingxx_charge_id, charge_prod_id, channel, buss_type, 
-    charge_status, charge_status_desc, amount, country, local_currency_code, local_amount, total_gold,
-    client_ip, client_device_id, client_os, client_app_version,
-    wx_pub_openid, subject, body, extra, metadata, charge_desc,
-    agent_conf_id, agent_id, charge_app, consumption_request, refund, create_time, update_time
-  </sql>
+        charge_record_id, uid, room_uid, pingxx_charge_id, charge_prod_id, channel, payment_type, buss_type,
+        charge_status, charge_status_desc, amount, country, local_currency_code, local_amount, total_gold,
+        client_ip, client_device_id, client_os, client_app_version,
+        wx_pub_openid, subject, body, extra, metadata, charge_desc,
+        agent_conf_id, agent_id, charge_app, consumption_request, refund, create_time, update_time
+    </sql>
    <select id="selectByExample" resultMap="BaseResultMap"
            parameterType="com.accompany.payment.model.ChargeRecordExample">
        select
@@ -132,9 +132,9 @@
        where charge_record_id = #{chargeRecordId,jdbcType=VARCHAR}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from charge_record
-    where charge_record_id = #{chargeRecordId,jdbcType=VARCHAR}
-  </delete>
+        delete from charge_record
+        where charge_record_id = #{chargeRecordId,jdbcType=VARCHAR}
+    </delete>
    <delete id="deleteByExample" parameterType="com.accompany.payment.model.ChargeRecordExample">
        delete from charge_record
        <if test="_parameter != null">
@@ -142,22 +142,23 @@
        </if>
    </delete>
    <insert id="insert" parameterType="com.accompany.payment.model.ChargeRecord">
-    insert into charge_record (charge_record_id, uid, room_uid, 
-      pingxx_charge_id, charge_prod_id, channel, 
-      buss_type, charge_status, charge_status_desc, 
-      amount, total_gold, client_ip, client_device_id, client_os, client_app_version,
-      wx_pub_openid, subject, body,
-      extra, metadata, charge_desc, consumption_request, refund,
-      create_time, update_time)
-    values (#{chargeRecordId,jdbcType=VARCHAR}, #{uid,jdbcType=BIGINT}, #{roomUid,jdbcType=BIGINT}, 
-      #{pingxxChargeId,jdbcType=VARCHAR}, #{chargeProdId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, 
-      #{bussType,jdbcType=TINYINT}, #{chargeStatus,jdbcType=TINYINT}, #{chargeStatusDesc,jdbcType=VARCHAR}, 
-      #{amount,jdbcType=BIGINT}, #{totalGold,jdbcType=BIGINT},
-      #{clientIp,jdbcType=VARCHAR}, #{clientDeviceId,jdbcType=VARCHAR},#{clientOs,jdbcType=VARCHAR},#{clientAppVersion,jdbcType=VARCHAR},
-      #{wxPubOpenid,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, #{body,jdbcType=VARCHAR}, 
-      #{extra,jdbcType=VARCHAR}, #{metadata,jdbcType=VARCHAR}, #{chargeDesc,jdbcType=VARCHAR},
-      #{consumptionRequest,jdbcType=TINYINT},#{refund,jdbcType=TINYINT},
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+        insert into charge_record (charge_record_id, uid, room_uid,
+        pingxx_charge_id, charge_prod_id, channel,
+        buss_type, charge_status, charge_status_desc,
+        amount, total_gold, client_ip, client_device_id, client_os, client_app_version,
+        wx_pub_openid, subject, body,
+        extra, metadata, charge_desc, consumption_request, refund,
+        create_time, update_time)
+        values (#{chargeRecordId,jdbcType=VARCHAR}, #{uid,jdbcType=BIGINT}, #{roomUid,jdbcType=BIGINT},
+        #{pingxxChargeId,jdbcType=VARCHAR}, #{chargeProdId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR},
+        #{bussType,jdbcType=TINYINT}, #{chargeStatus,jdbcType=TINYINT}, #{chargeStatusDesc,jdbcType=VARCHAR},
+        #{amount,jdbcType=BIGINT}, #{totalGold,jdbcType=BIGINT},
+        #{clientIp,jdbcType=VARCHAR},
+        #{clientDeviceId,jdbcType=VARCHAR},#{clientOs,jdbcType=VARCHAR},#{clientAppVersion,jdbcType=VARCHAR},
+        #{wxPubOpenid,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, #{body,jdbcType=VARCHAR},
+        #{extra,jdbcType=VARCHAR}, #{metadata,jdbcType=VARCHAR}, #{chargeDesc,jdbcType=VARCHAR},
+        #{consumptionRequest,jdbcType=TINYINT},#{refund,jdbcType=TINYINT},
+        #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
    </insert>

    <insert id="insertSelective" parameterType="com.accompany.payment.model.ChargeRecord">
@@ -567,31 +568,31 @@
        where charge_record_id = #{chargeRecordId,jdbcType=VARCHAR}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.accompany.payment.model.ChargeRecord">
-    update charge_record
-    set uid = #{uid,jdbcType=BIGINT},
-      room_uid = #{roomUid,jdbcType=BIGINT},
-      pingxx_charge_id = #{pingxxChargeId,jdbcType=VARCHAR},
-      charge_prod_id = #{chargeProdId,jdbcType=VARCHAR},
-      channel = #{channel,jdbcType=VARCHAR},
-      buss_type = #{bussType,jdbcType=TINYINT},
-      charge_status = #{chargeStatus,jdbcType=TINYINT},
-      charge_status_desc = #{chargeStatusDesc,jdbcType=VARCHAR},
-      amount = #{amount,jdbcType=BIGINT},
-      total_gold = #{totalGold,jdbcType=BIGINT},
-      client_ip = #{clientIp,jdbcType=VARCHAR},
-      client_device_id = #{clientDeviceId,jdbcType=VARCHAR},
-      client_os = #{clientOs,jdbcType=VARCHAR},
-      client_app_version = #{clientAppVersion,jdbcType=VARCHAR},
-      wx_pub_openid = #{wxPubOpenid,jdbcType=VARCHAR},
-      subject = #{subject,jdbcType=VARCHAR},
-      body = #{body,jdbcType=VARCHAR},
-      extra = #{extra,jdbcType=VARCHAR},
-      metadata = #{metadata,jdbcType=VARCHAR},
-      charge_desc = #{chargeDesc,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where charge_record_id = #{chargeRecordId,jdbcType=VARCHAR}
-  </update>
+        update charge_record
+        set uid = #{uid,jdbcType=BIGINT},
+        room_uid = #{roomUid,jdbcType=BIGINT},
+        pingxx_charge_id = #{pingxxChargeId,jdbcType=VARCHAR},
+        charge_prod_id = #{chargeProdId,jdbcType=VARCHAR},
+        channel = #{channel,jdbcType=VARCHAR},
+        buss_type = #{bussType,jdbcType=TINYINT},
+        charge_status = #{chargeStatus,jdbcType=TINYINT},
+        charge_status_desc = #{chargeStatusDesc,jdbcType=VARCHAR},
+        amount = #{amount,jdbcType=BIGINT},
+        total_gold = #{totalGold,jdbcType=BIGINT},
+        client_ip = #{clientIp,jdbcType=VARCHAR},
+        client_device_id = #{clientDeviceId,jdbcType=VARCHAR},
+        client_os = #{clientOs,jdbcType=VARCHAR},
+        client_app_version = #{clientAppVersion,jdbcType=VARCHAR},
+        wx_pub_openid = #{wxPubOpenid,jdbcType=VARCHAR},
+        subject = #{subject,jdbcType=VARCHAR},
+        body = #{body,jdbcType=VARCHAR},
+        extra = #{extra,jdbcType=VARCHAR},
+        metadata = #{metadata,jdbcType=VARCHAR},
+        charge_desc = #{chargeDesc,jdbcType=VARCHAR},
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+        update_time = #{updateTime,jdbcType=TIMESTAMP}
+        where charge_record_id = #{chargeRecordId,jdbcType=VARCHAR}
+    </update>

    <select id="personalStatistic" resultMap="PersonalStatisticMap">
        select users.erban_no, users.nick, sum(charge_record.amount) / 100 as amountSum from charge_record inner join
@@ -615,7 +616,7 @@
    </select>

    <select id="getUserChargeAllAmount" resultType="java.lang.Integer">
-        select sum(amount)  from charge_record
+        select sum(amount) from charge_record
        where uid = #{uid}
        <if test="chargeRecordStatus != null and chargeRecordStatus != ''">
            and charge_status = #{chargeRecordStatus}
@@ -638,14 +639,14 @@
    <select id="getIapTotalAmount" resultType="java.lang.Long">
        select sum(amount) from charge_record
        where uid = #{uid}
-          and channel = 'ios_pay'
-          and charge_status in (2,6)
+        and channel = 'ios_pay'
+        and charge_status in (2,6)
    </select>

    <select id="getIapRefundAmount" resultType="java.lang.Long">
        select sum(amount) from charge_record
        where uid = #{uid}
-          and channel = 'ios_pay'
-          and consumption_request = 1
+        and channel = 'ios_pay'
+        and consumption_request = 1
    </select>
 </mapper>