yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单修改字段

Browse Source
This commit is contained in:
yuyang 2021-08-09 18:47:43 +08:00
parent 6df99469cd
commit 1f581be355
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java
View File

@ -25,7 +25,7 @@ public class XhpcHistoryOrder extends BaseEntity {
/**
* 充电订单id
*/
private Long chargingOrderId;
private Long chargeOrderId;
/**
* 用户id
@ -153,12 +153,14 @@ public class XhpcHistoryOrder extends BaseEntity {
this.chargingStationId = chargingStationId;
}
public Long getChargingOrderId() {
return chargingOrderId;
public Long getChargeOrderId() {
return chargeOrderId;
}
public void setChargingOrderId(Long chargingOrderId) {
this.chargingOrderId = chargingOrderId;
public void setChargeOrderId(Long chargeOrderId) {
this.chargeOrderId = chargeOrderId;
}
public Long getUserId() {

16
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -7,7 +7,7 @@
<resultMap type="com.xhpc.order.domain.XhpcHistoryOrder" id="XhpcHistoryOrderResult">
<result column="history_order_id" property="historyOrderId"/>
<result column="charging_station_id" property="chargingStationId"/>
<result column="charging_order_id" property="chargingOrderId"/>
<result column="charging_order_id" property="chargeOrderId"/>
<result column="user_id" property="userId"/>
<result column="terminal_id" property="terminalId"/>
<result column="serial_number" property="serialNumber"/>
@ -43,8 +43,8 @@
<if test="null != chargingStationId and '' != chargingStationId">
charging_station_id,
</if>
<if test="null != chargingOrderId and '' != chargingOrderId">
charging_order_id,
<if test="null != chargeOrderId and '' != chargeOrderId">
charge_order_id,
</if>
<if test="null != userId and '' != userId">
user_id,
@ -132,8 +132,8 @@
<if test="null != chargingStationId and '' != chargingStationId">
#{chargingStationId},
</if>
<if test="null != chargingOrderId and '' != chargingOrderId">
#{chargingOrderId},
<if test="null != chargeOrderId and '' != chargeOrderId">
#{chargeOrderId},
</if>
<if test="null != userId and '' != userId">
#{userId},
@ -225,7 +225,7 @@
<if test="null != chargingStationId and '' != chargingStationId">charging_station_id =
#{chargingStationId},
</if>
<if test="null != chargingOrderId and '' != chargingOrderId">charging_order_id = #{chargingOrderId},</if>
<if test="null != chargeOrderId and '' != chargeOrderId">charge_order_id = #{chargeOrderId},</if>
<if test="null != userId and '' != userId">user_id = #{userId},</if>
<if test="null != terminalId and '' != terminalId">terminal_id = #{terminalId},</if>
<if test="null != serialNumber and '' != serialNumber">serial_number = #{serialNumber},</if>
@ -309,7 +309,7 @@
FROM xhpc_history_order as ho
LEFT JOIN xhpc_charging_station as cs on cs.charging_station_id = ho.charging_station_id
LEFT JOIN xhpc_terminal as te on te.terminal_id = ho.terminal_id
left join xhpc_charge_order as co on co.charging_order_id =ho.charging_order_id
left join xhpc_charge_order as co on co.charge_order_id =ho.charge_order_id
where ho.status=0 and ho.del_flag=0 and ho.user_id =#{userId}
</select>
@ -332,7 +332,7 @@
FROM xhpc_history_order as ho
LEFT JOIN xhpc_charging_station as cs on cs.charging_station_id = ho.charging_station_id
LEFT JOIN xhpc_terminal as te on te.terminal_id = ho.terminal_id
left join xhpc_charge_order as co on co.charging_order_id =ho.charging_order_id
left join xhpc_charge_order as co on co.charge_order_id =ho.charge_order_id
where ho.status=0 and ho.del_flag=0 and ho.history_order_id =#{historyOrderId}
<if test="userId !=null">
and ho.user_id =#{userId}