qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.调整

Browse Source
This commit is contained in:
邱贞招 2024-09-28 11:24:01 +08:00
parent 9ff822a270
commit 3a7c23aa15
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
electripper-system/src/main/java/com/ruoyi/system/domain/EtOrder.java
View File

@ -339,7 +339,6 @@ public class EtOrder extends BaseEntity
/** 成本 */
@Excel(name = "成本")
@TableField(exist = false)
private BigDecimal cost;
/** 可退预约费 */

1
electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java
View File

@ -318,6 +318,7 @@ public class CallbackServiceImpl implements CallbackService {
BigDecimal bigDecimal = costRate.divide(new BigDecimal(100), 6, BigDecimal.ROUND_HALF_UP);
BigDecimal cost = bigDecimal.multiply(payFee).setScale(2, BigDecimal.ROUND_HALF_UP);
logger.info("【保存资金流水记录--订单支付】 成本==============bigDecimal=====================："+bigDecimal);
logger.info("【保存资金流水记录--订单支付】 成本==============cost=====================："+cost);
return cost;
}

22
electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
View File

@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="platformServiceFee" column="platform_service_fee" />
<result property="operatorDividend" column="operator_dividend" />
<result property="payChannel" column="pay_channel" />
<result property="cost" column="cost" />
</resultMap>
<sql id="selectEtOrderVo">
@ -70,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_time, appointment_start_time, appointment_end_time,appointment_timeout, unlock_time,return_time,
rule_end_time, return_type, AsText(trip_route) trip_route,trip_route_str,cycle,deposit_deduction,video_url,
upload_time,deduction_amount,audio_files,used_sn,change_reason,locking,auto_refund_deposit,free_ride_time,
rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, pay_channel,
rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, pay_channel,cost,
operator_dividend from et_order
</sql>
@ -81,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_time, appointment_start_time, appointment_end_time,appointment_timeout, unlock_time,return_time,
rule_end_time, return_type, cycle,deposit_deduction,video_url,upload_time,deduction_amount,audio_files,
used_sn,change_reason,locking,auto_refund_deposit,free_ride_time,
rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, pay_channel,
rental_unit,riding_rule,riding_rule_json,charging_cycle,charging_cycle_value,capped_amount,handling_charge, platform_service_fee, pay_channel,cost,
operator_dividend from et_order
</sql>
@ -107,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.paid,
o.pay_type,
o.deposit_deduction,
o.riding_rule_json,
o.type,
COALESCE(o.total_fee, 0) AS total_fee,
COALESCE(o.pay_fee, 0) AS pay_fee,
@ -138,7 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.handling_charge,
o.platform_service_fee,
o.operator_dividend,
o.pay_channel
o.pay_channel,
o.cost
FROM
et_order o
LEFT JOIN
@ -238,7 +241,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.handling_charge,
o.platform_service_fee,
o.operator_dividend,
o.pay_channel
o.pay_channel,
o.cost
FROM
et_order o
LEFT JOIN
@ -337,7 +341,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.handling_charge,
o.platform_service_fee,
o.operator_dividend,
o.pay_channel
o.pay_channel,
o.cost
FROM
et_order o
LEFT JOIN
@ -407,7 +412,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.capped_amount,
o.handling_charge,
o.platform_service_fee,
o.operator_dividend
o.operator_dividend,
o.cost
from et_order o
LEFT JOIN et_user u ON u.user_id = o.user_id
LEFT JOIN et_operating_area oa ON o.area_id = oa.area_id
@ -959,6 +965,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="chargingCycleValue != null">charging_cycle_value,</if>
<if test="cappedAmount != null">capped_amount,</if>
<if test="payChannel != null and payChannel != ''">pay_channel,</if>
<if test="cost != null">cost,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
@ -1004,6 +1011,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="chargingCycleValue != null">#{chargingCycleValue},</if>
<if test="cappedAmount != null">#{cappedAmount},</if>
<if test="payChannel != null and payChannel != ''">#{payChannel},</if>
<if test="cost != null">#{cost},</if>
</trim>
</insert>
@ -1062,6 +1070,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="platformServiceFee != null">platform_service_fee = #{platformServiceFee},</if>
<if test="operatorDividend != null">operator_dividend = #{operatorDividend},</if>
<if test="payChannel != null">pay_channel = #{payChannel},</if>
<if test="cost != null">cost = #{cost},</if>
</trim>
where order_id = #{orderId}
</update>
@ -1121,6 +1130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="platformServiceFee != null">platform_service_fee = #{platformServiceFee},</if>
<if test="operatorDividend != null">operator_dividend = #{operatorDividend},</if>
<if test="payChannel != null">pay_channel = #{payChannel},</if>
<if test="cost != null">cost = #{cost},</if>
</trim>
where order_no = #{orderNo}
</update>