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

Merge branch 'cc_20250325_select' into 'master'

Browse Source 
Cc 20250325 select

See merge request hangzhou/java/custom_zxjp!61
This commit is contained in:
苏竹红
2025-04-18 06:04:17 +00:00
parent ee7ccc0cde e59d602356
commit 28f9ff3d8a
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,6 +192,9 @@ public class ZxjpApiRequest {
@ApiModelProperty(value = "报货物流仓库(编码)")
private String declareGoodsLogisticsWarehouse ;
@ApiModelProperty(value = "报货物流仓库" )
private String declareGoodsLogisticsWarehouseName;
@ApiModelProperty(value = "报货类型 0-按周报货 1-按月报货 2-自提" )
private String declareGoodsType;

29
coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
View File

@@ -94,7 +94,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
// Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId());
// lineInfoParam.setRegionId(regionId);
// }
if (StringUtils.isBlank(lineInfoParam.getInvestmentManager())) {
if (StringUtils.isBlank(lineInfoParam.getInvestmentManager()) &&StringUtils.isBlank(lineInfoDO.getInvestmentManager())) {
lineInfoParam.setFranchiseBrand(String.valueOf(FranchiseBrandEnum.ZXJP.getCode()));
lineInfoParam.setLineStatus(0);
}else{
@@ -163,10 +163,25 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
if (Objects.isNull(byLineId)) {
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
}
if (Objects.isNull(result)) {
return new PartnerBaseInfoVO();
PartnerBaseInfoVO response = new PartnerBaseInfoVO();
response.setSupervisorId(byLineId.getInvestmentManager());
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(byLineId.getInvestmentManager());
if (Objects.nonNull(enterpriseUserDO)) {
response.setSupervisorName(enterpriseUserDO.getName());
response.setSupervisorMobile(enterpriseUserDO.getMobile());
}
PartnerBaseInfoVO response = PartnerBaseInfoVO.from(result, byLineId);
if (Objects.isNull(result)) {
return response;
}
response = PartnerBaseInfoVO.from(result, byLineId);
if (response != null) {
response.setSupervisorId(byLineId.getInvestmentManager());
if (Objects.nonNull(enterpriseUserDO)) {
response.setSupervisorName(enterpriseUserDO.getName());
response.setSupervisorMobile(enterpriseUserDO.getMobile());
}
}
HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(Long.valueOf(response.getAreaCode()));
response.setArea(openAreaInfoDO.getAreaPath());
if (Objects.nonNull(result.getAuditId())) {
@@ -177,12 +192,6 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
response.setRejectPublicReason(lineAuditInfoDO.getRejectPublicReason());
}
response.setBigRegionId(byLineId.getBigRegionId());
response.setSupervisorId(byLineId.getInvestmentManager());
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(byLineId.getInvestmentManager());
if (Objects.nonNull(enterpriseUserDO)) {
response.setSupervisorName(enterpriseUserDO.getName());
response.setSupervisorMobile(enterpriseUserDO.getMobile());
}
return response;
}

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.cool.store.enums.FranchiseBrandEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.ApplyLicenseMapper;
import com.cool.store.mapper.SignFranchiseMapper;
import com.cool.store.mapper.WarehouseInfoMapper;
import com.cool.store.request.ZxjpApiRequest;
import com.cool.store.service.SyncDataService;
import com.cool.store.utils.JSONUtils;
@@ -39,6 +40,8 @@ import java.util.stream.Collectors;
@Service
public class SyncDataServiceImpl implements SyncDataService {
@Resource
private WarehouseInfoMapper warehouseInfoMapper;
@Resource
private ShopInfoDAO shopInfoDAO;
@Resource
@@ -144,6 +147,10 @@ public class SyncDataServiceImpl implements SyncDataService {
request.setAddresseeDistrict(orderSysInfoDO.getAddresseeDistrict());
request.setAddresseeAddress(orderSysInfoDO.getAddresseeAddress());
request.setDeclareGoodsLogisticsWarehouse(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse());
WarehouseInfoDO warehouseInfoDO = warehouseInfoMapper.getByCode(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse());
if (Objects.nonNull(warehouseInfoDO)) {
request.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName());
}
request.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
request.setDeclareGoodsDate(JSONUtils.parseToListOrMap(orderSysInfoDO.getDeclareGoodsDate(), new TypeReference<List<DeclareGoodsDateDTO>>() {}));
request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName());