合约订单，以及合约订单权限

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());

ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html

@@ -342,7 +342,12 @@
                     <span class="yuan-symbol">¥</span>
                     <span class="yuan-symbol" id="totalMoney">0</span>
                 </div>
-                <div class="oper-banner-end col-sm-5">
+                <div class="oper-banner-end col-sm-5" >
+                    <div class="m-r">
+                        <div class="checkbox">
+                            <a href="#" shiro:hasPermission="consult:order:add"><input id="consultOrder" type="checkbox" value="02" name="consultOrder" onclick="changeConsultOrder(this)" >合约订单</a>
+                        </div>
+                    </div>
                     <div class="m-r">
                         <div class="checkbox">
                             <label><input id="payOnDoorMode" type="checkbox" value="02" name="payMode" onclick="changePayOnDoorMode(this)">上门到付/保外单</label>
@@ -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;
     }

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;
+
 }

ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java

@@ -54,4 +54,7 @@ public class SysOrderAssignRequest {
 
     private String remark;
 
+    /*合约订单*/
+    private String consultMode;
+
 }