Procházet zdrojové kódy

bug

release_toaliyun_real
xhxu před 5 roky
rodič
revize
b24ed3b714
5 změnil soubory, kde provedl 17 přidání a 3 odebrání
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V202012080001__wx_campaign.sql
  2. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
  4. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java
  5. +5
    -3
      mallinkService/src/main/resources/mapper/WxCampaignMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V202012080001__wx_campaign.sql Zobrazit soubor

@@ -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`;

+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java Zobrazit soubor

@@ -1,6 +1,7 @@
package com.iformall.controller; package com.iformall.controller;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.annotation.RedisCache;
import com.iformall.annotation.TenantIgnore; import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.Result; import com.iformall.common.Result;
@@ -32,6 +33,7 @@ public class WxMiniappThemeController extends BaseController {
@Autowired @Autowired
WxMiniappThemeService wxMiniappThemeService; WxMiniappThemeService wxMiniappThemeService;


@RedisCache
@ApiOperation("查询MiniappTheme列表") @ApiOperation("查询MiniappTheme列表")
@GetMapping(value = "/getOne") @GetMapping(value = "/getOne")
@TenantIgnore @TenantIgnore


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java Zobrazit soubor

@@ -73,6 +73,8 @@ public class WxCampaign extends TenantEntity {
private String pagePath; private String pagePath;
@io.swagger.annotations.ApiModelProperty(value = "小程序跳转二维码,类型3适用", name = "pageScene") @io.swagger.annotations.ApiModelProperty(value = "小程序跳转二维码,类型3适用", name = "pageScene")
private String pageScene; private String pageScene;
@io.swagger.annotations.ApiModelProperty(value = "小程序跳转路径,类型4适用", name = "goAppid")
private String goAppid;


@TableField(exist = false) @TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="营销物料-小程序路径",name="weappPath") @io.swagger.annotations.ApiModelProperty(value="营销物料-小程序路径",name="weappPath")


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java Zobrazit soubor

@@ -122,6 +122,9 @@ public class WxCampaignServiceImpl implements WxCampaignService {
if (StringUtils.isBlank(wxCampaign.getCoverImg())) { if (StringUtils.isBlank(wxCampaign.getCoverImg())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "封面图不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "封面图不能为空");
} }
if (StringUtils.isBlank(wxCampaign.getGoAppid())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "小程序跳转路径不能为空");
}
}else { }else {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
} }
@@ -352,6 +355,9 @@ public class WxCampaignServiceImpl implements WxCampaignService {
if (StringUtils.isBlank(wxCampaign.getCoverImg())) { if (StringUtils.isBlank(wxCampaign.getCoverImg())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "封面图不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "封面图不能为空");
} }
if (StringUtils.isBlank(wxCampaign.getGoAppid())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "小程序跳转路径不能为空");
}
} else { } else {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
} }


+ 5
- 3
mallinkService/src/main/resources/mapper/WxCampaignMapper.xml Zobrazit soubor

@@ -28,21 +28,23 @@
<result column="produce_id" jdbcType="BIGINT" property="produceId"/> <result column="produce_id" jdbcType="BIGINT" property="produceId"/>
<result column="page_path" jdbcType="BIGINT" property="pagePath"/> <result column="page_path" jdbcType="BIGINT" property="pagePath"/>
<result column="page_scene" jdbcType="BIGINT" property="pageScene"/> <result column="page_scene" jdbcType="BIGINT" property="pageScene"/>

<result column="go_appid" jdbcType="VARCHAR" property="goAppid"/>
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`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`, `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`, `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`
</sql> </sql>


<sql id="allCHeadColumns"> <sql id="allCHeadColumns">
`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`
</sql> </sql>


<sql id="allAHeadColumns"> <sql id="allAHeadColumns">
`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`, `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`
</sql> </sql>


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


Načítá se…
Zrušit
Uložit