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

@@ -184,6 +184,18 @@ public class GoodsDon extends BaseEntity {
      */
     private String buyDesc;
 
+    /**
+     * 第三方购买链接
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String thirdPartyPurchaseUrl;
+
+    /**
+     * 第三方兑换网址
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String thirdExchangeUrl;
+
     /**
      * 特殊类型
      */

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSpuInsert.java

@@ -138,6 +138,16 @@ public class ReqGoodsSpuInsert {
 
     private String buyDesc;
 
+    /**
+     * 第三方购买链接
+     */
+    private String thirdPartyPurchaseUrl;
+
+    /**
+     * 第三方兑换网址
+     */
+    private String thirdExchangeUrl;
+
     private GoodsDon.SpecialType specialType;
 
 

netflix-dao/src/main/java/com/cyksj/model/manage/views/GoodsDonViewer.java

@@ -191,6 +191,12 @@ public class GoodsDonViewer {
     @DbField("g.buy_desc")
     private String buyDesc;
 
+    @DbField("g.third_exchange_url")
+    private String thirdExchangeUrl;
+
+    @DbField("g.third_party_purchase_url")
+    private String thirdPartyPurchaseUrl;
+
     @DbField("g.special_type")
     private GoodsDon.SpecialType specialType;
 

netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonCategoryDetailView.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @SearchBean(tables = "goods_don g left join goods_don_category_relate gcr on gcr.goods_id = g.id" +
 		" left join goods_don_category gc on gc.id = gcr.category",
 		where = ":condition:",
-		groupBy = "g.id,g.title,g.status,g.deleted,g.logo,g.type,g.sort_by,g.virtual_sold,g.created_time,g.update_time")
+		groupBy = "g.id,g.title,g.status,g.deleted,g.logo,g.type,g.sort_by,g.virtual_sold,g.created_time,g.update_time,g.third_party_purchase_url,g.third_exchange_url")
 public class GoodsDonCategoryDetailView {
 	@DbField("g.id")
 	private Long id;
@@ -63,6 +63,12 @@ public class GoodsDonCategoryDetailView {
 	@DbField("g.virtual_sold")
 	private Integer virtualSold;
 
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
 	@DbField("g.special_type")
 	private String specialType;
 

netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonDetailFrontView.java

@@ -1,6 +1,7 @@
 package com.cyksj.model.views;
 
 import com.cyksj.model.entity.GoodsDon;
+import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
@@ -103,6 +104,18 @@ public class GoodsDonDetailFrontView {
 	 */
 	private String payDesc;
 
+	/**
+	 * 第三方兑换网址
+	 */
+	@DbField("third_exchange_url")
+	private String thirdExchangeUrl;
+
+	/**
+	 * 第三方购买链接
+	 */
+	@DbField("third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
 	/**
 	 * 特殊类型
 	 */

netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonSubsidyDetailView.java

@@ -110,6 +110,12 @@ public class GoodsDonSubsidyDetailView {
 	@DbField("g.buy_desc")
 	private String buyDesc;
 
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
 	@DbField("g.detail")
 	private String detail;
 

netflix-dao/src/main/java/com/cyksj/model/views/GoodsDonViews.java

@@ -1,6 +1,7 @@
 package com.cyksj.model.views;
 
 import com.cyksj.model.entity.GoodsDon;
+import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
@@ -102,6 +103,18 @@ public class GoodsDonViews {
      */
     private String payDesc;
 
+    /**
+     * 第三方兑换网址
+     */
+    @DbField("third_exchange_url")
+    private String thirdExchangeUrl;
+
+    /**
+     * 第三方购买链接
+     */
+    @DbField("third_party_purchase_url")
+    private String thirdPartyPurchaseUrl;
+
     /**
      * 特殊类型
      */
@@ -141,4 +154,4 @@ public class GoodsDonViews {
 
     @DbIgnore
     private OrderCommentFrontView comments;
-}
+}

netflix-dao/src/main/java/com/cyksj/model/views/GoodsFrontListCategoryView.java

@@ -153,6 +153,12 @@ public class GoodsFrontListCategoryView {
 	@DbField("g.pay_desc")
 	private String payDesc;
 
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
 	/**
 	 * 是否是特定价格平台
 	 */

netflix-dao/src/main/java/com/cyksj/model/views/GoodsFrontListView.java

@@ -137,6 +137,12 @@ public class GoodsFrontListView {
 	@DbField("g.buy_desc")
 	private String buyDesc;
 
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
 	/**
 	 * 是否是特定价格平台
 	 */

netflix-dao/src/main/java/com/cyksj/model/views/GoodsHomePageView.java

@@ -90,9 +90,15 @@ public class GoodsHomePageView {
 	@DbField("g.pay_desc")
 	private String payDesc;
 
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
 	/**
 	 * 购买通知信息
 	 */
 	@DbIgnore
 	private String notifyMsg;
-}
+}

netflix-dao/src/main/java/com/cyksj/model/views/HomeManagementFrontView.java

@@ -251,6 +251,12 @@ public class HomeManagementFrontView {
 	@DbField("g.pay_desc")
 	private String payDesc;
 
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
 	/**
 	 * 是否是特定价格平台
 	 */
@@ -283,4 +289,4 @@ public class HomeManagementFrontView {
 	 */
 	@DbIgnore
 	private Boolean isGptGift = false;
-}
+}

netflix-dao/src/main/java/com/cyksj/model/views/RenewalView.java

@@ -65,6 +65,18 @@ public class RenewalView {
     @DbField("sku.spec_val")
     private String specVal;
 
+    /**
+     * 第三方兑换网址
+     */
+    @DbField("g.third_exchange_url")
+    private String thirdExchangeUrl;
+
+    /**
+     * 第三方购买链接
+     */
+    @DbField("g.third_party_purchase_url")
+    private String thirdPartyPurchaseUrl;
+
     /**
      * 是否禁止奈飞检测
      */

netflix-dao/src/main/java/com/cyksj/model/views/TicketView.java

@@ -38,6 +38,12 @@ public class TicketView {
 	@DbField("gdk.spec_val")
 	private String specVal;
 
+	/**
+	 * 第三方兑换网址
+	 */
+	@DbField("gd.third_exchange_url")
+	private String thirdExchangeUrl;
+
 	/**
 	 * 主账号
 	 */

netflix-dao/src/main/java/com/cyksj/model/views/UserTicketView.java

@@ -37,6 +37,18 @@ public class UserTicketView {
 	@DbField("gdk.spec_val")
 	private String specVal;
 
+	/**
+	 * 第三方兑换网址
+	 */
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
+	/**
+	 * 第三方购买链接
+	 */
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
 	@DbField("gdk.num")
 	private Integer skuNum;
 

netflix-dao/src/main/java/com/cyksj/model/views/YhShopGoodsFrontCategoryView.java

@@ -111,6 +111,12 @@ public class YhShopGoodsFrontCategoryView {
 	@DbField("g.pay_desc")
 	private String payDesc;
 
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
 	/**
 	 * 是否是特定价格平台
 	 */

netflix-dao/src/main/java/com/cyksj/model/views/YhShopGoodsFrontView.java

@@ -122,6 +122,12 @@ public class YhShopGoodsFrontView {
 	@DbField("g.buy_desc")
 	private String buyDesc;
 
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
 	/**
 	 * 是否是特定价格平台
 	 */

netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -446,6 +446,8 @@
         gt.sku_id,
         g.title,
         gdk.spec_val,
+        g.third_exchange_url,
+        g.third_party_purchase_url,
         gr.expiry_time,
         gdk.is_mirror,
         gdk.gpt_limit_num as gptUserLimitNum,
@@ -502,4 +504,4 @@
         group by gur.operator
         order by num desc
     </select>
-</mapper>
+</mapper>

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -1110,7 +1110,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				.field("condition", String.format("(gr.expiry_time is null or gr.expiry_time > '%s')", DateTime.now()))
 				.field(RenewalView::getStatus, List.of("validity", "outside")).op(Operator.InList)
 				.orderBy(RenewalView::getExpiryTime).asc()
-				.onlySelect(RenewalView::getRelationId, RenewalView::getExpiryTime, RenewalView::getTitle, RenewalView::getSpecVal, RenewalView::getGoodsId, RenewalView::getSkuId, RenewalView::getSkuNum, RenewalView::getSkuStatus, RenewalView::getGoodsStatus)
+				.onlySelect(RenewalView::getRelationId, RenewalView::getExpiryTime, RenewalView::getTitle, RenewalView::getSpecVal, RenewalView::getThirdExchangeUrl, RenewalView::getGoodsId, RenewalView::getSkuId, RenewalView::getSkuNum, RenewalView::getSkuStatus, RenewalView::getGoodsStatus)
 				.build());
 		if (renewalView != null) {
 			renewalView.setExpiryTimeStr(DateUtil.format(renewalView.getExpiryTime(), "yyyy-MM-dd"));