autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 11:35:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 计算订单会员折扣逻辑

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-11 17:28:45 +08:00
parent e71ddfb2c8
commit ed47e1e1e0
4 changed files with 38 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -1425,45 +1425,8 @@
</if>
</trim>
</insert>
<resultMap id="OrderBasicInfoResult" type="com.jsowell.pile.domain.OrderBasicInfo">
<result column="id" property="id" />
<result column="order_code" property="orderCode" />
<result column="transaction_code" property="transactionCode" />
<result column="order_status" property="orderStatus" />
<result column="member_id" property="memberId" />
<result column="station_id" property="stationId" />
<result column="merchant_id" property="merchantId" />
<result column="pile_sn" property="pileSn" />
<result column="connector_code" property="connectorCode" />
<result column="pile_connector_code" property="pileConnectorCode" />
<result column="logic_card" property="logicCard" />
<result column="vin_code" property="vinCode" />
<result column="start_mode" property="startMode" />
<result column="pay_mode" property="payMode" />
<result column="pay_status" property="payStatus" />
<result column="pay_amount" property="payAmount" />
<result column="pay_time" property="payTime" />
<result column="plate_number" property="plateNumber" />
<result column="order_amount" property="orderAmount" />
<result column="virtual_amount" property="virtualAmount" />
<result column="settle_amount" property="settleAmount" />
<result column="charge_start_time" property="chargeStartTime" />
<result column="charge_end_time" property="chargeEndTime" />
<result column="start_type" property="startType" />
<result column="appointment_time" property="appointmentTime" />
<result column="start_soc" property="startSoc" />
<result column="end_soc" property="endSoc" />
<result column="reason" property="reason" />
<result column="settlement_time" property="settlementTime" />
<result column="refund_amount" property="refundAmount" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="del_flag" property="delFlag" />
</resultMap>
<resultMap extends="OrderBasicInfoResult" id="OrderBasicInfoOrderDetailResult" type="com.jsowell.pile.domain.OrderBasicInfo">
<resultMap extends="BaseResultMap" id="OrderBasicInfoOrderDetailResult" type="com.jsowell.pile.domain.OrderBasicInfo">
<collection javaType="java.util.List" notNullColumn="sub_id" property="orderDetailList" resultMap="OrderDetailResult" />
</resultMap>
@@ -2014,6 +1977,9 @@
<if test="virtualAmount != null">
virtual_amount = #{virtualAmount},
</if>
<if test="discountAmount != null">
discount_amount = #{discountAmount},
</if>
<if test="settleAmount != null">
settle_amount = #{settleAmount},
</if>
@@ -2128,9 +2094,15 @@
<if test="totalElectricityAmount != null">
total_electricity_amount = #{totalElectricityAmount},
</if>
<if test="discountElectricityAmount != null">
discount_electricity_amount = #{discountElectricityAmount},
</if>
<if test="totalServiceAmount != null">
total_service_amount = #{totalServiceAmount},
</if>
<if test="discountServiceAmount != null">
discount_service_amount = #{discountServiceAmount},
</if>
<if test="sharpPrice != null">
sharp_price = #{sharpPrice},
</if>
@@ -2205,7 +2177,7 @@
</update>
<select id="getOrderInfoByOrderCode" resultMap="OrderBasicInfoResult">
<select id="getOrderInfoByOrderCode" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_basic_info
@@ -2215,7 +2187,7 @@
and del_flag = '0'
</select>
<select id="getOrderInfoByTransactionCode" resultMap="OrderBasicInfoResult">
<select id="getOrderInfoByTransactionCode" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_basic_info
@@ -2223,7 +2195,7 @@
and transaction_code = #{transactionCode,jdbcType=VARCHAR}
</select>
<select id="queryOrderBasicInfo" resultMap="OrderBasicInfoResult">
<select id="queryOrderBasicInfo" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_basic_info
@@ -2316,7 +2288,7 @@
group by DATE_FORMAT(t1.create_time, '%Y-%m-%d')
</select>
<select id="getUnpaidOrderListOver15Min" resultMap="OrderBasicInfoResult">
<select id="getUnpaidOrderListOver15Min" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_basic_info
@@ -2326,7 +2298,7 @@
and create_time <![CDATA[ <= ]]> #{createTime,jdbcType=VARCHAR}
</select>
<select id="selectOrderListByTimeRangeAndStatus" resultMap="OrderBasicInfoResult">
<select id="selectOrderListByTimeRangeAndStatus" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_basic_info
@@ -2376,7 +2348,7 @@
and t1.order_code = #{orderCode,jdbcType=VARCHAR}
</select>
<select id="getOrderBasicInfo" resultMap="OrderBasicInfoResult">
<select id="getOrderBasicInfo" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_basic_info
@@ -2415,7 +2387,7 @@
AND t1.del_flag = '0'
</select>
<select id="getAppointmentOrder" resultMap="OrderBasicInfoResult">
<select id="getAppointmentOrder" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_basic_info
@@ -2511,7 +2483,7 @@
#{item,jdbcType=VARCHAR}
</foreach>
</select>
<select id="tempQueryWeChatRefundOrders" resultMap="OrderBasicInfoResult">
<select id="tempQueryWeChatRefundOrders" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_basic_info
@@ -2559,7 +2531,7 @@
</foreach>
</select>
<select id="queryOrderList" resultMap="OrderBasicInfoResult">
<select id="queryOrderList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_basic_info