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

/、专题

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
72425a5766
6 измененных файлов: 33 добавлений и 5 удалений
  1. +8
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java
  2. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/WxTopicService.java
  5. +9
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
  6. +9
    -2
      mallinkService/src/main/resources/mapper/WxTopicMapper.xml

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

@@ -26,6 +26,14 @@ public class WxTopicController extends BaseController {
return new ResultData(wxTopicService.show(wxTopic));
}

@GetMapping("showList")
public ResultData showList() {
logger.debug("[" + getIpAddr() + "] WxTopicController::showList");
WxTopic wxTopic = new WxTopic();
wxTopic.updateTenantInfo(getTenantInfo());
return new ResultData(wxTopicService.showList(wxTopic));
}

@GetMapping("findById")
public ResultData findById(WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::findById");


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

@@ -68,9 +68,6 @@ public class WxTopic extends TenantEntity {
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline")
private Integer isOnline;
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="couponChannelId渠道ID",name="couponChannelId")
private Long couponChannelId;

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


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java Просмотреть файл

@@ -12,8 +12,10 @@ public interface WxTopicMapper extends CommonMapper<WxTopic, String> {
List<WxTopic> findExist(WxTopic wxTopic);

WxTopic show(WxTopic record);
List<WxTopic> showList(WxTopic record);

void updateStatus(WxTopic record);

void couponDownLine(WxTopic record);

}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/WxTopicService.java Просмотреть файл

@@ -5,6 +5,8 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.WxTopic;
import com.iformall.enums.EnumPayWay;

import java.util.List;

public interface WxTopicService {

/**
@@ -20,6 +22,9 @@ public interface WxTopicService {
ResultData saveOrUpdate(WxTopic record);

WxTopic show(WxTopic record);
List<WxTopic> showList(WxTopic record);

WxTopic findById(WxTopic record);


}

+ 9
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java Просмотреть файл

@@ -68,6 +68,15 @@ public class WxTopicServiceImpl implements WxTopicService {
return wxTopic;
}

@Override
public List<WxTopic> showList(WxTopic record) {
List<WxTopic> topicList = wxTopicMapper.showList(record);
for (WxTopic topic:topicList) {
topic.setCouponList(wxCouponMapper.findCouponByTopic(record));
}
return topicList;
}

@Override
public ResultData saveOrUpdate(WxTopic record) {
//验证是否存在已发放的专题


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

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

</resultMap>

@@ -83,13 +82,21 @@
</select>

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

<select id="showList" parameterType="com.iformall.domain.po.WxTopic" resultMap="BaseResultMap">
select t.* from wx_topic t
where t.status = 1
and now() >= t.begin_time and now() &lt;= t.end_time
and t.tenant_id = #{tenantId}
order by t.begin_time desc
</select>

<update id="updateStatus" parameterType="com.iformall.domain.po.WxTopic">
update wx_topic set status = 3 where id in(
select t.id from (


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