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 9566bf48..c44f3a3b 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 @@ -268,6 +268,7 @@ public class OrderController extends BaseController { orderMaster.setPayMode(request.getPayMode()); orderMaster.setGoodsBrand(request.getGoodsBrand()); orderMaster.setGoodsSpecification(request.getGoodsSpecification()); + orderMaster.setConsultMode(request.getConsultMode()); // 存在登陆用户的情况下 if(getSysUser() != null){ orderMaster.setCreateBy(getSysUser().getUserId().toString()); 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 b2c5dec5..0c059f9e 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -342,7 +342,12 @@ ¥ 0 -
+
+
+ +
@@ -531,6 +536,14 @@ + function changeConsultOrder(e){ + if ($(e).is(':checked')) { + $('#consultOrder').prop("value", '01'); + } else { + $('#consultOrder').prop("value", '02'); + } + } + function changePayOnDoorMode(e) { if ($(e).is(':checked')) { $('#payOnDoorMode').prop("value", '01'); @@ -592,6 +605,7 @@ params.districtId = areaCascader.getCheckedPaths()[0][2]; params.streetId = areaCascader.getCheckedPaths()[0][3]; params.payMode = $('#payOnDoorMode').val(); + params.consultMode = $('#consultOrder').val(); return params; } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index 73910408..a93f5dda 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -212,4 +212,6 @@ public class OrderMaster extends BaseEntity { private String district; + private String consultMode; + } 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 b5b7b323..ef0aa486 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 @@ -54,4 +54,7 @@ public class SysOrderAssignRequest { private String remark; + /*合约订单*/ + private String consultMode; + }