diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022041500001__coupon.sql b/mallinkAdmin/src/main/resources/db/migration/V2022041500001__coupon.sql
new file mode 100644
index 000000000..f9ba777d6
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V2022041500001__coupon.sql
@@ -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`;
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
index 3c24fe363..0f55fc14f 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
@@ -92,6 +92,9 @@ public class WxCoupon extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="副标题",name="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")
@Excel(name="售价(分)",width = 20,orderNum = "3")
private Integer salePrice;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
index 78ce19385..cb70aa931 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java
@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
@@ -649,10 +651,10 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService {
//todo 团购须知 要求格式 标题加类容 是否二选一 待测试
JsonArray notificationArray = new JsonArray();
// 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);
if(EnumCouponContentType.HTML.getCode().equals(coupon.getContentType())){
@@ -663,6 +665,10 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService {
productObjuct.addProperty("sub_title",coupon.getSubTitle());
//todo 团购详情 要求必传, 待测试
+ if(StringUtils.isNotBlank(coupon.getItemGroup())){
+ JsonArray groupArray = new JsonParser().parse(coupon.getItemGroup()).getAsJsonArray();
+ productObjuct.add("pay_item_groups",groupArray);
+ }
// JsonArray groupArray = new JsonArray();
// for ( : ) {
// JsonObject groupObject = new JsonObject();
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index c47b49286..5fe65fd34 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -11,6 +11,7 @@
+
@@ -64,6 +65,7 @@
+
@@ -107,7 +109,7 @@
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.`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`,
@@ -325,7 +327,7 @@