采美豆购买优惠券

src/main/java/com/caimei/modules/coupon/entity/CmCoupon.java

@@ -53,6 +53,7 @@ public class CmCoupon extends DataEntity<CmCoupon> {
     private Double moneyCouponPrice; //价值优惠券购买金额
     private NewCmShop shop;
     private List<Integer> productIdList;
+    private Integer couponPayWay;  //购买方式 1.直接购买 2.采美豆抵扣
 
     private Date receiveDate;   // 领取时间
     private Date useEndDate;    // 使用截止时间
@@ -65,6 +66,14 @@ public class CmCoupon extends DataEntity<CmCoupon> {
         super(id);
     }
 
+    public Integer getCouponPayWay() {
+        return couponPayWay;
+    }
+
+    public void setCouponPayWay(Integer couponPayWay) {
+        this.couponPayWay = couponPayWay;
+    }
+
     public Integer getMoneyCouponFlag() {
         return moneyCouponFlag;
     }

src/main/resources/mappings/modules/coupon/CmCouponMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.coupon.dao.CmCouponDao">
-    
+
 	<sql id="cmCouponColumns">
 		a.id AS "id",
 		a.name AS "name",
@@ -28,20 +28,20 @@
 		a.createDate AS "createDate",
 		a.delFlag AS "delFlag"
 	</sql>
-	
+
 	<sql id="cmCouponJoins">
 	</sql>
-    
+
 	<select id="get" resultType="CmCoupon">
-		SELECT 
+		SELECT
 			<include refid="cmCouponColumns"/>
 		FROM cm_coupon a
 		<include refid="cmCouponJoins"/>
 		WHERE a.id = #{id}
 	</select>
-	
+
 	<select id="findList" resultType="CmCoupon">
-		SELECT 
+		SELECT
 			<include refid="cmCouponColumns"/>,
 			u.name AS "clubName",
 			s.name AS "shopName"
@@ -59,7 +59,7 @@
 				AND a.moneyCouponFlag = #{moneyCouponFlag}
 			</if>
 			<if test="name != null and name != ''">
-				AND a.name LIKE 
+				AND a.name LIKE
 					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
 					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
 					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
@@ -119,15 +119,15 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<select id="findAllList" resultType="CmCoupon">
-		SELECT 
+		SELECT
 			<include refid="cmCouponColumns"/>
 		FROM cm_coupon a
 		<include refid="cmCouponJoins"/>
 		<where>
-			
-		</where>		
+
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -136,10 +136,11 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert" parameterType="CmCoupon"  keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO cm_coupon(
 			name,
+			couponPayWay,
 			couponAmount,
 			touchPrice,
 			startDate,
@@ -164,6 +165,7 @@
 			delFlag
 		) VALUES (
 			#{name},
+		    #{couponPayWay},
 			#{couponAmount},
 			#{touchPrice},
 			#{startDate},
@@ -188,10 +190,11 @@
 			#{delFlag}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE cm_coupon SET 	
+		UPDATE cm_coupon SET
 			name = #{name},
+			couponPayWay = #{couponPayWay},
 			couponAmount = #{couponAmount},
 			touchPrice = #{touchPrice},
 			startDate = #{startDate},
@@ -213,7 +216,7 @@
 			moneyCouponType = #{moneyCouponType}
 		WHERE id = #{id}
 	</update>
-	
+
 	<delete id="delete">
 		DELETE FROM cm_coupon
 		WHERE id = #{id}
@@ -366,7 +369,7 @@
 	<select id="findRedemptionCodeNum" resultType="integer">
 		SELECT COUNT(id) FROM cm_coupon_redemption_code WHERE couponId = #{couponId}
 	</select>
-	
+
 	<select id="findByRedemptionCode" resultType="com.caimei.modules.coupon.entity.CmCouponRedemptionCode">
 		SELECT
 		  `id`,
@@ -557,5 +560,5 @@
 		WHERE
 		  id = #{clubCouponId}
 	</update>
-	
+
 </mapper>

src/main/webapp/WEB-INF/views/modules/coupon/MoneyCouponForm.jsp

@@ -135,6 +135,13 @@
             订单商品总额满&nbsp;&nbsp;&nbsp;&nbsp;<input type="number" name="touchPrice" id="touchPrice" value="${cmCoupon.touchPrice}" min="0" required>
         </div>
     </div>
+    <div class="control-group">
+        <label class="control-label"><font color="red">*</font>购买方式：</label>
+        <div class="controls">
+            <form:radiobutton path="couponPayWay" value="1" label="直接购买" class="required"/>
+            <form:radiobutton path="couponPayWay" value="2" label="采美豆抵扣" class="required"/>
+        </div>
+    </div>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>购买价格：</label>
         <div class="controls">
@@ -207,10 +214,10 @@
     <div class="control-group" id="yxq">
         <label class="control-label"><font color="red">*</font>优惠券类型：</label>
         <div class="controls">
-                <form:radiobutton name="hdq" path="couponType" value="0" label="活动券" class="required" onclick="couponShow()"/>
-                <form:radiobutton id="plq" path="couponType" value="1" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="品类券" class="required" onclick="couponShow()"/>
-                <form:radiobutton id="zxq" path="couponType" value="2" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="用户专享券" class="required" onclick="couponShow()"/>
-                <form:radiobutton id="dpq" path="couponType" value="3" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="店铺券" class="required" onclick="couponShow()"/>
+            <form:radiobutton name="hdq" path="couponType" value="0" label="活动券" class="required" onclick="couponShow()"/>
+            <form:radiobutton id="plq" path="couponType" value="1" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="品类券" class="required" onclick="couponShow()"/>
+            <form:radiobutton id="zxq" path="couponType" value="2" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="用户专享券" class="required" onclick="couponShow()"/>
+            <form:radiobutton id="dpq" path="couponType" value="3" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="店铺券" class="required" onclick="couponShow()"/>
         </div>
     </div>
     <div id="eventVoucher" class="yxq">