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

cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml

@@ -6,13 +6,15 @@
 
     <select id="getOrderList" resultType="com.czg.market.vo.PpOrderListVO">
         SELECT
-          o.id, o.shop_id, o.order_no, o.package_id, o.share_num, o.status,
+          o.id, o.shop_id, o.order_no, o.package_id, o.share_num, o.status, o.final_price, o.pay_time, o.verify_code, o.verify_time,
           s.shop_name as shopName, s.address as shopAddress,
           p.origin_price as originPrice, p.price, p.images as imagesStr, p.tiered_discount as tieredDiscountStr,
-          p.expire_hours as expireHours, p.package_name as packageName
+          p.expire_hours as expireHours, p.package_name as packageName,
+          u.head_img as avatar, u.nick_name as nickname, u.phone
         from pp_package_order o
         left join tb_shop_info s on o.shop_id = s.id
         left join pp_package p on o.package_id = p.id
+        left join tb_user_info u on o.user_id = u.id
         where 1=1
         <if test="shopId != null">
             and o.shop_id = #{shopId}