订单导出新增活动相关信息

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1257,7 +1257,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         titles.add("编号");titles.add("下单用户");titles.add("用户头像");titles.add("手机号");
         titles.add("商铺信息"); titles.add("订单类型");titles.add("配送信息");titles.add("骑手昵称");
         titles.add("骑手电话"); titles.add("订单号");titles.add("内容");titles.add("商品总价（元）");
-        titles.add("优惠金额（元）"); titles.add("打包费（元/个 具体按照数量计算）");titles.add("跑腿费（元）");titles.add("支付金额（元）");
+        titles.add("优惠金额（元）");
+        titles.add("参与活动名称");
+        titles.add("活动优惠金额（元）");
+        titles.add("打包费（元/个 具体按照数量计算）");titles.add("跑腿费（元）");titles.add("支付金额（元）");
         titles.add("跑腿费说明"); titles.add("订单备注");titles.add("支付时间");titles.add("支付方式");
         titles.add("取餐号"); titles.add("状态");titles.add("是否转单");
 
@@ -1307,6 +1310,8 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             row.add(stringBuffer.toString());
             row.add(sumGoodsPrice);
             row.add(order.getCouponMoney());
+            row.add(order.getActivityTitle());
+            row.add(order.getActivityDiscountAmount());
             row.add(order.getPackMoney());
             row.add(order.getErrandMoney());
             row.add(order.getPayMoney());

src/main/resources/mapper/order/OrderMapper.xml

@@ -148,13 +148,16 @@
         select tor.*, tu.avatar as avatar, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.phone as
         shopPhone,
         tiu.nick_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,
-        ti.rider_user_id as riderUserId, tcu.money as couponMoney
+        ti.rider_user_id as riderUserId, tcu.money as couponMoney,
+        apr.discount_amount as activityDiscountAmount, ai.title activityTitle
         from tb_order tor
         left join tb_user tu on tor.user_id = tu.user_id
         left join goods_shop gs on tor.shop_id = gs.shop_id
         left join tb_indent ti on tor.order_id = ti.order_id
         left join tb_user tiu on tiu.user_id = ti.rider_user_id
         left join tb_coupon_user tcu on tor.coupon_id = tcu.id
+        left join activity_part_record apr on apr.order_id = tor.order_id
+        left join activity ai on ai.id = apr.activity_id
         where 1 = 1
         <if test="riderPhone!=null and riderPhone!=''">
             and tiu.phone =#{riderPhone}