账号增加激活码链接

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

@@ -133,6 +133,11 @@ public class Account extends BaseEntity {
      */
     private String actCode;
 
+    /**
+     * 激活链接
+     */
+    private String actCodeUrl;
+
     /**
      * 谷歌身份认证器
      */

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

@@ -149,6 +149,13 @@ public class GroupsTrips {
     @TableField(exist = false)
     private String actCode;
 
+    /**
+     * 激活链接
+     */
+    @DbField("a.act_code_url")
+    @TableField(exist = false)
+    private String actCodeUrl;
+
     @DbField("a.email")
     @TableField(exist = false)
     private String email;

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

@@ -207,6 +207,12 @@ public class AccountView {
     @DbField("a.act_code")
     private String actCode;
 
+    /**
+     * 激活链接
+     */
+    @DbField("a.act_code_url")
+    private String actCodeUrl;
+
     /**
      * 谷歌身份认证器
      */

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

@@ -47,6 +47,12 @@ public class GroupsRelationBackView {
 	@DbField("a.act_code")
 	private String actCode;
 
+	/**
+	 * 激活链接
+	 */
+	@DbField("a.act_code_url")
+	private String actCodeUrl;
+
 	@DbField("if(a.api_secret='',false,true)")
 	private Boolean isVerify;
 

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

@@ -396,6 +396,12 @@ public class RenewalView {
     @DbField("a.act_code")
     private String actCode;
 
+    /**
+     * 激活链接
+     */
+    @DbField("a.act_code_url")
+    private String actCodeUrl;
+
     /**
      * 分类id
      */

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

@@ -364,7 +364,7 @@
     </select>
 
     <select id="getGroupRelationAccountView" resultType="com.cyksj.model.manage.views.GroupsRelationBackView">
-        select s.account, a.account as tripsAccount,a.act_code
+        select s.account, a.account as tripsAccount,a.act_code,a.act_code_url
         from (select groups_id, account from groups_relation where id = #{relationId} limit 1) s
                  inner join groups_trips gt on gt.id = s.groups_id
                  left join account a on a.id = gt.account_id

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

@@ -3708,9 +3708,17 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 			UserDistributeShared userDistributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class).eq(UserDistributeShared::getUserId, userId).last("limit 1"));
 			if (userDistributeShared != null) {
-				if (Constant.NO_DS_USER_ID.equals(userDistributeShared.getSharedId())) {
-					log.info("用户:{}不参与分销", Constant.NO_DS_USER_ID);
-					return;
+				try {
+					SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class).eq(SysConfig::getSysKey, Constant.NO_DS_USER_ID).last("limit 1"));
+					if (config != null) {
+						List<Long> noDsUserIds = Jsons.parseList(config.getSysValue(), Long.class);
+						if (noDsUserIds.contains(userDistributeShared.getSharedId())) {
+							log.info("用户:{}不参与分销", Constant.NO_DS_USER_ID);
+							return;
+						}
+					}
+				} catch (Exception e) {
+
 				}
 				orderDon.setIsDistribute(true);
 				UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class).eq(UserDistribute::getUserId, userDistributeShared.getSharedId()).eq(UserDistribute::getDeleted, 1));