Merge remote-tracking branch 'origin/dev' into dev

yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java

@@ -147,4 +147,7 @@ public interface OrderMapper extends BaseMapper<Order> {
     List<Order> findList( @Param("orderParam")BackendOrderParam orderParam);
 
     OrderCountVo orderCount(@Param("orderParam") BackendOrderParam orderParam);
+
+    String getRiderInfo(String orderNumber);
+
 }

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBOrderService.java

@@ -298,6 +298,10 @@ public class HBOrderService implements IHBOrderService {
             map.put("orderNumber", channelOrderId);
             map.put("logisticStatus", logisticStatus);
             map.put("dvyFlowId", body.getString("carrierNo"));
+
+            if (logisticStatus.equals(20)||logisticStatus.equals(30)){
+                map.put("deliveryInfo", orderMapper.getRiderInfo(order.getOrderNumber()));
+            }
             HttpUtil.post(SMConstants.SM_BASE_URL + "/api/v1/xsb/order/updateHbLogisticStatus", map);
         }
     }

yami-shop-service/src/main/resources/mapper/OrderMapper.xml

@@ -1358,4 +1358,8 @@
         group by a.order_number
         ) m
     </select>
+    <select id="getRiderInfo" resultType="java.lang.String">
+        SELECT CONCAT('骑手：',courier_name,'，电话：', SUBSTRING_INDEX(courier_phone, ',', 1)) info
+        FROM `tz_order_rider_location` WHERE order_number=#{orderNumber}
+    </select>
 </mapper>