From 1cebda3074594ceb640a19cd60d1a13520185d8d Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Thu, 5 Oct 2023 23:00:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=A4=87=E6=B3=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98/=E5=90=8E=E5=8F=B0=E5=8F=91=E5=8D=95=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=B0=8F=E6=95=B0=E7=82=B9=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/order/OrderController.java | 6 ++++++ .../resources/templates/goods/standard/addTemplate.html | 4 ++-- .../java/com/ghy/order/request/SysOrderAssignRequest.java | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 1edd6457..c617c5b1 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -149,6 +149,11 @@ public class OrderController extends BaseController { @Transactional(rollbackFor = Exception.class) public AjaxResult sysOrder(@RequestBody SysOrderAssignRequest request) { + // 判断传递价格是否有小数 + if (new BigDecimal(request.getPrice().intValue()).compareTo(request.getPrice())!=0){ + return AjaxResult.error("后台发单金额不能含有小数!"); + } + // 判断是否有客户 SysUser sysUser = getSysUser(); Long deptId = sysUser.getDept().getDeptId(); @@ -198,6 +203,7 @@ public class OrderController extends BaseController { goods.setGoodsVideoUrl(request.getVideoUrl()); goods.setDeptGoodsCategoryId(request.getCategoryId3()); goods.setStatus(1); + goods.setRemark(request.getRemark()); goodsService.insertGoods(goods); List goodsStandards = new ArrayList<>(); diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index 5efef8f4..08df7a64 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -658,7 +658,7 @@ } }); } else { - $.modal.msgError("请求失败") + $.modal.msgError(result.msg) } } }) @@ -683,7 +683,7 @@ if (result.code == web_status.SUCCESS) { $.modal.msgSuccess("提交成功") } else { - $.modal.msgError("请求失败") + $.modal.msgError(result.msg) } } }) diff --git a/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java b/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java index 394755f3..b5b7b323 100644 --- a/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java +++ b/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java @@ -52,4 +52,6 @@ public class SysOrderAssignRequest { private String payMode; + private String remark; + }