推送运营商、门店新增

ruoyi-admin/src/main/resources/application-dev.yml

@@ -84,4 +84,9 @@ renren:
         header: token
 
 pay:
-    refundUrl: http://115.190.8.52:8019/api/payment/refund
+    refundUrl: http://115.190.8.52:8019/api/payment/refund
+
+dataPush:
+    sendAddCompanyUrl: http://115.190.8.52:8016/send/companyinfo/
+    sendAddStoreUrl: http://115.190.8.52:8016/send/storeinfo/
+    sendAddUserUrl: http://115.190.8.52:8016/send/userinfo/

ruoyi-admin/src/main/resources/templates/operation/company/add.html

@@ -56,9 +56,9 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">地址：</label>
+                <label class="col-sm-3 control-label is-required">地址：</label>
                 <div class="col-sm-8">
-                    <input name="address" class="form-control" type="text"  maxlength="100">
+                    <input name="address" class="form-control" type="text"  maxlength="100" required>
                 </div>
             </div>
        

ruoyi-admin/src/main/resources/templates/operation/company/edit.html

@@ -112,19 +112,6 @@
             }
         }
 
-        /* 用户管理-修改-选择部门树 */
-        function selectDeptTree() {
-            var deptId = $.common.isEmpty($("#treeId").val()) ? "431200000000" : $("#treeId").val();
-            var url = ctx + "system/dept/selectDeptTree/" + deptId;
-            var options = {
-                title: '选择部门',
-                width: "380",
-                url: url,
-                callBack: doSubmit
-            };
-            $.modal.openOptions(options);
-        }
-
         function doSubmit(index, layero){
             var tree = layero.find("iframe")[0].contentWindow.$._tree;
             var body = $.modal.getChildFrame(index);

ruoyi-admin/src/main/resources/templates/orders/order/edit.html

@@ -166,7 +166,7 @@
                 </div>
             </div>
             <br/>
-            <button type="button" th:if="not (*{orderStatus} == 'AUTO_END' or *{orderStatus} == 'MANUAL_END')" class="btn btn-success btn-xs" onclick="manualEndOrder()">手动结束订单</i></button>
+            <button type="button" th:if="not (*{orderStatus} == 'AUTO_END' or *{orderStatus} == 'MANUAL_END' or *{orderStatus} == 'WAIT_PAY')" class="btn btn-success btn-xs" onclick="manualEndOrder()">手动结束订单</i></button>
         </form>
     </div>
     <th:block th:include="include :: footer" />