优惠券列表查看订单弹窗接口

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

@@ -0,0 +1,63 @@
+package org.springblade.salesPart.coupon.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Rain
+ */
+@Data
+public class CouponReportOrderDto {
+
+	private Long id;
+
+	private String orderNo;
+
+	/**
+	 * 客户id
+	 */
+	@ApiModelProperty(value = "客户id")
+	private Long customerId;
+	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(value = "客户名称")
+	private String customerName;
+
+	/**
+	 * 行数
+	 */
+	@ApiModelProperty(value = "行数")
+	private Integer numberRows;
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "数量")
+	private BigDecimal goodsTotalNum;
+
+	/**
+	 * 总金额
+	 */
+	@ApiModelProperty(value = "总金额")
+	private BigDecimal totalMoney;
+
+	/**
+	 * 红包金额
+	 */
+	private BigDecimal redPacketAmount;
+
+	/**
+	 * 业务日期
+	 */
+	@ApiModelProperty(value = "业务日期")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date businessDate;
+
+
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/coupon/controller/TireCouponController.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.salesPart.coupon.dto.CouponReportDto;
+import org.springblade.salesPart.coupon.dto.CouponReportOrderDto;
 import org.springblade.salesPart.coupon.service.ITireCouponService;
 import org.springblade.salesPart.coupon.vo.CouponReportVo;
 import org.springframework.web.bind.annotation.*;
@@ -65,5 +66,10 @@ public class TireCouponController {
 		return R.data(tireCouponService.getCouponReportList(couponReportVo, query));
 	}
 
+	@GetMapping("/getCouponReportOrderList")
+	public R<List<CouponReportOrderDto>> getCouponReportOrderList(@RequestParam("customerId") Long customerId, @RequestParam("checkType") Integer checkType) {
+		return R.data(tireCouponService.getCouponReportOrderList(customerId, checkType));
+	}
+
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.salesPart.coupon.dto.CouponReportDto;
+import org.springblade.salesPart.coupon.dto.CouponReportOrderDto;
 import org.springblade.salesPart.coupon.dto.CouponReturnsItemDto;
 import org.springblade.salesPart.coupon.dto.TireUserCouponDto;
 import org.springblade.salesPart.coupon.entity.TireUserCoupon;
@@ -72,4 +73,14 @@ public interface TireUserCouponMapper extends BaseMapper<TireUserCoupon> {
 	 * @return 结果
 	 */
 	List<CouponReturnsItemDto> getCouponReturnsItemDtoList(@Param("idList") List<Long> customerIds, @Param("tenantId") String tenantId);
+
+	/**
+	 * 查询优惠券使用订单列表
+	 *
+	 * @param customerId 客户id
+	 * @param tenantId   租户id
+	 * @param checkType   查看类型
+	 * @return 结果
+	 */
+	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

@@ -21,6 +21,18 @@
         <result property="couponValue" column="couponValue"/>
     </resultMap>
 
+    <resultMap id="CouponReportOrderDtoMap" type="org.springblade.salesPart.coupon.dto.CouponReportOrderDto">
+        <id property="id" column="id"/>
+        <result property="orderNo" column="ord_no"/>
+        <result property="customerId" column="customer_id"/>
+        <result property="customerName" column="customer_name"/>
+        <result property="numberRows" column="number_rows"/>
+        <result property="goodsTotalNum" column="goods_total_num"/>
+        <result property="totalMoney" column="total_money"/>
+        <result property="redPacketAmount" column="red_packet_amount"/>
+        <result property="businessDate" column="busines_date"/>
+    </resultMap>
+
 
     <insert id="saveBatch">
         INSERT INTO tire_user_coupon (
@@ -145,4 +157,30 @@
             #{id}
         </foreach>
     </select>
+    <select id="getCouponReportOrderList" resultMap="CouponReportOrderDtoMap">
+        SELECT DISTINCT
+        po.id,
+        po.ord_no,
+        po.customer_id,
+        po.customer_name,
+        po.number_rows,
+        po.goods_total_num,
+        po.total_money,
+        po.busines_date
+        FROM
+        tire_user_coupon u
+        INNER JOIN pjpf_order po ON u.order_id = po.id
+        WHERE
+        u.acquire_time IS NOT NULL
+        AND u.STATUS = 1
+        <if test="checkType == 1">
+            AND po.returns_status = '无'
+        </if>
+        <if test="checkType == 0">
+            AND po.returns_status != '无'
+        </if>
+        and u.tenant_id = #{tenantId}
+        and po.tenant_id = #{tenantId}
+        and u.corps_id = #{customerId}
+    </select>
 </mapper>

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.salesPart.coupon.dto.CouponReportDto;
+import org.springblade.salesPart.coupon.dto.CouponReportOrderDto;
 import org.springblade.salesPart.coupon.entity.TireCoupon;
 import org.springblade.salesPart.coupon.vo.CouponReportVo;
 
@@ -66,4 +67,13 @@ public interface ITireCouponService extends IService<TireCoupon> {
 	 * @return 结果
 	 */
 	IPage<CouponReportDto> getCouponReportList(CouponReportVo couponReportVo, Query query);
+
+	/**
+	 * 获取使用优惠券的订单列表
+	 *
+	 * @param customerId 门店id
+	 * @param checkType 查看类型
+	 * @return 结果
+	 */
+	List<CouponReportOrderDto> getCouponReportOrderList(Long customerId, Integer checkType);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/coupon/service/impl/TireCouponServiceImpl.java

@@ -314,4 +314,9 @@ public class TireCouponServiceImpl extends ServiceImpl<TireCouponMapper, TireCou
 		}
 		return PageHelperUtil.getPageInfo(couponReportDtoList);
 	}
+
+	@Override
+	public List<CouponReportOrderDto> getCouponReportOrderList(Long customerId, Integer checkType) {
+		return tireUserCouponMapper.getCouponReportOrderList(customerId, AuthUtil.getTenantId(), checkType);
+	}
 }