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());