Merge branch 'master' into pre

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/entity/GoodsDonSku.java

@@ -85,18 +85,6 @@ public class GoodsDonSku extends BaseEntity {
      */
     private String detail;
 
-    /**
-     * 第三方购买链接
-     */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String thirdPartyPurchaseUrl;
-
-    /**
-     * 第三方兑换网址
-     */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String thirdExchangeUrl;
-
     /**
      * 标签
      */

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

@@ -47,16 +47,6 @@ public class ReqGoodsSkuInsert {
          */
         private String detail;
 
-        /**
-         * 第三方购买链接
-         */
-        private String thirdPartyPurchaseUrl;
-
-        /**
-         * 第三方兑换网址
-         */
-        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,9 @@ public class GoodsDonViewer {
     @DbField("g.buy_desc")
     private String buyDesc;
 
+    @DbField("g.third_exchange_url")
+    private String thirdExchangeUrl;
+
     @DbField("g.special_type")
     private GoodsDon.SpecialType 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/GoodsDonSkuFrontView.java

@@ -76,18 +76,6 @@ public class GoodsDonSkuFrontView {
 	 */
 	private String detail;
 
-	/**
-	 * 第三方购买链接
-	 */
-	@DbField("sku.third_party_purchase_url")
-	private String thirdPartyPurchaseUrl;
-
-	/**
-	 * 第三方兑换网址
-	 */
-	@DbField("sku.third_exchange_url")
-	private String thirdExchangeUrl;
-
 	/**
 	 * 标签
 	 */

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

@@ -98,18 +98,6 @@ public class GoodsDonSkuSubsidyDetailView {
 	@DbField("sku.detail")
 	private String detail;
 
-	/**
-	 * 第三方购买链接
-	 */
-	@DbField("sku.third_party_purchase_url")
-	private String thirdPartyPurchaseUrl;
-
-	/**
-	 * 第三方兑换网址
-	 */
-	@DbField("sku.third_exchange_url")
-	private String thirdExchangeUrl;
-
 	/**
 	 * 付款说明
 	 */

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

@@ -44,12 +44,6 @@ public class GoodsDonSkuView {
 	@DbField("gdk.spec_json")
 	private String specJson;
 
-	@DbField("gdk.third_party_purchase_url")
-	private String thirdPartyPurchaseUrl;
-
-	@DbField("gdk.third_exchange_url")
-	private String thirdExchangeUrl;
-
 	@DbField("gdk.days")
 	private Integer days;
 

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

@@ -68,9 +68,15 @@ public class RenewalView {
     /**
      * 第三方兑换网址
      */
-    @DbField("sku.third_exchange_url")
+    @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/UserTicketView.java

@@ -40,9 +40,15 @@ public class UserTicketView {
 	/**
 	 * 第三方兑换网址
 	 */
-	@DbField("gdk.third_exchange_url")
+	@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/VipGoodsSkuFrontView.java

@@ -35,18 +35,6 @@ public class VipGoodsSkuFrontView {
 	@DbField("sku.spec_val")
 	private String specVal;
 
-	/**
-	 * 第三方购买链接
-	 */
-	@DbField("sku.third_party_purchase_url")
-	private String thirdPartyPurchaseUrl;
-
-	/**
-	 * 第三方兑换网址
-	 */
-	@DbField("sku.third_exchange_url")
-	private String thirdExchangeUrl;
-
 	/**
 	 * 价格
 	 */

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/java/com/cyksj/model/views/YhShopGoodsSkuFrontView.java

@@ -73,18 +73,6 @@ public class YhShopGoodsSkuFrontView {
 	@DbField("sku.detail")
 	private String detail;
 
-	/**
-	 * 第三方购买链接
-	 */
-	@DbField("sku.third_party_purchase_url")
-	private String thirdPartyPurchaseUrl;
-
-	/**
-	 * 第三方兑换网址
-	 */
-	@DbField("sku.third_exchange_url")
-	private String thirdExchangeUrl;
-
 	/**
 	 * 付款说明
 	 */

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

@@ -446,7 +446,8 @@
         gt.sku_id,
         g.title,
         gdk.spec_val,
-        gdk.third_exchange_url,
+        g.third_exchange_url,
+        g.third_party_purchase_url,
         gr.expiry_time,
         gdk.is_mirror,
         gdk.gpt_limit_num as gptUserLimitNum,