diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022061000001__banner_add.sql b/mallinkAdmin/src/main/resources/db/migration/V2022061000001__banner_add.sql new file mode 100644 index 000000000..79dbad18e --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022061000001__banner_add.sql @@ -0,0 +1,4 @@ +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (676, '抖音宣传页', 605, 'Y', NULL, 1, NULL, NULL, 'ttxcList', NULL, 0, 671); + + +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 508, 511, 512, 521, 522, 523, 531, 532, 591, 592, 595, 602, 605, 606, 607, 610, 647, 671, 675, 676, 680, 711, 901, 902, 904, 907, 60702]' WHERE `id` = 11; diff --git a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java index 726ac8a95..553ae9407 100644 --- a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java +++ b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java @@ -15,7 +15,6 @@ public interface TtCouponGoodsService { ResultData productSave(WxCoupon coupon) throws Exception; - int handlerTtGoodsAudit(TtCouponChannelPoi couponChannelPoi); ResultData productDraftGet(TenantEntity tenantEntity,Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index c667fe06f..2f6ef6656 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -361,7 +361,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { try { TtWebService ttWebService = ttMerchantPoiService.getTtWebService(ttCouponChannelPoi); boolean b = ttWebService.getGoodsService().productFreeAudit(null,wxCoupon.getId().toString(), - wxCoupon.getValidEndDate().getTime(),wxCoupon.getInventory()); + null,wxCoupon.getInventory()); if(b){ return new ResultData(); }else{ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 2231e832d..701ea5ad5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -176,7 +176,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { } //type 为固定格式才会有券的信息 才会有投放的问题 - couponInject(wxCampaign); +// couponInject(wxCampaign); return new ResultData(Result.SUCCESS,"操作成功"); }