Commit a34cd3d3 by guojuxing

联合商户资源组引用维护调整

parent 3d593377
......@@ -251,6 +251,12 @@
<artifactId>poi-ooxml</artifactId>
<version>3.12</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-popup-sdk</artifactId>
<version>${gic-popup-sdk}</version>
</dependency>
</dependencies>
<build>
......
......@@ -14,11 +14,16 @@ import com.gic.enterprise.utils.ExecutorPoolSingleton;
import com.gic.marketing.process.api.service.sms.SmsSendApiService;
import com.gic.member.config.api.service.AuthorizationEnterConfApiService;
import com.gic.member.config.api.service.UserGroupPermissionApiService;
import com.gic.popup.config.InitPopupConfig;
import com.gic.popup.config.PopupUtil;
import com.gic.popup.dto.PopupDTO;
import com.gic.popup.dto.RelationBusinessInfoDTO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
......@@ -56,6 +61,7 @@ import com.gic.store.service.StoreAuthorizationApiService;
* @date 2021/2/3 1:52 PM

*/
@Service("unionEnterpriseAuthApiService")
@Import(value = InitPopupConfig.class)
public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApiService{
private static Logger LOGGER = LogManager.getLogger(UnionEnterpriseAuthApiServiceImpl.class);
@Autowired
......@@ -136,6 +142,8 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
//
checkResourceDealing((old.getUnionEnterpriseAuthId()));
saveRefer(old.getUnionEnterpriseAuthId(), resourceGroupId);
unionEnterpriseAuthService.update(data);
//初始化未授权资源数据
unionEnterpriseAuthResDetailService.initUnionEnterpriseAuthResDetail(old.getUnionEnterpriseAuthId());
......@@ -216,7 +224,6 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
dto.setUnionEnterpriseAuthId(old.getUnionEnterpriseAuthId());
dto.setStatusFlag(UnionEnterpriseAuthStatusEnum.TO_DO_RELIEVE.getCode());
unionEnterpriseAuthService.update(dto);
//资源状态
unionEnterpriseAuthResDetailService.relieveUnion(old.getUnionEnterpriseAuthId());
return ServiceResponse.success();
......@@ -574,4 +581,15 @@ public class UnionEnterpriseAuthApiServiceImpl implements UnionEnterpriseAuthApi
return (int) ((endDateTime - startDateTime) / (1000 * 3600 * 24));
}
private void saveRefer(Integer businessId, Integer resourceGroupId) {
PopupDTO popupDTO = new PopupDTO();
popupDTO.setBusinessId(Long.valueOf(businessId));
popupDTO.setBusinessName("联合商户");
popupDTO.setBusinessType(12);
popupDTO.setRelationBusinessIdList(new RelationBusinessInfoDTO(11, Long.valueOf(resourceGroupId)));
ServiceResponse response = PopupUtil.savePopupLog(popupDTO);
LOGGER.info("联合商户保存数据引用结果:{}", JSON.toJSONString(response));
}
}
......@@ -16,10 +16,13 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.exception.CommonException;
import com.gic.enterprise.service.*;
import com.gic.marketing.process.api.service.sms.SmsSendApiService;
import com.gic.popup.config.InitPopupConfig;
import com.gic.popup.config.PopupUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Service;
import javax.validation.constraints.NotNull;
......@@ -37,6 +40,7 @@ import java.util.stream.Collectors;
* @date 2021/2/8 10:27 AM

*/
@Service("unionEnterpriseAuthResDetailApiService")
@Import(value = InitPopupConfig.class)
public class UnionEnterpriseAuthResDetailApiServiceImpl implements UnionEnterpriseAuthResDetailApiService{
private static Logger LOGGER = LogManager.getLogger(UnionEnterpriseAuthResDetailApiServiceImpl.class);
@Autowired
......@@ -111,6 +115,9 @@ public class UnionEnterpriseAuthResDetailApiServiceImpl implements UnionEnterpri
//更新最新联合时间()
dto.setLastRelieveTime(new Date());
dto.setStatusFlag(UnionEnterpriseAuthStatusEnum.RELIEVED.getCode());
//删除联合商户资源组引用
PopupUtil.deletePopupLog(old.getOwnEnterpriseId(), Long.valueOf(old.getResourceGroupId()), 11);
} else {
dto.setStatusFlag(UnionEnterpriseAuthStatusEnum.RELIEVING.getCode());
}
......
......@@ -219,6 +219,12 @@
<artifactId>gic-spark-run-api</artifactId>
<version>${gic-spark-run-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-popup-sdk</artifactId>
<version>${gic-popup-sdk}</version>
</dependency>
</dependencies>
<build>
......
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