补充字段

src/main/java/org/springblade/modules/api/vo/PageMemberVO.java

@@ -69,6 +69,11 @@ public class PageMemberVO implements Serializable {
      */
     @ApiModelProperty(value = "用户id")
     private Long userId;
+    /**
+     * 用户名称
+     */
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
     /**
      * 货道id
      */

src/main/java/org/springblade/modules/finance/service/impl/OrderGoodsServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -113,6 +114,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
 		orderGoods.setGoodsName(goods.getGoodsName());
 		orderGoods.setCargoWayId(request.getCargoWayId());
 		orderGoods.setCargoWayNo(request.getCargoWayNo());
+		orderGoods.setShippingTime(LocalDateTime.now());
 		orderGoods.setGoodsNo(goods.getGoodsNo());
 		orderGoods.setGoodsImage(goods.getGoodsCover());
 		orderGoods.setGoodsId(request.getGoodsInfoId());

src/main/java/org/springblade/modules/system/mapper/UserMerchantMapper.xml

@@ -72,10 +72,14 @@
                a.device_id,
                b.facility_name as deviceName,
                a.cargo_way_id,
-               c.cargo_no      as cargoWayNo
+               c.cargo_no      as cargoWayNo,
+               a.shipping_time,
+               a.user_id,
+               bu.name as userName
         from t_order_goods a
                  left join t_facility b on a.device_id = b.id
                  left join t_facility_cargo_way c on a.cargo_way_id = c.id
+                 left join blade_user bu on a.user_id = bu.id
         where a.is_delete = 0
           and a.merchant_id = #{merchantId}
     </select>