diff --git a/mallinkAdmin/src/main/resources/db/migration/V202012080001__wx_campaign.sql b/mallinkAdmin/src/main/resources/db/migration/V202012080001__wx_campaign.sql
new file mode 100644
index 000000000..04cd8b082
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V202012080001__wx_campaign.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `wx_campaign`
+ADD COLUMN `go_appid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '小程序跳转路径,类型4适用' AFTER `page_scene`;
\ No newline at end of file
diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
index f89dcb10f..fb2c4e929 100644
--- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
+++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
@@ -1,6 +1,7 @@
package com.iformall.controller;
import com.github.pagehelper.PageInfo;
+import com.iformall.annotation.RedisCache;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
@@ -32,6 +33,7 @@ public class WxMiniappThemeController extends BaseController {
@Autowired
WxMiniappThemeService wxMiniappThemeService;
+ @RedisCache
@ApiOperation("查询MiniappTheme列表")
@GetMapping(value = "/getOne")
@TenantIgnore
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
index 9cdf94a36..f71f28ab1 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
@@ -73,6 +73,8 @@ public class WxCampaign extends TenantEntity {
private String pagePath;
@io.swagger.annotations.ApiModelProperty(value = "小程序跳转二维码,类型3适用", name = "pageScene")
private String pageScene;
+ @io.swagger.annotations.ApiModelProperty(value = "小程序跳转路径,类型4适用", name = "goAppid")
+ private String goAppid;
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="营销物料-小程序路径",name="weappPath")
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 75eb281bd..96afb0770 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java
@@ -122,6 +122,9 @@ public class WxCampaignServiceImpl implements WxCampaignService {
if (StringUtils.isBlank(wxCampaign.getCoverImg())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "封面图不能为空");
}
+ if (StringUtils.isBlank(wxCampaign.getGoAppid())) {
+ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "小程序跳转路径不能为空");
+ }
}else {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
}
@@ -352,6 +355,9 @@ public class WxCampaignServiceImpl implements WxCampaignService {
if (StringUtils.isBlank(wxCampaign.getCoverImg())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "封面图不能为空");
}
+ if (StringUtils.isBlank(wxCampaign.getGoAppid())) {
+ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "小程序跳转路径不能为空");
+ }
} else {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
}
diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
index 52bf72e2a..d1cfbc4fe 100644
--- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
@@ -28,21 +28,23 @@
+
+
`id`,`tenant_id`,`parent_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`,
- `produce_type`,`produce_id`,`page_path`,`page_scene`
+ `produce_type`,`produce_id`,`page_path`,`page_scene`,`go_appid`
- `id`,`tenant_id`,`parent_tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`type`,`sort_num`,`page_path`
+ `id`,`tenant_id`,`parent_tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`type`,`sort_num`,`page_path`,`go_appid`
`id`,`tenant_id`,`parent_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`,`page_path`
+ `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`page_path`,`go_appid`