提交 186f463b 作者: xiaowang

修复bug

上级 a683124b
...@@ -17,7 +17,6 @@ import com.mmc.pms.service.lease.LeaseGoodsService; ...@@ -17,7 +17,6 @@ import com.mmc.pms.service.lease.LeaseGoodsService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -87,9 +86,8 @@ public class LeaseGoodsController extends BaseController { ...@@ -87,9 +86,8 @@ public class LeaseGoodsController extends BaseController {
@ApiOperation(value = "feign-根据地址id查询是否有商品绑定") @ApiOperation(value = "feign-根据地址id查询是否有商品绑定")
@GetMapping("feignLeaseGoodsInfoByAddressId") @GetMapping("feignLeaseGoodsInfoByAddressId")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = LeaseGoodsVO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@ApiIgnore public ResultBody feignLeaseGoodsInfoByAddressId(@RequestParam Integer id) {
public Integer feignLeaseGoodsInfoByAddressId(@RequestParam Integer id) {
return leaseGoodsService.feignLeaseGoodsInfoByAddressId(id); return leaseGoodsService.feignLeaseGoodsInfoByAddressId(id);
} }
} }
...@@ -71,5 +71,5 @@ public interface LeaseGoodsDao { ...@@ -71,5 +71,5 @@ public interface LeaseGoodsDao {
void removeWareInfo(List<Integer> list); void removeWareInfo(List<Integer> list);
Integer feignLeaseGoodsInfoByAddressId(Integer id); int feignLeaseGoodsInfoByAddressId(Integer id);
} }
...@@ -27,5 +27,5 @@ public interface LeaseGoodsService { ...@@ -27,5 +27,5 @@ public interface LeaseGoodsService {
ResultBody batchRemoveWareInfo(List<Integer> list); ResultBody batchRemoveWareInfo(List<Integer> list);
Integer feignLeaseGoodsInfoByAddressId(Integer id); ResultBody feignLeaseGoodsInfoByAddressId(Integer id);
} }
...@@ -147,7 +147,7 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService { ...@@ -147,7 +147,7 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService {
List<CompanyInfoVO> companyInfoVOS = userAppApi.listCompanyInfoByBUIds(userIds); List<CompanyInfoVO> companyInfoVOS = userAppApi.listCompanyInfoByBUIds(userIds);
leaseGoodsVOList = leaseGoodsVOList.stream().peek(d -> { leaseGoodsVOList = leaseGoodsVOList.stream().peek(d -> {
for (CompanyInfoVO companyInfoVO : companyInfoVOS) { for (CompanyInfoVO companyInfoVO : companyInfoVOS) {
if (companyInfoVO.getBackUserAccountId().equals(d.getUserAccountId())){ if (companyInfoVO.getBackUserAccountId().equals(d.getUserAccountId())) {
d.setCompanyName(companyInfoVO.getCompanyName()); d.setCompanyName(companyInfoVO.getCompanyName());
break; break;
} }
...@@ -190,7 +190,7 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService { ...@@ -190,7 +190,7 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService {
} }
@Override @Override
public Integer feignLeaseGoodsInfoByAddressId(Integer id) { public ResultBody feignLeaseGoodsInfoByAddressId(Integer id) {
return leaseGoodsDao.feignLeaseGoodsInfoByAddressId(id); return ResultBody.success(leaseGoodsDao.feignLeaseGoodsInfoByAddressId(id));
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论