优惠券订单列表增加字段显示

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/coupon/dto/CouponReportOrderDto.java

@@ -59,5 +59,14 @@ public class CouponReportOrderDto {
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date businessDate;
 
+	/**
+	 * 状态
+	 */
+	private String status;
+
+	/**
+	 * 商品名称
+	 */
+	private String goodsNameJoin;
 
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/coupon/mapper/TireUserCouponMapper.java

@@ -82,5 +82,6 @@ public interface TireUserCouponMapper extends BaseMapper<TireUserCoupon> {
 	 * @param checkType   查看类型
 	 * @return 结果
 	 */
+	@TenantIgnore
 	List<CouponReportOrderDto> getCouponReportOrderList(@Param("customerId") Long customerId, @Param("tenantId") String tenantId, @Param("checkType") Integer checkType);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/coupon/mapper/TireUserCouponMapper.xml

@@ -31,6 +31,8 @@
         <result property="totalMoney" column="total_money"/>
         <result property="redPacketAmount" column="red_packet_amount"/>
         <result property="businessDate" column="busines_date"/>
+        <result property="status" column="status"/>
+        <result property="goodsNameJoin" column="goods_name_join"/>
     </resultMap>
 
 
@@ -168,10 +170,14 @@
         po.number_rows,
         po.goods_total_num,
         po.total_money,
-        po.busines_date
+        po.busines_date,
+        po.goods_name_join,
+        po.status,
+        sum(tc.value) as red_packet_amount
         FROM
         tire_user_coupon u
         INNER JOIN pjpf_order po ON u.order_id = po.id
+        inner join tire_coupon tc on u.coupon_id = tc.id
         WHERE
         u.acquire_time IS NOT NULL
         AND u.STATUS = 1
@@ -184,5 +190,6 @@
         and u.tenant_id = #{tenantId}
         and po.tenant_id = #{tenantId}
         and u.corps_id = #{customerId}
+        group by po.id
     </select>
 </mapper>