suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-02-27 14:19:02 +08:00
parent 46c6243fd0
commit dc448aebbf
1 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -26,6 +26,8 @@ import com.cool.store.utils.RedisUtilPool;
import com.cool.store.utils.poi.DateUtils;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.utils.poi.constant.Constants;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -151,7 +153,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
throw new ServiceException(ErrorCodeEnum.SHOP_ID_NOT_EXIST);
}
SignFranchiseDO isExist = signFranchiseMapper.selectByShopId(request.getShopId());
if (Objects.nonNull(isExist) && Objects.isNull(request.getId())){
if (Objects.nonNull(isExist) && Objects.isNull(request.getId())) {
throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION);
}
String lockKey = "submitSignFranchise:" + request.getShopId();
@@ -175,15 +177,15 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84);
//初始化数据
preparationService.contractAndBuildStoreCompletion(request.getShopId());
commonService.sendSms(lineInfoDO.getMobile(),SMSMsgEnum.SIGN_CONTRACT);
commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SIGN_CONTRACT);
HashMap<String, String> map = new HashMap<>();
map.put("partnerUsername",lineInfoDO.getUsername());
map.put("partnerMobile",lineInfoDO.getMobile());
map.put("storeName",shopInfoDO.getShopName());
map.put("partnerUsername", lineInfoDO.getUsername());
map.put("partnerMobile", lineInfoDO.getMobile());
map.put("storeName", shopInfoDO.getShopName());
List<EnterpriseUserDO> userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId());
List<String> finances = new ArrayList<>();
if (Objects.nonNull(userDOList)){
finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())) ;
if (Objects.nonNull(userDOList)) {
finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
}
commonService.sendQWMessage(finances,
MessageEnum.MESSAGE_34,
@@ -204,7 +206,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
shopInfoDO.setDetailAddress(request.getDetailAddress());
shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO);
return new ResponseResult(200000,"提交成功");
return new ResponseResult(200000, "提交成功");
} else {
throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION);
}
@@ -221,7 +223,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
}
@Override
public AddSignFranchiseResponse getSignFranchise(Long shopId) {
SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId);
@@ -238,7 +239,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
response.setResult(shopAuditInfoDO.getRejectReason());
}
}
if (signFranchiseDO!=null){
if (signFranchiseDO != null) {
response.setResultTime(signFranchiseDO.getCreateTime());
}
return response;
@@ -290,14 +291,14 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
}
addSignFranchiseResponse.setStoreName(shopInfoDO.getShopName());
if (Objects.nonNull(regionInfo)){
if (Objects.nonNull(regionInfo)) {
addSignFranchiseResponse.setRegionId(shopInfoDO.getRegionId());
addSignFranchiseResponse.setRegionName(regionInfo.getName());
}
if (Objects.nonNull(pointInfoDO)) {
addSignFranchiseResponse.setStoreAddress(pointInfoDO.getAddress());
if (StringUtils.isNoneBlank(pointInfoDO.getLatitude(), pointInfoDO.getLongitude())){
if (StringUtils.isNoneBlank(pointInfoDO.getLatitude(), pointInfoDO.getLongitude())) {
GeoMapUtil.AddressInfo addressInfo = GeoMapUtil.reverseGeoCoding(pointInfoDO.getLatitude(), pointInfoDO.getLongitude());
addSignFranchiseResponse.setStoreProvinceCity(String.format("%s%s%s", addressInfo.getProvince(), addressInfo.getCity(), addressInfo.getDistrict()));
}
@@ -307,14 +308,20 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setBankCardNo(linePayDO.getPayAccount());
addSignFranchiseResponse.setBank(linePayDO.getBankName());
addSignFranchiseResponse.setSubBank(linePayDO.getBranchBankName());
addSignFranchiseResponse.setPayDate(linePayDO.getPayTime());
if (Objects.nonNull(linePayDO.getPayTime())) {
addSignFranchiseResponse.setPayDate(linePayDO.getPayTime());
} else {
List<Date> payTimeList = JsonToDate(linePayDO.getCombinedField());
Collections.sort(payTimeList);
addSignFranchiseResponse.setPayDate(payTimeList.get(0));
}
}
if (Objects.nonNull(licenseTransactDO)) {
addSignFranchiseResponse.setLicenseName(licenseTransactDO.getBusinessLicense());
addSignFranchiseResponse.setOpeAddress(licenseTransactDO.getLicenseAddress());
addSignFranchiseResponse.setOperator(licenseTransactDO.getOperator());
addSignFranchiseResponse.setLicenseCode(licenseTransactDO.getCreditCode());
if (licenseTransactDO.getLicenseType()!=null){
if (licenseTransactDO.getLicenseType() != null) {
addSignFranchiseResponse.setType(LicenseTypeEnum.match(licenseTransactDO.getLicenseType()).getMessage());
}
}
@@ -374,4 +381,24 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
}
}
private List<Date> JsonToDate(String json) {
ObjectMapper mapper = new ObjectMapper();
// 解析JSON字符串为JsonNode对象
JsonNode jsonNode = null;
try {
jsonNode = mapper.readTree(json);
List<Date> payTimeList = new ArrayList<>();
// 遍历数组节点
for (JsonNode node : jsonNode) {
long payTime = node.get("payTime").asLong();
// 将时间戳转换为Date对象
Date date = new Date(payTime);
payTimeList.add(date);
}
return payTimeList;
} catch (Exception e) {
log.info("解析加盟费缴纳时间json失败");
throw new RuntimeException(e);
}
}
}