| @@ -0,0 +1,200 @@ | |||||
| ALTER TABLE `mallink`.`wx_coupon_0` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_1` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_2` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_3` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_4` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_5` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_6` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_7` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_8` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_9` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_10` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_11` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_12` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_13` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_14` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_15` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_16` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_17` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_18` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_19` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_20` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_21` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_22` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_23` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_24` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_25` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_26` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_27` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_28` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_29` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_30` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_31` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_32` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_33` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_34` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_35` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_36` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_37` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_38` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_39` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_40` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_41` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_42` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_43` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_44` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_45` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_46` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_47` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_48` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_49` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_50` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_51` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_52` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_53` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_54` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_55` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_56` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_57` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_58` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_59` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_60` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_61` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_62` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_63` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_64` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_65` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_66` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_67` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_68` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_69` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_70` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_71` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_72` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_73` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_74` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_75` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_76` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_77` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_78` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_79` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_80` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_81` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_82` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_83` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_84` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_85` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_86` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_87` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_88` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_89` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_90` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_91` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_92` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_93` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_94` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_95` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_96` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_97` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_98` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| ALTER TABLE `mallink`.`wx_coupon_99` | |||||
| ADD COLUMN `item_group` json COMMENT '卷包含内容' AFTER `sub_title`; | |||||
| @@ -92,6 +92,9 @@ public class WxCoupon extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | ||||
| private String subTitle; | private String subTitle; | ||||
| @io.swagger.annotations.ApiModelProperty(value="卷包含内容",name="itemGroup") | |||||
| private String itemGroup; | |||||
| @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5, 6, 8, 9, 100)",name="salePrice") | @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5, 6, 8, 9, 100)",name="salePrice") | ||||
| @Excel(name="售价(分)",width = 20,orderNum = "3") | @Excel(name="售价(分)",width = 20,orderNum = "3") | ||||
| private Integer salePrice; | private Integer salePrice; | ||||
| @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.google.gson.JsonArray; | import com.google.gson.JsonArray; | ||||
| import com.google.gson.JsonElement; | |||||
| import com.google.gson.JsonObject; | import com.google.gson.JsonObject; | ||||
| import com.google.gson.JsonParser; | |||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| @@ -649,10 +651,10 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { | |||||
| //todo 团购须知 要求格式 标题加类容 是否二选一 待测试 | //todo 团购须知 要求格式 标题加类容 是否二选一 待测试 | ||||
| JsonArray notificationArray = new JsonArray(); | JsonArray notificationArray = new JsonArray(); | ||||
| // for ( : ) { | // for ( : ) { | ||||
| // JsonObject contentObject = new JsonObject(); | |||||
| // contentObject.addProperty("title",);//标题 | |||||
| // contentObject.addProperty("content",);//内容 | |||||
| // notificationArray.add(contentObject); | |||||
| JsonObject contentObject = new JsonObject(); | |||||
| contentObject.addProperty("title","购买须知");//标题 | |||||
| contentObject.addProperty("content",coupon.getRemark());//内容 | |||||
| notificationArray.add(contentObject); | |||||
| // } | // } | ||||
| productObjuct.add("notification",notificationArray); | productObjuct.add("notification",notificationArray); | ||||
| if(EnumCouponContentType.HTML.getCode().equals(coupon.getContentType())){ | if(EnumCouponContentType.HTML.getCode().equals(coupon.getContentType())){ | ||||
| @@ -663,6 +665,10 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { | |||||
| productObjuct.addProperty("sub_title",coupon.getSubTitle()); | productObjuct.addProperty("sub_title",coupon.getSubTitle()); | ||||
| //todo 团购详情 要求必传, 待测试 | //todo 团购详情 要求必传, 待测试 | ||||
| if(StringUtils.isNotBlank(coupon.getItemGroup())){ | |||||
| JsonArray groupArray = new JsonParser().parse(coupon.getItemGroup()).getAsJsonArray(); | |||||
| productObjuct.add("pay_item_groups",groupArray); | |||||
| } | |||||
| // JsonArray groupArray = new JsonArray(); | // JsonArray groupArray = new JsonArray(); | ||||
| // for ( : ) { | // for ( : ) { | ||||
| // JsonObject groupObject = new JsonObject(); | // JsonObject groupObject = new JsonObject(); | ||||
| @@ -11,6 +11,7 @@ | |||||
| <result column="detail_picture" jdbcType="VARCHAR" property="detailPicture"/> | <result column="detail_picture" jdbcType="VARCHAR" property="detailPicture"/> | ||||
| <result column="title" jdbcType="VARCHAR" property="title"/> | <result column="title" jdbcType="VARCHAR" property="title"/> | ||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | ||||
| <result column="item_group" jdbcType="VARCHAR" property="itemGroup"/> | |||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | ||||
| <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | ||||
| @@ -64,6 +65,7 @@ | |||||
| <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> | <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> | ||||
| <result column="title" jdbcType="VARCHAR" property="title"/> | <result column="title" jdbcType="VARCHAR" property="title"/> | ||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | ||||
| <result column="item_group" jdbcType="VARCHAR" property="itemGroup"/> | |||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | ||||
| <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | ||||
| @@ -107,7 +109,7 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| distinct c.`id`,c.`tenant_id`,c.`parent_tenant_id`,c.`type`,c.`cover_img`,c.`cover_picture`,c.`detail_picture`, | distinct c.`id`,c.`tenant_id`,c.`parent_tenant_id`,c.`type`,c.`cover_img`,c.`cover_picture`,c.`detail_picture`, | ||||
| c.`title`,c.`sub_title`,c.`sale_price`,c.`freight_price`,c.`use_price`,c.`use_limit_rule`,c.`use_limit_quantity`,c.`send_type`, | |||||
| c.`title`,c.`sub_title`,c.`item_group`,c.`sale_price`,c.`freight_price`,c.`use_price`,c.`use_limit_rule`,c.`use_limit_quantity`,c.`send_type`, | |||||
| c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,c.pick_start_date,c.pick_end_date,c.`valid_days`,c.`detail`,c.`price`,c.tail_price,c.orig_price,c.`unit`,c.`remain_inventory`,c.`inventory`, | c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,c.pick_start_date,c.pick_end_date,c.`valid_days`,c.`detail`,c.`price`,c.tail_price,c.orig_price,c.`unit`,c.`remain_inventory`,c.`inventory`, | ||||
| c.`remark`,c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`,c.`support_transfer`,c.`subsidy_num`,c.`subsidy_type`, | c.`remark`,c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`,c.`support_transfer`,c.`subsidy_num`,c.`subsidy_type`, | ||||
| c.`press_limit_num`, c.`press_limit_hours`, c.`auto_refund`,c.`credit_price`,c.`credit_refund`,c.`put_apply_status`,c.`stock_apply_status`,c.`cancle_apply_status`, | c.`press_limit_num`, c.`press_limit_hours`, c.`auto_refund`,c.`credit_price`,c.`credit_refund`,c.`put_apply_status`,c.`stock_apply_status`,c.`cancle_apply_status`, | ||||
| @@ -325,7 +327,7 @@ | |||||
| <select id="findTenantSimpleList" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | <select id="findTenantSimpleList" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | ||||
| select id,title,sale_price,use_price,price,tail_price,orig_price,auto_refund,business,subsidy_type,source_type,type,unit,cover_img, | select id,title,sale_price,use_price,price,tail_price,orig_price,auto_refund,business,subsidy_type,source_type,type,unit,cover_img, | ||||
| sub_title,valid_type,valid_start_date,valid_end_date,pick_start_date,pick_end_date | |||||
| sub_title,item_group,valid_type,valid_start_date,valid_end_date,pick_start_date,pick_end_date | |||||
| from wx_coupon c where c.`tenant_id` = #{tenantId} | from wx_coupon c where c.`tenant_id` = #{tenantId} | ||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| @@ -342,13 +344,13 @@ | |||||
| </select> | </select> | ||||
| <select id="findSimpleDetail" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | <select id="findSimpleDetail" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | ||||
| select c.id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date, | |||||
| select c.id,c.type,c.cover_img,c.title,c.sub_title,c.item_group,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date, | |||||
| c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund,c.business,c.subsidy_type,c.source_type,c.content_type,c.gift_list,c.support_transfer,c.subsidy_num | c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund,c.business,c.subsidy_type,c.source_type,c.content_type,c.gift_list,c.support_transfer,c.subsidy_num | ||||
| from wx_coupon c where c.id = #{id} and c.`tenant_id` = #{tenantId} | from wx_coupon c where c.id = #{id} and c.`tenant_id` = #{tenantId} | ||||
| </select> | </select> | ||||
| <select id="findCouponCVoDetail" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | <select id="findCouponCVoDetail" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | ||||
| select c.id,c.type,c.cover_img,c.cover_picture,c.detail_picture,c.title,c.sub_title,c.sale_price,c.use_price, | |||||
| select c.id,c.type,c.cover_img,c.cover_picture,c.detail_picture,c.title,c.sub_title,c.item_group,c.sale_price,c.use_price, | |||||
| c.use_limit_rule,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, | c.use_limit_rule,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, | ||||
| c.valid_days,c.detail,c.price,c.tail_price,c.orig_price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status, | c.valid_days,c.detail,c.price,c.tail_price,c.orig_price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status, | ||||
| c.create_date,c.update_date,c.business,c.sub_business,c.support_transfer,c.press_limit_num, c.auto_refund,c.credit_price,c.conditions,c.content_type | c.create_date,c.update_date,c.business,c.sub_business,c.support_transfer,c.press_limit_num, c.auto_refund,c.credit_price,c.conditions,c.content_type | ||||
| @@ -358,7 +360,7 @@ | |||||
| <select id="findSimpleDetailList" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | <select id="findSimpleDetailList" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | ||||
| select c.id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date, | |||||
| select c.id,c.type,c.cover_img,c.title,c.sub_title,c.item_group,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date, | |||||
| c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund,c.business,c.subsidy_type,c.source_type,c.content_type | c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund,c.business,c.subsidy_type,c.source_type,c.content_type | ||||
| from wx_coupon c | from wx_coupon c | ||||
| <include refid="dynamicWhereConditions"/> | <include refid="dynamicWhereConditions"/> | ||||
| @@ -667,6 +669,7 @@ | |||||
| <result column="detail_picture" jdbcType="VARCHAR" property="detailPicture"/> | <result column="detail_picture" jdbcType="VARCHAR" property="detailPicture"/> | ||||
| <result column="title" jdbcType="VARCHAR" property="title"/> | <result column="title" jdbcType="VARCHAR" property="title"/> | ||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | ||||
| <result column="item_group" jdbcType="VARCHAR" property="itemGroup"/> | |||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | ||||
| <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | ||||
| @@ -714,6 +717,7 @@ | |||||
| <result column="detail_picture" jdbcType="VARCHAR" property="detailPicture"/> | <result column="detail_picture" jdbcType="VARCHAR" property="detailPicture"/> | ||||
| <result column="title" jdbcType="VARCHAR" property="title"/> | <result column="title" jdbcType="VARCHAR" property="title"/> | ||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | ||||
| <result column="item_group" jdbcType="VARCHAR" property="itemGroup"/> | |||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | ||||
| <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | ||||
| @@ -1221,7 +1225,7 @@ | |||||
| <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" | <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" | ||||
| resultType="com.iformall.domain.po.WxCoupon"> | resultType="com.iformall.domain.po.WxCoupon"> | ||||
| select ct.id as id,wc.id as couponId, | select ct.id as id,wc.id as couponId, | ||||
| wc.tenant_id,wc.parent_tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`freight_price`,wc.`use_price`,wc.`use_limit_rule`,wc.`use_limit_quantity`,wc.`send_type`, | |||||
| wc.tenant_id,wc.parent_tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`item_group`,wc.`sale_price`,wc.`freight_price`,wc.`use_price`,wc.`use_limit_rule`,wc.`use_limit_quantity`,wc.`send_type`, | |||||
| wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.pick_start_date,wc.pick_end_date,wc.`valid_days`,wc.`detail`,wc.`price`,wc.tail_price,wc.orig_price,wc.`unit`,wc.`remain_inventory`,wc.`inventory`, | wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.pick_start_date,wc.pick_end_date,wc.`valid_days`,wc.`detail`,wc.`price`,wc.tail_price,wc.orig_price,wc.`unit`,wc.`remain_inventory`,wc.`inventory`, | ||||
| wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`, | wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`, | ||||
| wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wc.`conditions`, | wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wc.`conditions`, | ||||
| @@ -1252,7 +1256,7 @@ | |||||
| </update> | </update> | ||||
| <select id="newfindCList" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | <select id="newfindCList" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap"> | ||||
| select id,remain_inventory,inventory,cover_img,sub_title,sale_price,use_price,price,tail_price, | |||||
| select id,remain_inventory,inventory,cover_img,sub_title,item_group,sale_price,use_price,price,tail_price, | |||||
| orig_price,unit,use_limit_rule,use_limit_quantity,send_type,support_transfer,press_limit_num,auto_refund, | orig_price,unit,use_limit_rule,use_limit_quantity,send_type,support_transfer,press_limit_num,auto_refund, | ||||
| conditions,valid_type,valid_start_date,valid_end_date,pick_start_date,pick_end_date,valid_days,credit_price, | conditions,valid_type,valid_start_date,valid_end_date,pick_start_date,pick_end_date,valid_days,credit_price, | ||||
| content_type,source_type | content_type,source_type | ||||