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

Merge branch 'cc_20250526_douyin' into 'master'

Browse Source 
Cc 20250526 douyin

See merge request hangzhou/java/custom_zxjp!99
This commit is contained in:
苏竹红
2025-05-27 05:48:35 +00:00
parent 575e927d68 0d64beab84
commit 865cfdc857
7 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml
View File

@@ -30,6 +30,7 @@
<result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
<result property="poi" column="poi" jdbcType="VARCHAR"/>
<result property="storeId" column="store_id" jdbcType="VARCHAR"/>
<result property="dyMobile" column="dy_mobile" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
@@ -40,6 +41,6 @@
settler_bank_name,
account,store_positioning_url,authorization_url,
create_time,update_time,create_user,
update_user,poi,store_id
update_user,poi,store_id,dy_mobile
</sql>
</mapper>

6
coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java
View File

@@ -158,4 +158,10 @@ public class PlatformBuildDO {
@Column(name = "store_id")
private String storeId;
/**
* 抖音核销手机号
*/
@Column(name = "dy_mobile")
private String dyMobile;
}

5
coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java
View File

@@ -81,6 +81,10 @@ public class PlatformBuildRequest {
@Length(max = 250, message = "快手平台账号 长度不能超过250")
private String ksAccount;
@ApiModelProperty("抖音核销手机号")
private String dyMobile;
public PlatformBuildDO toDO() {
PlatformBuildDO platformBuildDO = new PlatformBuildDO();
@@ -99,6 +103,7 @@ public class PlatformBuildRequest {
platformBuildDO.setStorePositioningUrl(this.storePositioningUrl);
platformBuildDO.setAuthorizationUrl(this.authorizationUrl);
platformBuildDO.setKsAccount(this.ksAccount);
platformBuildDO.setDyMobile(this.dyMobile);
return platformBuildDO;
}

2
coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java
View File

@@ -38,7 +38,7 @@ public class ThreeAcceptanceRequest {
private String shopInteriorPhoto;
public Boolean miniCheck(){
if (StringUtils.isAnyBlank(this.ksAccount,this.verificationPhone,this.shopLocationScreenshots)){
if (StringUtils.isAnyBlank(this.shopLocationScreenshots)){
return false;
}
return true;

2
coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java
View File

@@ -126,7 +126,7 @@ public class ZxjpApiRequest {
@ApiModelProperty(value = "门店详细地址")
private String shopAddress;
@ApiModelProperty(value = "核销手机号")
@ApiModelProperty(value = "抖音核销手机号")
private String verificationMobile;
@ApiModelProperty(value = "快手号")

2
coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java
View File

@@ -100,6 +100,8 @@ public class PlatformBuildResponse {
private String shopProvinceCityDistrict;
@ApiModelProperty("门店详细地址")
private String shopAddress;
@ApiModelProperty("抖音核销手机号")
private String dyMobile;
}

20
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
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;
}