Merge branch 'cc_20250526_douyin' into 'master'

Cc 20250526 douyin

See merge request hangzhou/java/custom_zxjp!99
This commit is contained in:
苏竹红
2025-05-27 05:48:35 +00:00
7 changed files with 33 additions and 7 deletions

View File

@@ -9,6 +9,7 @@ import com.cool.store.entity.*;
import com.cool.store.enums.DownSystemTypeEnum;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.FranchiseBrandEnum;
import com.cool.store.enums.PlatformBuildEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.ApplyLicenseMapper;
import com.cool.store.mapper.SignFranchiseMapper;
@@ -64,6 +65,8 @@ public class SyncDataServiceImpl implements SyncDataService {
private PointInfoDAO pointInfoDAO;
@Resource
private EnterpriseUserDAO enterpriseUserDAO;
@Resource
private PlatformBuildDAO platformBuildDAO;
@Override
public ZxjpApiRequest getData(Long shopId, DownSystemTypeEnum systemType) {
@@ -99,6 +102,10 @@ public class SyncDataServiceImpl implements SyncDataService {
String investmentManager = enterpriseUserDAO.getUserName(shopInfo.getInvestmentManager());
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId);
//抖音
PlatformBuildDO dyPlatformBuildDO = platformBuildDAO.selectOneByShopId(shopId, PlatformBuildEnum.DOU_YIN.getCode());
//快手
PlatformBuildDO ksPlatformBuildDO = platformBuildDAO.selectOneByShopId(shopId, PlatformBuildEnum.KUAI_SHOU.getCode());
request.setPartnerIdCardNo(qualificationsInfoDO.getIdCardNo());
request.setShopAddress(shopInfo.getDetailAddress());
@@ -154,7 +161,8 @@ public class SyncDataServiceImpl implements SyncDataService {
request.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName());
}
request.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
request.setDeclareGoodsDate(JSONUtils.parseToListOrMap(orderSysInfoDO.getDeclareGoodsDate(), new TypeReference<List<DeclareGoodsDateDTO>>() {}));
request.setDeclareGoodsDate(JSONUtils.parseToListOrMap(orderSysInfoDO.getDeclareGoodsDate(), new TypeReference<List<DeclareGoodsDateDTO>>() {
}));
request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName());
request.setReceivingMSBankAccount(orderSysInfoDO.getReceivingMsBankAccount());
request.setReceivingMSBankBranch(orderSysInfoDO.getReceivingMsBankBranch());
@@ -167,8 +175,12 @@ public class SyncDataServiceImpl implements SyncDataService {
request.setShopInteriorPhoto(getUrlList(acceptanceInfoDO.getShopInteriorPhoto()));
request.setShopLocationScreenshots(getUrl(acceptanceInfoDO.getShopLocationScreenshots()));
request.setVerificationMobile(acceptanceInfoDO.getVerificationMobile());
request.setKsAccount(acceptanceInfoDO.getKsAccount());
}
if (dyPlatformBuildDO != null) {
request.setVerificationMobile(dyPlatformBuildDO.getDyMobile());
}
if (ksPlatformBuildDO != null) {
request.setKsAccount(ksPlatformBuildDO.getKsAccount());
}
if (buildInformationDO != null) {
request.setBusinessHours(buildInformationDO.getBusinessHours());
@@ -219,7 +231,7 @@ public class SyncDataServiceImpl implements SyncDataService {
request.setShopProvince(pointInfo.getProvince());
request.setShopCity(pointInfo.getCity());
}
log.info("/pushData 数据 {}",JSONObject.toJSONString(request));
log.info("/pushData 数据 {}", JSONObject.toJSONString(request));
return request;
}