[营销分析][添加][卡营销列表]

mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java

@@ -119,6 +119,9 @@ public class WxCouponOrderBVo extends WxCouponOrder{
 
 	@Transient
 	private Long couponId;
+	@Transient
+	private Integer couponType;
+
 
 	@Override
 	public Long getCouponId() {
@@ -130,6 +133,16 @@ public class WxCouponOrderBVo extends WxCouponOrder{
 		this.couponId = couponId;
 	}
 
+	@Override
+	public Integer getCouponType() {
+		return couponType;
+	}
+
+	@Override
+	public void setCouponType(Integer couponType) {
+		this.couponType = couponType;
+	}
+
 	public Date getStartDate() {
 		return startDate;
 	}

mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

@@ -326,7 +326,14 @@
 					and tcm.status = 0) as mc
 				from wx_coupon_order tco) com
 		where com.tcoid = co.id
-		and co.coupon_type < 100
+		<choose>
+			<when test=" null != couponType">
+				and co.coupon_type = #{couponType}
+			</when>
+			<otherwise>
+				and co.coupon_type &lt; 100
+			</otherwise>
+		</choose>
 		and c.id = co.coupon_id
 		<if test=" null != tenantId ">
 			and co.tenant_id = #{tenantId}