diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java index af848df51..b338fe0bd 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/WarehouseInfoMapper.java @@ -15,4 +15,6 @@ import java.util.List; public interface WarehouseInfoMapper extends Mapper { List getAllAndActive(@Param("keyword") String keyword); + + WarehouseInfoDO getByCode(@Param("code") String code); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml index b25588537..ed40a8ffa 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/WarehouseInfoMapper.xml @@ -17,4 +17,7 @@ and ( warehouse_name like concat('%',#{keyword},'%')) + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java index 2730f0877..efc67da1c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java @@ -141,6 +141,9 @@ public class BuildInformationResponse { @ApiModelProperty(value = "报货物流仓库(编码)" ) private String declareGoodsLogisticsWarehouse; + @ApiModelProperty(value = "报货物流仓库" ) + private String declareGoodsLogisticsWarehouseName; + @ApiModelProperty(value = "报货日期" ) private String declareGoodsDate; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index d04fdbafe..630c3b445 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -10,6 +10,7 @@ import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.WarehouseInfoMapper; import com.cool.store.request.BuildInformationRequest; import com.cool.store.response.BuildInformationResponse; import com.cool.store.service.BuildInformationService; @@ -53,6 +54,8 @@ public class BuildInformationServiceImpl implements BuildInformationService{ private UserAuthMappingService userAuthMappingService; @Autowired private OrderSysInfoDAO orderSysInfoDAO; + @Resource + private WarehouseInfoMapper warehouseInfoMapper; @Override public BuildInformationResponse getBuildInformation(Long shopId) { BuildInformationResponse response = new BuildInformationResponse(); @@ -91,6 +94,8 @@ public class BuildInformationServiceImpl implements BuildInformationService{ response.setReceivingMsBankAccount(orderSysInfoDO.getReceivingMsBankAccount()); response.setReceivingMsBankBranch(orderSysInfoDO.getReceivingMsBankBranch()); response.setBankUnionPayAccount(orderSysInfoDO.getBankUnionPayAccount()); + WarehouseInfoDO warehouseInfoDO = warehouseInfoMapper.getByCode(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse()); + response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); } return response;