Commit 582237fc by 徐高华

Merge branch 'master-xgh-好办停用' into 'developer'

Master xgh 好办停用

See merge request !244
parents e7a28d35 285111ff
...@@ -196,6 +196,8 @@ ...@@ -196,6 +196,8 @@
<dubbo:reference interface="com.gic.marketing.api.service.AccountOverdueSmsSendService" id="accountOverdueSmsSendService" timeout="10000" retries="0"/> <dubbo:reference interface="com.gic.marketing.api.service.AccountOverdueSmsSendService" id="accountOverdueSmsSendService" timeout="10000" retries="0"/>
<dubbo:reference interface="com.gic.thirdparty.api.service.VoiceService" id="voiceService" timeout="10000" retries="0"/> <dubbo:reference interface="com.gic.thirdparty.api.service.VoiceService" id="voiceService" timeout="10000" retries="0"/>
<dubbo:reference interface="com.gic.thirdparty.api.service.CommunicationService" id="communicationService" timeout="10000" retries="0"/> <dubbo:reference interface="com.gic.thirdparty.api.service.CommunicationService" id="communicationService" timeout="10000" retries="0"/>
<dubbo:reference interface="com.gic.member.api.service.MemberEntranceApiService" id="memberEntranceApiService" timeout="10000" retries="0"/> <dubbo:reference interface="com.gic.member.api.service.MemberEntranceApiService" id="memberEntranceApiService" timeout="10000" retries="0"/>
</beans> </beans>
\ No newline at end of file
...@@ -361,7 +361,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -361,7 +361,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
if(StringUtils.isNotEmpty(gicEnterpriseId)) { if(StringUtils.isNotEmpty(gicEnterpriseId)) {
if(this.wxEnterpriseApiService.haobanIsStop(gicEnterpriseId)) { if(this.wxEnterpriseApiService.haobanIsStop(gicEnterpriseId)) {
HaobanResponse response = new HaobanResponse() ; HaobanResponse response = new HaobanResponse() ;
response.setErrorCode(-1); response.setErrorCode(-888);
String msg = this.wxEnterpriseApiService.getEndDate(gicEnterpriseId) ; String msg = this.wxEnterpriseApiService.getEndDate(gicEnterpriseId) ;
response.setMessage(msg); response.setMessage(msg);
response.setDetailError(msg); response.setDetailError(msg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment