Merge remote-tracking branch 'origin/developer' into developerE

# Conflicts:
#	src/main/java/com/caimei365/order/controller/PayNonOrderApi.java
#	src/main/java/com/caimei365/order/service/PayNonOrderService.java
#	src/main/resources/mapper/PayOrderMapper.xml

src/main/java/com/caimei365/order/controller/PayNonOrderApi.java

@@ -471,5 +471,4 @@ public class PayNonOrderApi {
         }
         return payNonOrderService.authVipCheck(vipRecordId);
     }
-
 }

src/main/java/com/caimei365/order/service/PayNonOrderService.java

@@ -110,6 +110,7 @@ public interface PayNonOrderService {
     ResponseJson couponCheck(Integer recordId);
 
     ResponseJson vipCheck(Integer recordId);
+
     /**
      * 开通认证通会员-微信线上支付
      * @param payVipDto {

src/main/java/com/caimei365/order/service/impl/PayNonOrderServiceImpl.java

@@ -1317,8 +1317,8 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
             if (authVip.getBeginTime().compareTo(beginTime) >= 0) {
                 // 删除原有角色关联
                 payOrderMapper.deleteAuthVipRoleRelation(userId);
-                // 续费重新分配角色
-                saveRoleRelation(userId, "1,2");
+                // 会员过期重新分配角色
+                saveRoleRelation(userId, "1");
             }
         } else {
             // 新增会员信息
@@ -1326,7 +1326,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
             // 删除原有角色关联
             payOrderMapper.deleteAuthVipRoleRelation(userId);
             // 分配角色
-            saveRoleRelation(userId, "1,2");
+            saveRoleRelation(userId, "1");
         }
         // 修改会员历史记录支付状态
         VipRecordBo record = payOrderMapper.getAuthVipRecord(recordId);