Преглед изворни кода

[卡券详情支持多图][修改]:详情支持多图

release_toaliyun_real
Stormeye Wu пре 7 година
родитељ
комит
e06016e04a
12 измењених фајлова са 43 додато и 25 уклоњено
  1. +7
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql
  2. +7
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql
  3. +7
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java
  8. +3
    -3
      mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
  9. +2
    -1
      mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml
  10. +2
    -1
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
  11. +5
    -19
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  12. +2
    -1
      mallinkService/src/main/resources/mapper/WxTopicMapper.xml

+ 7
- 0
mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql Прегледај датотеку

@@ -0,0 +1,7 @@



ALTER TABLE wx_coupon
ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;

UPDATE wx_coupon SET detail_picture='[]' WHERE detail_picture is null;

+ 7
- 0
mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql Прегледај датотеку

@@ -0,0 +1,7 @@



ALTER TABLE wx_campaign
ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;

UPDATE wx_campaign SET detail_picture='[]' WHERE detail_picture is null;

+ 7
- 0
mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql Прегледај датотеку

@@ -0,0 +1,7 @@



ALTER TABLE wx_topic
ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;

UPDATE wx_topic SET detail_picture='[]' WHERE detail_picture is null;

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java Прегледај датотеку

@@ -40,6 +40,8 @@ public class WxCampaign extends BaseEntity {
private String coverImg; private String coverImg;
@io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture")
private String coverPicture; private String coverPicture;
@io.swagger.annotations.ApiModelProperty(value="详情多图",name="detailPicture")
private String detailPicture;
@io.swagger.annotations.ApiModelProperty(value="主标题",name="title") @io.swagger.annotations.ApiModelProperty(value="主标题",name="title")
private String title; private String title;
@io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle")


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Прегледај датотеку

@@ -74,6 +74,8 @@ public class WxCoupon extends BaseEntity {
private String coverImg; private String coverImg;
@io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture")
private String coverPicture; private String coverPicture;
@io.swagger.annotations.ApiModelProperty(value="详情多图",name="detailPicture")
private String detailPicture;
@io.swagger.annotations.ApiModelProperty(value="券名称",name="title") @io.swagger.annotations.ApiModelProperty(value="券名称",name="title")
private String title; private String title;
@io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle")


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java Прегледај датотеку

@@ -30,6 +30,8 @@ public class WxTopic extends BaseEntity {
private String cover; private String cover;
@io.swagger.annotations.ApiModelProperty(value="多封面",name="coverPicture") @io.swagger.annotations.ApiModelProperty(value="多封面",name="coverPicture")
private String coverPicture; private String coverPicture;
@io.swagger.annotations.ApiModelProperty(value="详情多图",name="detailPicture")
private String detailPicture;
@io.swagger.annotations.ApiModelProperty(value="广告图",name="advert") @io.swagger.annotations.ApiModelProperty(value="广告图",name="advert")
private String advert; private String advert;
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime")


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java Прегледај датотеку

@@ -20,6 +20,8 @@ public class WxCardVo extends WxCardInfo {
private String coverImg; private String coverImg;
@io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture")
private String coverPicture; private String coverPicture;
@io.swagger.annotations.ApiModelProperty(value="详情多图",name="detailPicture")
private String detailPicture;
@io.swagger.annotations.ApiModelProperty(value="券名称",name="title") @io.swagger.annotations.ApiModelProperty(value="券名称",name="title")
private String title; private String title;
@io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle")


+ 3
- 3
mallinkService/src/main/resources/mapper/WxCampaignMapper.xml Прегледај датотеку

@@ -26,16 +26,16 @@
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`,
`id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`,
`mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html` `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`
</sql> </sql>


<sql id="allCHeadColumns"> <sql id="allCHeadColumns">
`id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`type`,`sort_num`
`id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`type`,`sort_num`
</sql> </sql>


<sql id="allAHeadColumns"> <sql id="allAHeadColumns">
`id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`,
`id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`,
`mechant_id`,`sort_num`,`status`,`create_time`,`update_time` `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`
</sql> </sql>




+ 2
- 1
mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml Прегледај датотеку

@@ -89,6 +89,7 @@


<result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> <result column="cover_img" jdbcType="VARCHAR" property="coverImg" />
<result column="cover_picture" jdbcType="VARCHAR" property="coverPicture" /> <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture" />
<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="detail" jdbcType="VARCHAR" property="detail" /> <result column="detail" jdbcType="VARCHAR" property="detail" />
@@ -113,7 +114,7 @@
<sql id="allVoColumns"> <sql id="allVoColumns">
ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`, ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`,
ci.`create_date`,ci.`update_date`, ci.`create_date`,ci.`update_date`,
c.`cover_img`, c.`cover_picture`,c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`subsidy_type`, c.`subsidy_num`,
c.`cover_img`, c.`cover_picture`,c.`detail_picture`,c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`subsidy_type`, c.`subsidy_num`,
co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status, co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status,
cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as ou_phone cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as ou_phone
</sql> </sql>


+ 2
- 1
mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml Прегледај датотеку

@@ -198,7 +198,7 @@


<sql id="WxCouponCVoColumn"> <sql id="WxCouponCVoColumn">
cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time, cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time,
c.tenant_id,c.type,c.cover_img,c.cover_picture,c.title,c.sub_title,c.sale_price,c.use_price,
c.tenant_id,c.type,c.cover_img,c.cover_picture,c.detail_picture,c.title,c.sub_title,c.sale_price,c.use_price,
c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date, c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,
c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status, c.valid_days,c.detail,c.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.create_date,c.update_date,c.business,c.sub_business,c.support_transfer,c.press_limit_num, c.auto_refund,c.credit_price
@@ -216,6 +216,7 @@
<result column="type" jdbcType="INTEGER" property="type"/> <result column="type" jdbcType="INTEGER" property="type"/>
<result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/>
<result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/>
<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="sale_price" jdbcType="INTEGER" property="salePrice"/> <result column="sale_price" jdbcType="INTEGER" property="salePrice"/>


+ 5
- 19
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Прегледај датотеку

@@ -7,6 +7,7 @@
<result column="type" jdbcType="INTEGER" property="type"/> <result column="type" jdbcType="INTEGER" property="type"/>
<result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/>
<result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/>
<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="sale_price" jdbcType="INTEGER" property="salePrice"/> <result column="sale_price" jdbcType="INTEGER" property="salePrice"/>
@@ -86,7 +87,7 @@
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
`id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,
`remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`, `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund` `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`
@@ -429,6 +430,7 @@
<result column="type" jdbcType="INTEGER" property="type"/> <result column="type" jdbcType="INTEGER" property="type"/>
<result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/>
<result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/>
<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="sale_price" jdbcType="INTEGER" property="salePrice"/> <result column="sale_price" jdbcType="INTEGER" property="salePrice"/>
@@ -649,22 +651,6 @@
<if test=" null == sortColumns"> order by c.status asc,c.create_date desc </if> <if test=" null == sortColumns"> order by c.status asc,c.create_date desc </if>
</select> </select>


<!--
<select id="findCouponSendCount" parameterType="com.iformall.domain.po.WxCoupon" resultType="com.iformall.domain.po.WxCoupon">
select DATE_FORMAT(c.create_time,'%Y-%m-%d') xtime,count(id) xcount from wx_coupon_action_log c
where c.create_time between #{startdate} and #{enddate}
group by xtime
</select>
<select id="findCouponGetCount" parameterType="com.iformall.domain.po.WxCoupon" resultType="com.iformall.domain.po.WxCoupon">
select DATE_FORMAT(wco.create_date,'%Y-%m-%d') xtime,count(wco.id) xcount from wx_coupon c
left join wx_coupon_order wco on c.id = wco.coupon_id
where 1=1
and wco.create_date between #{startdate} and #{enddate}
and wco.coupon_price = 0
group by xtime
</select>
-->

<select id="findCouponOrderCount" parameterType="com.iformall.domain.po.WxCoupon" resultType="com.iformall.domain.vo.WxCouponStatisVo"> <select id="findCouponOrderCount" parameterType="com.iformall.domain.po.WxCoupon" resultType="com.iformall.domain.vo.WxCouponStatisVo">
select DATE_FORMAT(wco.create_date,'%Y-%m-%d') xtime,count(wco.id) xcount from wx_coupon c select DATE_FORMAT(wco.create_date,'%Y-%m-%d') xtime,count(wco.id) xcount from wx_coupon c
left join wx_coupon_order wco on c.id = wco.coupon_id left join wx_coupon_order wco on c.id = wco.coupon_id
@@ -790,11 +776,11 @@


<select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" resultType="com.iformall.domain.po.WxCoupon"> <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" 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.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`,
wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`,
wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`, wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`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.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`
,wc.title as couponName,wc.`cover_img` as couponPic,wc.`cover_picture` as couponPicture,wc.id as couponId from wx_coupon_channel ct left join
,wc.title as couponName,wc.`cover_img` as couponPic,wc.`cover_picture` as couponPicture,wc.`detail_picture` as detailPicture,wc.id as couponId from wx_coupon_channel ct left join
wx_coupon wc on wc.id = ct.coupon_id wx_coupon wc on wc.id = ct.coupon_id
where ct.`sub_target_id` = #{id} where ct.`sub_target_id` = #{id}
</select> </select>


+ 2
- 1
mallinkService/src/main/resources/mapper/WxTopicMapper.xml Прегледај датотеку

@@ -9,6 +9,7 @@
<result column="content" property="content" /> <result column="content" property="content" />
<result column="cover" property="cover" /> <result column="cover" property="cover" />
<result column="cover_picture" property="coverPicture" /> <result column="cover_picture" property="coverPicture" />
<result column="detail_picture" property="detailPicture" />
<result column="advert" property="advert" /> <result column="advert" property="advert" />
<result column="begin_time" property="beginTime" /> <result column="begin_time" property="beginTime" />
<result column="end_time" property="endTime" /> <result column="end_time" property="endTime" />
@@ -21,7 +22,7 @@
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`name`,`title`,`content`,`cover`,`cover_picture`,`advert`,`begin_time`,`end_time`,`createtime`,`updatetime`,`bg_color`
`id`,`tenant_id`,`name`,`title`,`content`,`cover`,`cover_picture`,`detail_picture`,`advert`,`begin_time`,`end_time`,`createtime`,`updatetime`,`bg_color`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Loading…
Откажи
Сачувај