投放链接回传过滤平台属性

netflix-dao/src/main/java/com/cyksj/model/entity/ChannelPopularize.java

@@ -60,6 +60,12 @@ public class ChannelPopularize extends BaseEntity{
     @JsonIgnore
     private String couponIds;
 
+    /**
+     * 回传过滤平台
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String filterGoodsIds;
+
     @DbIgnore
     @TableField(exist = false)
     private List<CouponTfPopularizeView> coupons;

netflix-service/src/main/java/com/cyksj/service/order/OrderDonPostService.java

@@ -5,7 +5,7 @@ package com.cyksj.service.order;
  * @date 2023/5/16 11:05 AM
  */
 public interface OrderDonPostService {
-    void postData(Long orderId) throws Exception;
+    void postData(Long orderId, Long goodsId, Long popularizeId) throws Exception;
 
     void savePostData(Long orderId, String callback, String callbackType);
 

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonPostServiceImpl.java

@@ -1,16 +1,16 @@
 package com.cyksj.service.order.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cyksj.common.constant.Constant;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.mapper.OrderDonMapper;
-import com.cyksj.mapper.sys.SysConfigMapper;
+import com.cyksj.mapper.channel.ChannelPopularizeMapper;
 import com.cyksj.mapper.order.OrderDonPostMapper;
-import com.cyksj.model.entity.OrderDon;
+import com.cyksj.mapper.sys.SysConfigMapper;
+import com.cyksj.model.entity.ChannelPopularize;
 import com.cyksj.model.entity.OrderDonPost;
-import com.cyksj.model.entity.SysConfig;
 import com.cyksj.service.order.OrderDonPostService;
 import com.cyksj.service.order.post.AbstractPostDataService;
 import com.cyksj.service.order.post.PostDataFactory;
@@ -35,23 +35,23 @@ public class OrderDonPostServiceImpl extends ServiceImpl<OrderDonPostMapper, Ord
 
     private final SysConfigMapper sysConfigMapper;
 
+    private final ChannelPopularizeMapper channelPopularizeMapper;
+
     @Override
-    public void postData(Long orderId) throws Exception {
+    public void postData(Long orderId, Long goodsId, Long popularizeId) throws Exception {
         OrderDonPost orderPost = this.getOne(Wrappers.lambdaQuery(OrderDonPost.class).eq(OrderDonPost::getOrderId, orderId).eq(OrderDonPost::getStatus, Boolean.FALSE));
         if (orderPost == null) {
             log.info("post 数据 不了存在 id:{}", orderId);
             return;
         }
-        if (orderPost.getType() == OrderDonPost.Type.BaiDu) {
-            SysConfig baiduFilterConfig = sysConfigMapper.selectOne(Wrappers.lambdaQuery(SysConfig.class)
-                    .eq(SysConfig::getSysKey, Constant.BAIDU_POST_FILTER_GOODS_KEY).last("limit 1"));
-            if (baiduFilterConfig != null) {
-                String sysValue = baiduFilterConfig.getSysValue();
-                if (StrUtil.isNotBlank(sysValue)) {
-                    List<Long> baiduFilterGoods = Jsons.parseList(sysValue, Long.class);
-                    OrderDon orderDon = orderDonMapper.selectById(orderId);
-                    if (baiduFilterGoods.contains(orderDon.getGoodsId())) {
-                        log.info("baidu 不回传该商品. 该订单商品id:{}", orderDon.getGoodsId());
+        if (popularizeId != null) {
+            ChannelPopularize channelPopularize = channelPopularizeMapper.selectById(popularizeId);
+            if (channelPopularize != null) {
+                String filterGoodsIds = channelPopularize.getFilterGoodsIds();
+                if (StrUtil.isNotBlank(filterGoodsIds)) {
+                    List<Long> filterGoodsIdList = Jsons.parseList(filterGoodsIds, Long.class);
+                    if (CollUtil.isNotEmpty(filterGoodsIdList) && filterGoodsIdList.contains(goodsId)) {
+                        log.info("该条:{}投放链接 不回传该商品. 该订单商品id:{}", popularizeId, goodsId);
                         return;
                     }
                 }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -2342,7 +2342,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 		TASK_POOL.execute(()->{
 			try {
-				orderDonPostService.postData((orderDon.getId()));
+				orderDonPostService.postData(orderDon.getId(), orderDon.getGoodsId(), orderDon.getPopularizeId());
 			} catch (Exception e) {
 				log.error("回传错误 {}",StringUtil.getErrorText(e));
 			}