diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index a7d2d4a4..e1a29cef 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -8246,7 +8246,8 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl select a.order_id,a.store_id,a.store_name,a.buyer_user_id, a.buyer_user_name,a.order_time,a.order_payment_amount,a.order_product_amount, - b.order_title, b.delivery_type_id, b.payment_type_id, b.payment_time, + b.order_title, b.delivery_type_id, b.payment_type_id, b.payment_time, b.order_pickup_num, c.order_message, c.order_item_amount, c.order_shipping_fee,c.delivery_time, - e.store_tel, e.order_pickup_num, + e.store_tel, f.da_province,f.da_city,f.da_address,f.da_mobile, f.order_id from shop_order_base a inner join shop_order_info b on a.order_id=b.order_id diff --git a/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class b/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class index 4e0dda56..38cba706 100644 Binary files a/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class and b/mall-shop/target/classes/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.class differ diff --git a/mall-shop/target/classes/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/target/classes/mapper/order/ShopOrderBaseMapper.xml index 4dc12769..1bef985b 100644 --- a/mall-shop/target/classes/mapper/order/ShopOrderBaseMapper.xml +++ b/mall-shop/target/classes/mapper/order/ShopOrderBaseMapper.xml @@ -522,9 +522,9 @@