Merge branch 'master' into pre

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

@@ -85,6 +85,18 @@ 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,6 +47,16 @@ public class ReqGoodsSkuInsert {
          */
         private String detail;
 
+        /**
+         * 第三方购买链接
+         */
+        private String thirdPartyPurchaseUrl;
+
+        /**
+         * 第三方兑换网址
+         */
+        private String thirdExchangeUrl;
+
         /**
          * 规格说明信息
          */

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

@@ -76,6 +76,18 @@ 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,6 +98,18 @@ 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,6 +44,12 @@ 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/RenewalView.java

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

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

@@ -37,6 +37,12 @@ public class UserTicketView {
 	@DbField("gdk.spec_val")
 	private String specVal;
 
+	/**
+	 * 第三方兑换网址
+	 */
+	@DbField("gdk.third_exchange_url")
+	private String thirdExchangeUrl;
+
 	@DbField("gdk.num")
 	private Integer skuNum;
 

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

@@ -35,6 +35,18 @@ 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/YhShopGoodsSkuFrontView.java

@@ -73,6 +73,18 @@ 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,6 +446,7 @@
         gt.sku_id,
         g.title,
         gdk.spec_val,
+        gdk.third_exchange_url,
         gr.expiry_time,
         gdk.is_mirror,
         gdk.gpt_limit_num as gptUserLimitNum,
@@ -502,4 +503,4 @@
         group by gur.operator
         order by num desc
     </select>
-</mapper>
+</mapper>

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

@@ -2263,21 +2263,21 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				//TODO 如未发车逻辑
 				groupsRelationMapper.updateById(relation);
 				Account account = null;
-				if (envCommonService.isPrdEnv() && order.getOrderType() == 2) {
-					//ChatGPT plus 独立和Midjourney 独立有人续费了发短信
-					if (Constant.AI_goodsIds.contains(order.getGoodsId()) && sku.getNum() == 1) {
-						try {
-							String accountStr = StrUtil.EMPTY;
-							account = accountMapper.selectById(groupsTrips.getAccountId());
-							if (account != null) {
-								accountStr = account.getAccount();
-							}
-							String renew_msg = String.format(Constant.AI_RENEW_MSG, order.getUserId(), goodsDon.getTitle(), sku.getSpecVal(), accountStr);
-							SmsUtil.sendLuoKey2Msg(Constant.SERVICE_PHONE, renew_msg);
-						} catch (Exception e) {
-						}
-					}
-				}
+//				if (envCommonService.isPrdEnv() && order.getOrderType() == 2) {
+//					//ChatGPT plus 独立和Midjourney 独立有人续费了发短信
+//					if (Constant.AI_goodsIds.contains(order.getGoodsId()) && sku.getNum() == 1) {
+//						try {
+//							String accountStr = StrUtil.EMPTY;
+//							account = accountMapper.selectById(groupsTrips.getAccountId());
+//							if (account != null) {
+//								accountStr = account.getAccount();
+//							}
+//							String renew_msg = String.format(Constant.AI_RENEW_MSG, order.getUserId(), goodsDon.getTitle(), sku.getSpecVal(), accountStr);
+//							SmsUtil.sendLuoKey2Msg(Constant.SERVICE_PHONE, renew_msg);
+//						} catch (Exception e) {
+//						}
+//					}
+//				}
 				//GPT 代充 发送短信通知
 //				if (envCommonService.isPrdEnv() && order.getGoodsId() == 40l) {
 //					try {