Commit e5a213b0 by guojuxing

接口更新

parent a150317f
package com.gic.enterprise.service.outer.impl;
import java.util.Date;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.UserDTO;
......@@ -12,20 +19,14 @@ import com.gic.enterprise.service.AccountStandardService;
import com.gic.enterprise.service.BillingAccountService;
import com.gic.enterprise.service.BillingInternationalSmsRecordService;
import com.gic.enterprise.service.InternationalSmsRecordApiService;
import com.gic.member.api.dto.AssistStoreDTO;
import com.gic.member.api.dto.MemberUserDTO;
import com.gic.member.api.dto.UserOwnerDTO;
import com.gic.member.api.service.MemberUserApiService;
import com.gic.member.api.service.UserAscriptionApiService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.store.dto.StoreDTO;
import com.gic.store.service.StoreApiService;
import com.gic.store.utils.valid.ValidUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
/**
*
......@@ -119,11 +120,11 @@ public class InternationalSmsRecordApiServiceImpl implements InternationalSmsRec
}
private void setStore(InternationalSmsRecordDTO smsRecordDTO) {
ServiceResponse<UserOwnerDTO> userOwnerResp = userAscriptionApiService.getUserMaxOwner(smsRecordDTO.getEnterpriseId(), smsRecordDTO.getEcuId(), 1, smsRecordDTO.getMemberCardId(), null);
ServiceResponse<AssistStoreDTO> userOwnerResp = userAscriptionApiService.getMaxAssistStore(smsRecordDTO.getEnterpriseId(), smsRecordDTO.getEcuId(), smsRecordDTO.getMemberCardId(), null);
if (userOwnerResp.isSuccess()) {
UserOwnerDTO userOwnerDTO = userOwnerResp.getResult();
AssistStoreDTO userOwnerDTO = userOwnerResp.getResult();
if (userOwnerDTO != null) {
ServiceResponse<StoreDTO> storeResp = storeApiService.getStoreById(smsRecordDTO.getEnterpriseId(), Integer.valueOf(userOwnerDTO.getOwnerId()));
ServiceResponse<StoreDTO> storeResp = storeApiService.getStoreByStoreInfoId(smsRecordDTO.getEnterpriseId(), Integer.valueOf(userOwnerDTO.getStoreInfoId()));
if (storeResp.isSuccess()) {
StoreDTO storeDTO = storeResp.getResult();
if (storeDTO != null) {
......
package com.gic.enterprise.service.outer.impl;
import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.redisson.api.RAtomicLong;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.UserDTO;
......@@ -17,22 +26,14 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.*;
import com.gic.enterprise.utils.SmsUtils;
import com.gic.member.api.dto.AssistStoreDTO;
import com.gic.member.api.dto.MemberUserDTO;
import com.gic.member.api.dto.UserOwnerDTO;
import com.gic.member.api.service.MemberUserApiService;
import com.gic.member.api.service.UserAscriptionApiService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.store.dto.StoreDTO;
import com.gic.store.service.StoreApiService;
import com.gic.store.utils.valid.ValidUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.redisson.api.RAtomicLong;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
/**
*
......@@ -202,11 +203,11 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
}
private void setStore(SmsRecordDTO smsRecordDTO) {
ServiceResponse<UserOwnerDTO> userOwnerResp = userAscriptionApiService.getUserMaxOwner(smsRecordDTO.getEnterpriseId(), smsRecordDTO.getEcuId(), 1, smsRecordDTO.getMemberCardId(), null);
ServiceResponse<AssistStoreDTO> userOwnerResp = userAscriptionApiService.getMaxAssistStore(smsRecordDTO.getEnterpriseId(), smsRecordDTO.getEcuId(), smsRecordDTO.getMemberCardId(), null);
if (userOwnerResp.isSuccess()) {
UserOwnerDTO userOwnerDTO = userOwnerResp.getResult();
AssistStoreDTO userOwnerDTO = userOwnerResp.getResult();
if (userOwnerDTO != null) {
ServiceResponse<StoreDTO> storeResp = storeApiService.getStoreById(smsRecordDTO.getEnterpriseId(), Integer.valueOf(userOwnerDTO.getOwnerId()));
ServiceResponse<StoreDTO> storeResp = storeApiService.getStoreByStoreInfoId(smsRecordDTO.getEnterpriseId(), Integer.valueOf(userOwnerDTO.getStoreInfoId()));
if (storeResp.isSuccess()) {
StoreDTO storeDTO = storeResp.getResult();
if (storeDTO != null) {
......
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