oyingServer.git

parent: 8841ef18 | patch | commit | ignore whitespace

xin

2025-07-19 7ece553fd95f30dcfafa66f667ef9d0c064a22e6

Merge branch 'pxb' into xin

2 files modified

	oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java	1 ●●●●● patch \| view \| raw \| blame \| history
	oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history

 oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java

@@ -288,6 +288,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R riderCompleteOrder(String orderNum) {
        // 当前订单信息
        OrderResponse orderResponse = orderService.getByOrderNum(orderNum);

 oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml

@@ -112,7 +112,7 @@
        order by create_time desc
    </select>

    <select id="selectRiderInfo" resultMap="BaseResultMap">
    <select id="selectRiderInfo" resultType="com.oying.modules.rider.domain.RiderOrderRecord">
        select record_id recordId ,accept_time as acceptTime, order_time as orderTime
        from qs_rider_order_record where order_num = #{orderNum}
    </select>

			@@ -288,6 +288,7 @@
			}

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R riderCompleteOrder(String orderNum) {
			// 当前订单信息
			OrderResponse orderResponse = orderService.getByOrderNum(orderNum);

			@@ -112,7 +112,7 @@
			order by create_time desc
			</select>

			<select id="selectRiderInfo" resultMap="BaseResultMap">
			<select id="selectRiderInfo" resultType="com.oying.modules.rider.domain.RiderOrderRecord">
			select record_id recordId ,accept_time as acceptTime, order_time as orderTime
			from qs_rider_order_record where order_num = #{orderNum}
			</select>