From 8bf0803ba7896e3baf7b9b568e137b96a919ae46 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 27 Jul 2023 17:29:38 +0800 Subject: [PATCH] //..coupon_ --- .../java/com/iformall/domain/po/WxCoupon.java | 8 +++++++ .../com/iformall/mapper/WxCouponMapper.java | 2 ++ .../service/impl/WxCouponServiceImpl.java | 21 ++++++++++++++++++- .../main/resources/mapper/WxCouponMapper.xml | 12 +++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 51d27c4c9..7d36ea8b4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -404,6 +404,14 @@ public class WxCoupon extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="描述",name="lastStatusDesc") private String lastStatusDesc; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="状态:0-审核中,1-上架,2-下架,3-审核拒绝 4-审核通过",name="poiStatus") + private Integer draftPoiStatus; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="描述",name="statusDesc") + private String draftStatusDesc; + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") private Integer isDel; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 816fbaa05..7c7d7cfbc 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -131,4 +131,6 @@ public interface WxCouponMapper extends CommonMapper { WxCoupon selectOnlineCoupon(@Param("id")Long id, @Param("tenantId")String tenantId); Long selectDraftId(@Param("couponId")Long id,@Param("tenantId")String tenantId); + + List findDraftStatus(@Param("tenantId")String tenantId, @Param("ids")List ids); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 4e492957b..810bbd6bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -188,6 +188,18 @@ public class WxCouponServiceImpl implements WxCouponService { } List ids = wxCouponList.stream().map(p -> p.getId()).collect(toList()); + + //处理抖音草稿数据 + Map draftStatusMap = new HashMap<>(); + if(EnumAppPlat.TOUTIAO.getCode().equals(wxCoupon.getPlat())){ + List draftStatus = wxCouponMapper.findDraftStatus(tenantEntity.getTenantId(),ids); + for (TtCouponVo vo:draftStatus) { + draftStatusMap.put(vo.getCouponId(),vo); + } + } + + + WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.updateTenantInfo(wxCoupon); wxCouponChannel.setCouponIds(ids); @@ -196,7 +208,14 @@ public class WxCouponServiceImpl implements WxCouponService { List list = wxCouponChannelMapper.findList(wxCouponChannel); if (!list.isEmpty()) { Map> groupBy = list.stream().collect(Collectors.groupingBy(WxCouponChannel::getCouponId)); - for (WxCoupon temp : wxCouponList) { + for (WxCoupon temp: wxCouponList) { + if(!draftStatusMap.isEmpty()){ + TtCouponVo draft = draftStatusMap.get(temp.getId()); + if(draft != null){ + temp.setDraftPoiStatus(draft.getPoiStatus()); + temp.setDraftStatusDesc(draft.getStatusDesc()); + } + } if (groupBy.get(temp.getId()) != null) { List channels = new ArrayList<>(); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index cf8c72338..52ad08ce7 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -1621,4 +1621,16 @@ where c.`version` = 1 and coupon_id = #{couponId} and tenant_id = #{tenantId} + +