Explorar el Código

商品购买优惠券支持

zouxuan hace 4 años
padre
commit
9cf99e335c

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SysCouponCodeDto.java

@@ -30,6 +30,9 @@ public class SysCouponCodeDto {
     @ApiModelProperty("优惠券编号")
     private Integer couponId;
 
+    @ApiModelProperty("优惠券编号")
+    private Integer couponCodeId;
+
     @ApiModelProperty("优惠券类型")
     private CouponTypeEnum couponType;
 
@@ -66,6 +69,14 @@ public class SysCouponCodeDto {
     @ApiModelProperty("使用截止日期")
     private java.util.Date useDeadlineDate;
 
+    public Integer getCouponCodeId() {
+        return couponCodeId;
+    }
+
+    public void setCouponCodeId(Integer couponCodeId) {
+        this.couponCodeId = couponCodeId;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentGoodsSell.java

@@ -61,6 +61,17 @@ public class StudentGoodsSell {
 	@ApiModelProperty(value = "合作单位编号", required = false)
 	private Integer cooperationOrganId;
 
+	@ApiModelProperty(value = "优惠券列表", required = false)
+	private List<Integer> couponIdList;
+
+	public List<Integer> getCouponIdList() {
+		return couponIdList;
+	}
+
+	public void setCouponIdList(List<Integer> couponIdList) {
+		this.couponIdList = couponIdList;
+	}
+
 	public Integer getCooperationOrganId() {
 		return cooperationOrganId;
 	}

+ 2 - 0
mec-biz/src/main/resources/config/mybatis/SysCouponCodeMapper.xml

@@ -26,6 +26,7 @@
 		<result column="user_id_" property="userId"/>
 		<result column="username_" property="userName"/>
 		<result column="phone_" property="phone"/>
+		<result column="coupon_code_id_" property="couponCodeId"/>
 		<result column="coupon_id_" property="couponId"/>
 		<result column="coupon_type_" property="couponType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="coupon_name_" property="couponName"/>
@@ -164,6 +165,7 @@
 		    scc.user_id_,
 			su.username_,
 			su.phone_,
+			scc.id_ coupon_code_id_,
 			scc.coupon_id_,
 			sc.type_ coupon_type_,
 			sc.name_ coupon_name_,