sczx_group/sczx_web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

租电订单查看

Browse Source
This commit is contained in:
majian314
2025-09-29 12:54:03 +08:00
parent 90cb1c67eb
commit a80ff87c9f
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java
View File

@ -69,7 +69,7 @@ public class ZcOrderSub extends BaseEntity
@Excel(name = "平台支付流水号") @Excel(name = "平台支付流水号")
private String transactionId; private String transactionId;
private Long bOrderId; private String bOrderId;
public void setSuborderId(Long suborderId) public void setSuborderId(Long suborderId)
{ {
@ -195,11 +195,11 @@ public class ZcOrderSub extends BaseEntity
this.transactionId = transactionId; this.transactionId = transactionId;
} }
public Long getbOrderId() { public String getbOrderId() {
return bOrderId; return bOrderId;
} }
public void setbOrderId(Long bOrderId) { public void setbOrderId(String bOrderId) {
this.bOrderId = bOrderId; this.bOrderId = bOrderId;
} }

6
ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml
View File

@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="bOrderId" column="b_order_id" />
</resultMap> </resultMap>
<sql id="selectZcOrderSubVo"> <sql id="selectZcOrderSubVo">
select suborder_id, order_id, suborder_no, suborder_type, amount, payment_method, vin_battery_no, created_at, payment_id, paid_at, pay_status, transaction_id, remark, del_flag, create_time, update_time from zc_order_sub select suborder_id, order_id, suborder_no, suborder_type, amount, payment_method, vin_battery_no, created_at, payment_id, paid_at, pay_status, transaction_id, b_order_id, remark, del_flag, create_time, update_time from zc_order_sub
</sql> </sql>
<select id="selectZcOrderSubList" parameterType="ZcOrderSub" resultMap="ZcOrderSubResult"> <select id="selectZcOrderSubList" parameterType="ZcOrderSub" resultMap="ZcOrderSubResult">
@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="paidAt != null "> and paid_at = #{paidAt}</if> <if test="paidAt != null "> and paid_at = #{paidAt}</if>
<if test="payStatus != null and payStatus != '' "> and pay_status = #{payStatus}</if> <if test="payStatus != null and payStatus != '' "> and pay_status = #{payStatus}</if>
<if test="transactionId != null and transactionId != '' "> and transaction_id = #{transactionId}</if> <if test="transactionId != null and transactionId != '' "> and transaction_id = #{transactionId}</if>
<if test="bOrderId != null and bOrderId != '' "> and b_order_id like concat('%', #{bOrderId}, '%')</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>
@ -127,4 +129,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>

24
ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html
View File

@ -20,13 +20,13 @@
<label>订单编号：</label> <label>订单编号：</label>
<input type="text" name="suborderNo"/> <input type="text" name="suborderNo"/>
</li> </li>
<li> <!-- <li>-->
<label>订单类型：</label> <!-- <label>订单类型：</label>-->
<select name="suborderType" th:with="type=${@dict.getType('key_order_suborder_type')}"> <!-- <select name="suborderType" th:with="type=${@dict.getType('key_order_suborder_type')}">-->
<option value="">所有</option> <!-- <option value="">所有</option>-->
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
</select> <!-- </select>-->
</li> <!-- </li>-->
<li> <li>
<label>支付方式：</label> <label>支付方式：</label>
<select name="paymentMethod" th:with="type=${@dict.getType('key_order_payment_method')}"> <select name="paymentMethod" th:with="type=${@dict.getType('key_order_payment_method')}">
@ -43,8 +43,8 @@
</li> </li>
<li> <li>
<label>车架/电池编号：</label> <label>租电平台订单号：</label>
<input type="text" name="vinBatteryNo"/> <input type="text" name="bOrderId"/>
</li> </li>
<li class="select-time"> <li class="select-time">
<label>创建时间： </label> <label>创建时间： </label>
@ -124,8 +124,8 @@
} }
}, },
{ {
field: 'vinBatteryNo', field: 'bOrderId',
title: '车架/电池编号' title: '租电平台订单号'
}, },
{ {
field: 'createdAt', field: 'createdAt',
@ -167,4 +167,4 @@
}); });
</script> </script>
</body> </body>
</html> </html>