优惠券|促销+渠道

@@ -548,6 +548,7 @@ public class CouponServiceImpl implements ICouponService,IBusinessExportService{
             CouponQueryResp resp = new CouponQueryResp(coupon.getId(),coupon.getCouponName(),coupon.getCouponNum(),
                     useTime,coupon.getRemark(), getStatusDesc(coupon,curTime),coupon.getStatus(),coupon.getCouponToken());
             resp.setSendNum(coupon.getSendNum());
+            resp.setBusinessClient(coupon.getBusinessClient());
             resps.add(resp);
         }
         return resps;

@@ -38,6 +38,8 @@ public class Coupon implements Serializable {
      */
     private String skupAllowType;
 
+    private String businessClient;
+
     /**商品限制条件-特定商品*/
     public static final int PRODUCTLIMITTYPE_SPECIALPRODUCT = 1;
     /**商品限制条件-无限制*/

@@ -41,6 +41,11 @@ public class CouponQueryResp {
     private Integer statusValue;
 
     /**
+     * 渠道
+     */
+    private String businessClient;
+
+    /**
      * 发放数量
      */
     private long sendNum;

@@ -22,12 +22,13 @@
         <result column="remark" property="remark" jdbcType="VARCHAR" />
         <result column="skup_forbid_type" property="skupForbidType" jdbcType="VARCHAR" />
         <result column="skup_allow_type" property="skupAllowType" jdbcType="VARCHAR" />
+        <result column="business_client" property="businessClient" jdbcType="VARCHAR" />
     </resultMap>
 
     <sql id="Base_Column_List">
         id,coupon_token,coupon_name,coupon_amount,coupon_type,coupon_num,use_num,send_num,
         use_limit_type,use_limit_value,product_limit_type,product_limit_value,start_time,
-        end_time,status,create_time,pid,remark,skup_forbid_type,skup_allow_type
+        end_time,status,create_time,pid,remark,skup_forbid_type,skup_allow_type,business_client
     </sql>
     <insert id="insertOrUpdate" useGeneratedKeys="true" keyProperty="param.id">
         insert into coupon(id,coupon_token,coupon_name,coupon_amount,coupon_type,coupon_num,use_num,send_num,
@@ -70,14 +71,14 @@
             use_limit_value,
         </if>
         product_limit_type,
-        start_time,end_time,status,create_time,pid,remark,skup_forbid_type,skup_allow_type)
+        start_time,end_time,status,create_time,pid,remark,skup_forbid_type,skup_allow_type, business_client)
         values(#{param.couponToken},#{param.couponName},#{param.couponAmount},#{param.couponType}
         ,#{param.couponNum},#{param.useNum},#{param.sendNum},#{param.useLimitType},
         <if test="param.useLimitType == 2">
             #{param.useLimitValue},
         </if>
         #{param.productLimitType},
-        #{param.startTime},#{param.endTime},#{param.status},#{param.createTime},#{param.pid},#{param.remark},#{param.skupForbidType},#{param.skupAllowType})
+        #{param.startTime},#{param.endTime},#{param.status},#{param.createTime},#{param.pid},#{param.remark},#{param.skupForbidType},#{param.skupAllowType},#{param.businessClient})
     </insert>
     <update id="updateByCouponSaveUpdateReq">
         update coupon