xhxu 5 лет назад
Родитель
Сommit
efea311b18
3 измененных файлов: 34 добавлений и 2 удалений
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java
  2. +3
    -1
      mallinkService/src/main/resources/mapper/TtCouponMapper.xml
  3. +27
    -0
      mallinkTTAdmin/src/main/java/com/iformall/controller/basic/UeditorController.java

+ 4
- 1
mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java Просмотреть файл

@@ -60,6 +60,9 @@ public class TtCoupon extends TenantEntity {
private String videoId;
@io.swagger.annotations.ApiModelProperty(value="视频时长(秒)",name="videoTime")
private String videoTime;
@io.swagger.annotations.ApiModelProperty(value="",name="videoUrl")
private String videoUrl;


@io.swagger.annotations.ApiModelProperty(value="富文本内容",name="html")
private String html;
@@ -75,7 +78,7 @@ public class TtCoupon extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="原价",name="origPrice")
private Integer origPrice;

@io.swagger.annotations.ApiModelProperty(value="是否可预览",name="isPreview")
@io.swagger.annotations.ApiModelProperty(value="是否可预览",name="isPreview")//弃用
private Integer isPreview;
@io.swagger.annotations.ApiModelProperty(value="预览时长",name="previewDuration")
private Integer previewDuration;


+ 3
- 1
mallinkService/src/main/resources/mapper/TtCouponMapper.xml Просмотреть файл

@@ -13,6 +13,8 @@
<result column="sub_title" jdbcType="VARCHAR" property="subTitle"/>
<result column="video_id" jdbcType="VARCHAR" property="videoId"/>
<result column="video_time" jdbcType="VARCHAR" property="videoTime"/>
<result column="video_url" jdbcType="VARCHAR" property="videoUrl"/>

<result column="html" jdbcType="VARCHAR" property="html"/>
<result column="is_landscape" jdbcType="INTEGER" property="isLandscape"/>
<result column="is_payment" jdbcType="INTEGER" property="isPayment"/>
@@ -46,7 +48,7 @@

<sql id="allColumns">
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.`video_id`, c.`video_time`, c.`html`, c.`is_landscape`, c.`is_payment`,
c.`title`, c.`sub_title`, c.`video_id`, c.`video_time`,c.`video_url` c.`html`, c.`is_landscape`, c.`is_payment`,
c.`sale_price`, c.`orig_price`, c.`is_preview`, c.`preview_duration`, c.`detail`, c.`false_sell_count`,
c.`dy_title`, c.`inventory`, c.`remark`, c.`status`, c.`create_date`, c.`update_date`,
c.`see_count`, c.`sell_count`, c.`assess_count`, c.`collect_count`, c.`is_del`,


+ 27
- 0
mallinkTTAdmin/src/main/java/com/iformall/controller/basic/UeditorController.java Просмотреть файл

@@ -0,0 +1,27 @@
package com.iformall.controller.basic;

import com.iformall.ueditor.ActionEnter;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;


@RestController
@RequestMapping("/ue")
@Api(description = "网页bannner图接口")
public class UeditorController {

@Autowired
private ActionEnter actionEnter;

@ResponseBody
@RequestMapping("/ueditor/exec")
public Object exe(HttpServletRequest request){
return actionEnter.exec(request);
}

}

Загрузка…
Отмена
Сохранить