diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java index 685d3b7ca..67900d1ef 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java @@ -82,9 +82,9 @@ public class AftersalesPersonResponsibleEntity extends TenantEntity { @ApiModelProperty(value = "责任比例") private String responsibilityRatio; /** - * 类型 + * 类型 1 正常 2三方责任人 */ - @ApiModelProperty(value = "类型") + @ApiModelProperty(value = "类型 1 正常 2三方责任人") private String typesOf; /** * 区别 @@ -104,6 +104,7 @@ public class AftersalesPersonResponsibleEntity extends TenantEntity { /** * 三方预计责任人 */ + @ApiModelProperty(value = "三方预计责任人") private String tripartite; /** * 责任方ID diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java index 4c1e23cc1..dc6744c13 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java @@ -45,6 +45,7 @@ public class AftersalesAbnormalPackageVO extends AftersalesAbnormalPackageEntity private String second; //二级品 private String mallName; //客户名称 private Long mallId; //客户ID + private String typeServiceName; //客户服务类型名称 diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java index 51f75674a..528226264 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java @@ -23,6 +23,8 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 门店业务记录 Feign接口类 * @@ -50,4 +52,11 @@ public interface IBasicdataStoreBusinessClient { @GetMapping(API_PREFIX+"/findByClientIdAndTypeService") BasicdataStoreBusinessEntity findByClientIdAndTypeService(@RequestParam Long clientEntityId,@RequestParam Integer typeService); + /** + * 查询商场服务类型 + * + * @param clientId + * @return + */ + List findByClientIdList(@RequestParam Long clientId); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java index f09da09a2..872bda1aa 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java @@ -23,10 +23,15 @@ import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel; import com.logpm.aftersales.mapper.AftersalesAbnormalPackageMapper; import com.logpm.aftersales.service.IAftersalesAbnormalPackageService; +import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataClientClient; +import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import lombok.AllArgsConstructor; +import org.springblade.common.constant.DictBizConstant; import org.springblade.core.log.exception.ServiceException; +import org.springblade.system.cache.DictBizCache; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -45,6 +50,7 @@ import java.util.Map; public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl implements IAftersalesAbnormalPackageService { private final IBasicdataWarehouseClient warehouseClient; + private final IBasicdataStoreBusinessClient basicdataStoreBusinessClient; @Override public IPage selectAftersalesAbnormalPackagePage(IPage page, AftersalesAbnormalPackageVO aftersalesAbnormalPackage) { @@ -75,8 +81,22 @@ public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl abnormalPackage = baseMapper.getAbnormalPackage(aftersalesAbnormalPackageEntity); + abnormalPackage.forEach(i ->{ + //查询客户合作信息 + if(ObjectUtils.isNotNull(i.getMallId())){ + List byClientIdList = basicdataStoreBusinessClient.findByClientIdList(i.getMallId()); + if(!byClientIdList.isEmpty()){ + StringBuffer stringBu = new StringBuffer(); + byClientIdList.forEach(a ->{ + String value = DictBizCache.getValue( DictBizConstant.DISTRIBUTION_TYPE,a.getTypeService()); + stringBu.append(value); + }); + i.setTypeServiceName(stringBu.toString()); + } + } + }); + return abnormalPackage; } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index aa33baa69..55731b46f 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -404,8 +404,12 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl{ AftersalesPersonResponsibleEntity personResponsibleEntity = new AftersalesPersonResponsibleEntity(); BeanUtil.copyProperties(i , personResponsibleEntity); + if(ObjectUtils.isNotNull(personResponsibleEntity.getPersonResponsibleId()) ){ + personResponsibleEntity.setTypesOf("1"); + }else{ + personResponsibleEntity.setTypesOf("2"); + } personResponsibleEntity.setDifference("1"); - personResponsibleEntity.setTypesOf("1"); personResponsibleEntity.setWordOrderId(aftersalesWorkOrder.getId()); personResponsibleList.add(personResponsibleEntity); }); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java index a050f227f..bf0c1478b 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBusinessClient.java @@ -18,6 +18,7 @@ package com.logpm.basicdata.feign; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; import com.logpm.basicdata.service.IBasicdataStoreBusinessService; import lombok.AllArgsConstructor; @@ -28,6 +29,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 门店业务记录 Feign实现类 * @@ -59,4 +62,12 @@ public class BasicdataStoreBusinessClient implements IBasicdataStoreBusinessClie return basicdataStoreBusinessService.getOne(queryWrapper); } + @Override + public List findByClientIdList(Long clientId) { + return basicdataStoreBusinessService.list(Wrappers.query().lambda() + .eq(BasicdataStoreBusinessEntity::getClientId,clientId) + ); + } + + }