@@ -15,6 +15,10 @@ import java.util.Date;
*/
@Data
public class CouponVo implements Serializable {
+ /**
+ * 购买方式 1.直接购买 2.采美豆抵扣
+ */
+ private Integer couponPayWay;
/**
* 优惠券id
@@ -17,7 +17,8 @@
cc.moneyCouponPrice,
cc.moneyCouponFlag,
cc.moneyCouponType,
- cc.`categoryType`
+ cc.`categoryType`,
+ cc.couponPayWay
FROM
cm_coupon_club a
LEFT JOIN cm_coupon cc ON a.couponId = cc.id
@@ -146,7 +147,8 @@
`userId`,
`shopId`,
`productType`,
- `categoryType`
+ `categoryType`,
+ couponPayWay
cm_coupon
WHERE
@@ -272,6 +274,7 @@
cc.`shopId`,
cc.`productType`,
cc.`categoryType`,
+ cc.couponPayWay,
s.name as shopName
cm_coupon cc
@@ -306,7 +309,8 @@
- s.name as shopName
+ s.name as shopName,
LEFT JOIN shop s ON cc.shopId = s.shopId