From 43327a3c32d6bc082f97ab2dbc488b4a17edabd4 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 18 Apr 2025 11:07:01 +0800 Subject: [PATCH 1/6] fix --- .../main/java/com/cool/store/request/ZxjpApiRequest.java | 3 +++ .../com/cool/store/service/impl/SyncDataServiceImpl.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java index aae46d8db..916f5fa05 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java @@ -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; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 3f0acebbe..3c819649b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -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>() {})); request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName()); From 74bf1e13c7243a6f35a9fe3b8d09c89fb914d44a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 18 Apr 2025 11:44:33 +0800 Subject: [PATCH 2/6] fix --- .../com/cool/store/service/impl/JoinIntentionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 1502a6674..2a22a16ee 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -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{ From b37f5763765b46ec03c67825d7d496eb5184562f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 18 Apr 2025 12:17:38 +0800 Subject: [PATCH 3/6] fix --- .../service/impl/JoinIntentionServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 2a22a16ee..dfa6a6ea5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -163,10 +163,18 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt if (Objects.isNull(byLineId)) { throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } + 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()); + } if (Objects.isNull(result)) { + PartnerBaseInfoVO partnerBaseInfoVO = new PartnerBaseInfoVO(); return new PartnerBaseInfoVO(); } - PartnerBaseInfoVO response = PartnerBaseInfoVO.from(result, byLineId); + response = PartnerBaseInfoVO.from(result, byLineId); HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(Long.valueOf(response.getAreaCode())); response.setArea(openAreaInfoDO.getAreaPath()); if (Objects.nonNull(result.getAuditId())) { @@ -177,12 +185,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; } From 5b2da32ca71ecca9dc5b7e6fc2aa26ce219b794f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 18 Apr 2025 12:19:47 +0800 Subject: [PATCH 4/6] fix --- .../com/cool/store/service/impl/JoinIntentionServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index dfa6a6ea5..73b785f95 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -171,8 +171,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt response.setSupervisorMobile(enterpriseUserDO.getMobile()); } if (Objects.isNull(result)) { - PartnerBaseInfoVO partnerBaseInfoVO = new PartnerBaseInfoVO(); - return new PartnerBaseInfoVO(); + return response; } response = PartnerBaseInfoVO.from(result, byLineId); HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(Long.valueOf(response.getAreaCode())); From 65f0bc0c933fa94f1e179ced2fc7db4f8785c667 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 18 Apr 2025 13:00:21 +0800 Subject: [PATCH 5/6] fix --- .../store/service/impl/JoinIntentionServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 73b785f95..2842a3cbd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -173,7 +173,14 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt if (Objects.isNull(result)) { return response; } - response = PartnerBaseInfoVO.from(result, byLineId); + 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())) { From e59d602356dab0949d12aa3632b173f79555b8b4 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 18 Apr 2025 13:00:47 +0800 Subject: [PATCH 6/6] fix --- .../store/service/impl/JoinIntentionServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 2842a3cbd..faf54f668 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -176,11 +176,12 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt response = PartnerBaseInfoVO.from(result, byLineId); if (response != null) { response.setSupervisorId(byLineId.getInvestmentManager()); + if (Objects.nonNull(enterpriseUserDO)) { + response.setSupervisorName(enterpriseUserDO.getName()); + response.setSupervisorMobile(enterpriseUserDO.getMobile()); + } } - 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())) {