diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 98350420f..8c0d21b94 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -451,8 +451,8 @@ hpli.development_manager as developmentManager, hpli.line_status as lineStatus, hpli.update_time as updateTime, - hpii.want_shop_area as wantShopArea, - hpii.accept_adjust_type as acceptAdjustType, + hpuinfo.want_shop_area as wantShopArea, + hpuinfo.accept_adjust_type as acceptAdjustType, hpuinfo.username as partnerUserName, hpuinfo.mobile as partnerUserPhone, hpuinfo.shop_name as storeName, diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index cf4c4d1ac..dfac7f58d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -346,8 +346,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { privateSeaLineListVo.setLineId(x.getLineId()); privateSeaLineListVo.setLineStatus(x.getLineStatus()); privateSeaLineListVo.setPartnerId(x.getPartnerId()); + privateSeaLineListVo.setWorkflowStatus(x.getWorkflowStatus()); privateSeaLineListVo.setDeadline(x.getDeadline()); privateSeaLineListVo.setPartnerUserPhone(x.getPartnerUserPhone()); + privateSeaLineListVo.setPartnerUserName(x.getPartnerUserName()); privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType()); privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManager()); privateSeaLineListVo.setDevelopmentManager(x.getDevelopmentManager()); @@ -355,7 +357,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { privateSeaLineListVo.setStoreCode(x.getStoreCode()); privateSeaLineListVo.setStoreName(x.getStoreName()); privateSeaLineListVo.setUpdateTime(x.getUpdateTime()); + privateSeaLineListVo.setDeadline(x.getDeadline()); privateSeaLineListVo.setRecommendPartnerId(x.getRecommendPartnerId()); + privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType()); + privateSeaLineListVo.setWantShopArea(x.getWantShopArea()); + privateSeaLineListVo.setInvestmentManager(x.getInvestmentManager()); privateSeaLineListVo.setRecommendPartnerName(x.getRecommendPartnerName()); privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage()); privateSeaLineListVo.setWantShopArea(x.getWantShopArea());