updated

service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java

@@ -42,20 +42,20 @@ import com.jiejing.fos.api.vo.ResourceInfoVO;
 import com.jiejing.message.enums.MsgChannelEnum;
 import com.jiejing.message.enums.MsgChannelEnum;
 import com.jiejing.message.event.SendCommonMsgEvent;
 import com.jiejing.message.event.SendCommonMsgEvent;
 import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
 import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
-import com.jiejing.paycenter.common.enums.merchant.SubChannelOpenTypeEnums;
-import com.jiejing.paycenter.common.event.MerchantSubChannelEvent;
-import com.jiejing.paycenter.common.model.request.SubChannelConfigInfo;
-import com.jiejing.paycenter.common.model.vo.AuthSubChannelVO;
-import com.jiejing.paycenter.common.model.vo.ConfigSubChannelVO;
-import com.jiejing.paycenter.common.model.vo.MerchantVO;
-import com.jiejing.paycenter.common.model.vo.SubChannelAuthVO;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelConfigTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelConfigTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
+import com.jiejing.paycenter.common.enums.merchant.SubChannelOpenTypeEnums;
 import com.jiejing.paycenter.common.event.MerchantEvent;
 import com.jiejing.paycenter.common.event.MerchantEvent;
+import com.jiejing.paycenter.common.event.MerchantSubChannelEvent;
 import com.jiejing.paycenter.common.model.request.ResourceInfo;
 import com.jiejing.paycenter.common.model.request.ResourceInfo;
+import com.jiejing.paycenter.common.model.request.SubChannelConfigInfo;
+import com.jiejing.paycenter.common.model.vo.AuthSubChannelVO;
+import com.jiejing.paycenter.common.model.vo.ConfigSubChannelVO;
+import com.jiejing.paycenter.common.model.vo.MerchantVO;
+import com.jiejing.paycenter.common.model.vo.SubChannelAuthVO;
 import com.jiejing.paycenter.common.model.vo.SubChannelConfigVO;
 import com.jiejing.paycenter.common.model.vo.SubChannelConfigVO;
 import com.jiejing.paycenter.common.model.vo.SubChannelVO;
 import com.jiejing.paycenter.common.model.vo.SubChannelVO;
 import com.jiejing.studio.api.studio.vo.StudioVO;
 import com.jiejing.studio.api.studio.vo.StudioVO;
@@ -63,9 +63,7 @@ import com.jiejing.wechat.WeXcxService;
 import com.jiejing.wechat.vo.xcx.HalfScreenXcxAuthVO;
 import com.jiejing.wechat.vo.xcx.HalfScreenXcxAuthVO;
 import com.jiejing.wechat.vo.xcx.HalfScreenXcxAuthVO.AuthXcxInfo;
 import com.jiejing.wechat.vo.xcx.HalfScreenXcxAuthVO.AuthXcxInfo;
 import com.xiaomai.event.EventAgent;
 import com.xiaomai.event.EventAgent;
-import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -78,7 +76,6 @@ import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;