diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeign.java index e6cefc77c9..60a4da8913 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeign.java @@ -60,8 +60,8 @@ public interface BusSalesOrderMakeupFeign { ResultBean save(@RequestBody AppBusSalesOrderMakeUpDto dto); @ApiOperation("初始化上装信息") - @GetMapping("/getTopInfo/{saleOrderSid}") + @GetMapping("/getTopInfo/{sid}") @ResponseBody - ResultBean getTopInfo(@PathVariable(value = "salesOrderSid") String sid); + ResultBean getTopInfo(@PathVariable(value = "sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java index b3fc707b5b..40b14ba787 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/app/AppBusSalesOrderMakeUpDto.java @@ -41,7 +41,7 @@ public class AppBusSalesOrderMakeUpDto implements Dto { @ApiModelProperty(value = "有无上装信息") private Boolean topInfoState; @ApiModelProperty(value = "销售订单sid") - private String saleOrderSid; + private String salesOrderSid; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java index 53c63133fe..cfc758938b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java @@ -91,7 +91,7 @@ public class BusSalesOrderMakeupService extends MybatisBaseService getTopInfo(String sid) { ResultBean rb = ResultBean.fireFail(); + //查询销售订单是否存在 + BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(sid); + if (busSalesOrder == null) { + return rb.setMsg("该销售订单单据不存在"); + } AppBusSalesOrderMakeUpVo appBusSalesOrderMakeUpVo = baseMapper.getTopInfo(sid); if (appBusSalesOrderMakeUpVo != null) { if (StringUtils.isNotBlank(appBusSalesOrderMakeUpVo.getContractPath())) { @@ -126,6 +131,13 @@ public class BusSalesOrderMakeupService extends MybatisBaseService contractImages = Arrays.asList(path.split(",")); appBusSalesOrderMakeUpVo.setContractImages(contractImages); } + if (StringUtils.isNotBlank(busSalesOrder.getIsTop())) { + if ("1".equals(busSalesOrder.getIsTop())) { + appBusSalesOrderMakeUpVo.setTopInfoState(true); + } else { + appBusSalesOrderMakeUpVo.setTopInfoState(false); + } + } } appBusSalesOrderMakeUpVo.setSaleOrderSid(sid); return rb.success().setData(appBusSalesOrderMakeUpVo); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index c052f4c93c..c4f5e777ba 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -185,6 +185,6 @@ public class AppBusSalesOrderService { AppBusSalesOrderMakeUpVo appBusSalesOrderMakeUpVo = resultBean.getData(); TopVo topVo = new TopVo(); BeanUtil.copyProperties(appBusSalesOrderMakeUpVo, topVo); - return rb.setData(topVo); + return rb.success().setData(topVo); } } \ No newline at end of file