邀请制代充账号绑定

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -501,4 +501,10 @@ public interface Constant {
 	 * 善愿支付宝id
 	 */
 	String SY_SHOP_ID = "2021004146676727";
+
+	/**
+	 * 代充邀请制平台
+	 * 声破天 油管
+	 */
+	List<Long> RECHARGE_INVITE_GOODS_IDS = List.of(4l, 5l);
 }

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

@@ -52,6 +52,16 @@ public class GroupsRelation extends BaseEntity {
 
     private RechargeStatus rechargeStatus;
 
+    /**
+     * 邀请制家庭组链接
+     */
+    private String inviteLink;
+
+    /**
+     * 联系方式
+     */
+    private String contact;
+
     /**
      * 续费意愿处理状态
      */

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

@@ -57,6 +57,12 @@ public class GroupsRelationRechargeView {
 	@DbField("gr.recharge_status")
 	private GroupsRelation.RechargeStatus rechargeStatus;
 
+	/**
+	 * 家庭组邀请链接
+	 */
+	@DbField("gr.invite_link")
+	private String inviteLink;
+
 	@DbField("g.id")
 	private Long goodsId;
 
@@ -69,6 +75,12 @@ public class GroupsRelationRechargeView {
 	@DbField("gdk.spec_val")
 	private String specVal;
 
+	/**
+	 * 座位数
+	 */
+	@DbField("gdk.num")
+	private Integer skuNUm;
+
 	@DbField("g.special_type")
 	private GoodsDon.SpecialType specialType;
 }

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

@@ -165,6 +165,18 @@ public class RenewalView {
     @DbField("gr.recharge_status")
     private GroupsRelation.RechargeStatus rechargeStatus;
 
+    /**
+     * 家庭组邀请链接
+     */
+    @DbField("gr.invite_link")
+    private String inviteLink;
+
+    /**
+     * 联系方式
+     */
+    @DbField("gr.contact")
+    private String contact;
+
     @DbIgnore
     private String orderNo;
     @DbIgnore

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

@@ -19,7 +19,9 @@
         operator = null,
         yhs_id = 0,
         cmt = 0,
-        aq_type = 1
+        aq_type = 1,
+        invite_link = null,
+        contact = null
         where id = #{entity.id}
         <if test="expireTime != null">
             and expiry_time = #{expireTime}

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

@@ -1641,7 +1641,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				if (relation.getCmt() == 2 && relation.getYhsId() == 0) {
 					relation.setCmt(0);
 				}
-				if (goodsDon.getSpecialType() != null && goodsDon.getSpecialType() == GoodsDon.SpecialType.recharge) {
+				//代充平台以及部分邀请制平台
+				//需填写账号
+				if ((goodsDon.getSpecialType() != null && goodsDon.getSpecialType() == GoodsDon.SpecialType.recharge) || Constant.RECHARGE_INVITE_GOODS_IDS.contains(order.getGoodsId())) {
 					relation.setRechargeStatus(GroupsRelation.RechargeStatus.waiting);
 					relation.setSubmitTime(DateTime.now());
 				}

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -181,6 +181,7 @@ public class GroupRelationController {
         LambdaUpdateWrapper<GroupsRelation> updateWrapper = Wrappers.lambdaUpdate(GroupsRelation.class)
                 .set(GroupsRelation::getAccount, relation.getAccount())
                 .set(GroupsRelation::getPassword, relation.getPassword())
+                .set(GroupsRelation::getContact, relation.getContact())
                 .eq(GroupsRelation::getId, relation.getId());
         if (re.getRechargeStatus() != null) {
             if (re.getRechargeStatus() == GroupsRelation.RechargeStatus.complete) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -119,6 +119,8 @@ public class CmsGroupRelationController {
         }
         relation.setRechargeStatus(rechargeStatus);
         relation.setOperator(cmsUser.getNickname());
+        //邀请制家庭组链接
+        relation.setInviteLink(rechargeView.getInviteLink());
         if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
             relation.setSendTime(DateTime.now());
             OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)