代码整理

supply-chain-order-service/src/main/java/com/hywa/orderservice/dao/RiderMapper.java

@@ -48,7 +48,7 @@ public interface RiderMapper {
 
     String selectStatus(@Param("riderId") String riderId);
 
-    Rider selectByOrderId(@Param("riderId") String riderId);
+    Rider selectByOrderId(@Param("orderId") String orderId);
 
     List<RiderForm> selectFreeRiders();
 

supply-chain-order-service/src/main/resources/mappers/RiderMapper.xml

@@ -246,7 +246,7 @@
   <select id="selectByOrderId" resultType="com.hywa.orderclient.entity.Rider">
     select r.name,r.phone from t_bp_order_info oi, t_bp_transfer_order t, t_bp_rider_info r
     where oi.id = t.order_info_id and t.rider_id = r.id
-    and t.order_info_id =#{riderId};
+    and t.order_info_id =#{orderId} order by oi.create_time desc limit 1;
   </select>
   <select id="selectFreeRiders" resultType="com.hywa.orderclient.forms.RiderForm">
     select a.id,a.name from (

supply-chain-order-service/src/main/resources/mappers/TransferOrderMapper.xml

@@ -782,7 +782,7 @@
 
   <select id="selectOrdersNumberBetweenHours" resultType="com.hywa.orderclient.forms.OrderNumberStatisticForm">
     select a.id time,ifnull(l.cnt,0) orders
-    from (SELECT (help_category_id-1) id FROM mysql.help_category ORDER BY help_category_id LIMIT 24) a
+    from (SELECT (CAST( help_category_id AS SIGNED ) - 1) id FROM mysql.help_category ORDER BY help_category_id LIMIT 24) a
     left join (select hour(o.pay_time) payTime,count(distinct o.id) cnt
       from t_bp_order_info o where o.status != '0' and o.status != '4' and o.status is not null
       and o.pay_time between str_to_date(#{beginTime},"%Y-%m-%d %H:%i:%s") and str_to_date(#{endTime},"%Y-%m-%d %H:%i:%s")