Просмотр исходного кода

[专题][修改][修改show逻辑]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
fd2e524af0
3 измененных файлов: 24 добавлений и 1 удалений
  1. +9
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java
  2. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java
  3. +4
    -1
      mallinkService/src/main/resources/mapper/WxTopicMapper.xml

+ 9
- 0
mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java Просмотреть файл

@@ -57,4 +57,13 @@ public class WxTopicController extends BaseController {
return wxTopicService.saveOrUpdate(wxTopic);
}

@GetMapping("show")
public ResultData show() {
logger.debug("[" + getIpAddr() + "] WxTopicController::show");
WxTopic wxTopic = new WxTopic();
String tenantId = getTenantId();
wxTopic.setTenantId(tenantId);
return new ResultData(wxTopicService.show(wxTopic));
}

}

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java Просмотреть файл

@@ -67,6 +67,17 @@ public class WxTopic implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline")
@Transient
private Integer isOnline;
@Transient
private Long couponChannelId;


public Long getCouponChannelId() {
return couponChannelId;
}

public void setCouponChannelId(Long couponChannelId) {
this.couponChannelId = couponChannelId;
}

public Integer getIsOnline() {
return isOnline;


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

@@ -15,6 +15,8 @@
<result column="createtime" property="createtime" />
<result column="updatetime" property="updatetime" />
<result column="bg_color" property="bgColor" />
<result column="couponChannelId" property="couponChannelId" />

</resultMap>

<sql id="allColumns">
@@ -56,7 +58,8 @@
</select>

<select id="show" parameterType="com.iformall.domain.po.WxTopic" resultMap="BaseResultMap">
select * from wx_topic t where t.status = 1
select t.*,cc.id as couponChannelId from wx_topic t left join wx_coupon_channel cc on(cc.sub_target_id = t.id)
where t.status = 1
and now() >= t.begin_time and now() &lt;= t.end_time
order by t.begin_time desc limit 1
</select>


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