退款申请提交bug修复

src/main/java/com/yunniu/farming/webadmin/service/impl/OrderMainServiceImpl.java

@@ -155,7 +155,7 @@ public class OrderMainServiceImpl {
             return Result.error("创建订单失败");
         }
 
-        if (item.getItype().equals(OrderMain.ITYPE_GROUP)) {
+        if (item.getItype() != null && item.getItype().equals(OrderMain.ITYPE_GROUP)) {
             GroupOrder order = orderService.addGroupOrder(item);
             item.setGroupOrderId(order.getId());
         }

src/main/resources/static/js/layui.min.js

-!function(r){"use strict";function n(){this.v="2.5.6"}function d(e){r.console&&console.error&&console.error("Layui hint: "+e)}var e,f=document,m={modules:{},status:{},timeout:10,event:{}},h=(e=f.currentScript?f.currentScript.src:function(){for(var e,t=f.scripts,o=t.length-1,n=o;0<n;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[o].src}()).substring(0,e.lastIndexOf("/")+1),v="undefined"!=typeof opera&&"[object Opera]"===opera.toString(),g={layer:"modules/layer",laydate:"modules/laydate",laypage:"modules/laypage",laytpl:"modules/laytpl",layim:"modules/layim",layedit:"modules/layedit",form:"modules/form",upload:"modules/upload",transfer:"modules/transfer",tree:"modules/tree",table:"modules/table",element:"modules/element",rate:"modules/rate",colorpicker:"modules/colorpicker",slider:"modules/slider",carousel:"modules/carousel",flow:"modules/flow",util:"modules/util",code:"modules/code",jquery:"modules/jquery",mobile:"modules/mobile","layui.all":"../layui.all"};n.prototype.cache=m,n.prototype.define=function(e,n){function t(){function o(e,t){layui[e]=t,m.status[e]=!0}return"function"==typeof n&&n(function(e,t){o(e,t),m.callback[e]=function(){n(o)}}),this}var o=this;return"function"==typeof e&&(n=e,e=[]),!layui["layui.all"]&&layui["layui.mobile"]?t.call(o):(o.use(e,t),o)},n.prototype.use=function(o,e,t){function n(e,t){var o="PLaySTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/;"load"!==e.type&&!o.test((e.currentTarget||e.srcElement).readyState)||(m.modules[u]=t,l.removeChild(c),function e(){return++s>1e3*m.timeout/4?d(u+" is not a valid module"):void(m.status[u]?r():setTimeout(e,4))}())}function r(){t.push(layui[u]),1<o.length?a.use(o.slice(1),e,t):"function"==typeof e&&e.apply(layui,t)}var a=this,i=m.dir=m.dir?m.dir:h,l=f.getElementsByTagName("head")[0];o="string"==typeof o?[o]:o,window.jQuery&&jQuery.fn.on&&(a.each(o,function(e,t){"jquery"===t&&o.splice(e,1)}),layui.jquery=layui.$=jQuery);var u=o[0],s=0;if(t=t||[],m.host=m.host||(i.match(/\/\/([\s\S]+?)\//)||["//"+location.host+"/"])[0],0===o.length||layui["layui.all"]&&g[u]||!layui["layui.all"]&&layui["layui.mobile"]&&g[u])return r(),a;var c,p,y=(y=(g[u]?i+"lay/":!/^\{\/\}/.test(a.modules[u])&&m.base||"")+(a.modules[u]||u)+".js").replace(/^\{\/\}/,"");return!m.modules[u]&&layui[u]&&(m.modules[u]=y),m.modules[u]?function e(){return++s>1e3*m.timeout/4?d(u+" is not a valid module"):void("string"==typeof m.modules[u]&&m.status[u]?r():setTimeout(e,4))}():((c=f.createElement("script")).async=!0,c.charset="utf-8",c.src=y+((p=!0===m.version?m.v||(new Date).getTime():m.version||"")?"?v="+p:""),l.appendChild(c),!c.attachEvent||c.attachEvent.toString&&c.attachEvent.toString().indexOf("[native code")<0||v?c.addEventListener("load",function(e){n(e,y)},!1):c.attachEvent("onreadystatechange",function(e){n(e,y)}),m.modules[u]=y),a},n.prototype.getStyle=function(e,t){var o=e.currentStyle?e.currentStyle:r.getComputedStyle(e,null);return o[o.getPropertyValue?"getPropertyValue":"getAttribute"](t)},n.prototype.link=function(t,o,e){var n=this,r=f.createElement("link"),a=f.getElementsByTagName("head")[0];"string"==typeof o&&(e=o);var i=(e||t).replace(/\.|\//g,""),l=r.id="layuicss-"+i,u=0;return r.rel="stylesheet",r.href=t+(m.debug?"?v="+(new Date).getTime():""),r.media="all",f.getElementById(l)||a.appendChild(r),"function"!=typeof o||function e(){return++u>1e3*m.timeout/100?d(t+" timeout"):void(1989===parseInt(n.getStyle(f.getElementById(l),"width"))?o():setTimeout(e,100))}(),n},m.callback={},n.prototype.factory=function(e){if(layui[e])return"function"==typeof m.callback[e]?m.callback[e]:null},n.prototype.addcss=function(e,t,o){return layui.link(m.dir+"css/"+e,t,o)},n.prototype.img=function(e,t,o){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,"function"==typeof t&&t(n)},void(n.onerror=function(e){n.onerror=null,"function"==typeof o&&o(e)}))},n.prototype.config=function(e){for(var t in e=e||{})m[t]=e[t];return this},n.prototype.modules=function(){var e={};for(var t in g)e[t]=g[t];return e}(),n.prototype.extend=function(e){for(var t in e=e||{})this[t]||this.modules[t]?d("模块名 "+t+" 已被占用"):this.modules[t]=e[t];return this},n.prototype.router=function(e){var o={path:[],search:{},hash:((e=e||location.hash).match(/[^#](#.*$)/)||[])[1]||""};return/^#\//.test(e)&&(e=e.replace(/^#\//,""),o.href="/"+e,e=e.replace(/([^#])(#.*$)/,"$1").split("/")||[],this.each(e,function(e,t){/^\w+=/.test(t)?(t=t.split("="),o.search[t[0]]=t[1]):o.path.push(t)})),o},n.prototype.url=function(e){var r,t,o=this;return{pathname:(e?((e.match(/\.[^.]+?\/.+/)||[])[0]||"").replace(/^[^\/]+/,"").replace(/\?.+/,""):location.pathname).replace(/^\//,"").split("/"),search:(r={},t=(e?(e.match(/\?.+/)||[])[0]||"":location.search).replace(/^\?+/,"").split("&"),o.each(t,function(e,t){var o=t.indexOf("="),n=o<0?t.substr(0,t.length):0!==o&&t.substr(0,o);n&&(r[n]=0<o?t.substr(o+1):null)}),r),hash:o.router(e?(e.match(/#.+/)||[])[0]||"":location.hash)}},n.prototype.data=function(e,t,o){if(e=e||"layui",o=o||localStorage,r.JSON&&r.JSON.parse){if(null===t)return delete o[e];t="object"==typeof t?t:{key:t};try{var n=JSON.parse(o[e])}catch(e){n={}}return"value"in t&&(n[t.key]=t.value),t.remove&&delete n[t.key],o[e]=JSON.stringify(n),t.key?n[t.key]:n}},n.prototype.sessionData=function(e,t){return this.data(e,t,sessionStorage)},n.prototype.device=function(e){function t(e){var t=new RegExp(e+"/([^\\s\\_\\-]+)");return(e=(o.match(t)||[])[1])||!1}var o=navigator.userAgent.toLowerCase(),n={os:/windows/.test(o)?"windows":/linux/.test(o)?"linux":/iphone|ipod|ipad|ios/.test(o)?"ios":/mac/.test(o)?"mac":void 0,ie:!!(r.ActiveXObject||"ActiveXObject"in r)&&((o.match(/msie\s(\d+)/)||[])[1]||"11"),weixin:t("micromessenger")};return e&&!n[e]&&(n[e]=t(e)),n.android=/android/.test(o),n.ios="ios"===n.os,n.mobile=!(!n.android&&!n.ios),n},n.prototype.hint=function(){return{error:d}},n.prototype.each=function(e,t){var o;if("function"!=typeof t)return this;if((e=e||[]).constructor===Object){for(o in e)if(t.call(e[o],o,e[o]))break}else for(o=0;o<e.length&&!t.call(e[o],o,e[o]);o++);return this},n.prototype.sort=function(e,a,t){var o=JSON.parse(JSON.stringify(e||[]));return a&&(o.sort(function(e,t){var o=/^-?\d+$/,n=e[a],r=t[a];return o.test(n)&&(n=parseFloat(n)),o.test(r)&&(r=parseFloat(r)),n&&!r?1:!n&&r?-1:r<n?1:n<r?-1:0}),t&&o.reverse()),o},n.prototype.stope=function(t){t=t||r.event;try{t.stopPropagation()}catch(e){t.cancelBubble=!0}},n.prototype.onevent=function(e,t,o){return"string"!=typeof e||"function"!=typeof o?this:n.event(e,t,null,o)},n.prototype.event=n.event=function(e,t,o,n){function r(e,t){!1===(t&&t.call(a,o))&&null===i&&(i=!1)}var a=this,i=null,l=t.match(/\((.*)\)$/)||[],u=(e+"."+t).replace(l[0],""),s=l[1]||"";return n?(m.event[u]=m.event[u]||{},m.event[u][s]=[n],this):(layui.each(m.event[u],function(e,t){return"{*}"===s?void layui.each(t,r):(""===e&&layui.each(t,r),void(s&&e===s&&layui.each(t,r)))}),i)},r.layui=new n}(window);
\ No newline at end of file

src/main/resources/templates/banner/addOrEdit.html

@@ -15,7 +15,7 @@
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.config.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.all.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/lang/zh-cn/zh-cn.js}"></script>
-    <script src="http://www.jq22.com/jquery/jquery-1.7.1.js"></script>
+    <script src="https://s2.pstatp.com/cdn/expire-1-M/jquery/1.7.1/jquery.min.js"></script>
 
 
     <style>

src/main/resources/templates/discountGoods/addOrEdit.html

@@ -15,7 +15,7 @@
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.config.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.all.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/lang/zh-cn/zh-cn.js}"></script>
-    <script src="http://www.jq22.com/jquery/jquery-1.7.1.js"></script>
+    <script src="https://s2.pstatp.com/cdn/expire-1-M/jquery/1.7.1/jquery.min.js"></script>
 
 
     <style>

src/main/resources/templates/goods/addOrEdit.html

@@ -15,7 +15,7 @@
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.config.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.all.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/lang/zh-cn/zh-cn.js}"></script>
-    <script src="http://www.jq22.com/jquery/jquery-1.7.1.js"></script>
+    <script src="https://s2.pstatp.com/cdn/expire-1-M/jquery/1.7.1/jquery.min.js"></script>
 
 
     <style>

src/main/resources/templates/goods/rentAddOrEdit.html

@@ -15,7 +15,7 @@
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.config.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.all.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/lang/zh-cn/zh-cn.js}"></script>
-    <script src="http://www.jq22.com/jquery/jquery-1.7.1.js"></script>
+    <script src="https://s2.pstatp.com/cdn/expire-1-M/jquery/1.7.1/jquery.min.js"></script>
 
 
     <style>

src/main/resources/templates/goodsClass/banner.html

@@ -15,7 +15,7 @@
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.config.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.all.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/lang/zh-cn/zh-cn.js}"></script>
-    <script src="http://www.jq22.com/jquery/jquery-1.7.1.js"></script>
+    <script src="https://s2.pstatp.com/cdn/expire-1-M/jquery/1.7.1/jquery.min.js"></script>
     <style>
         .layui-form-label {
             width: 80px;

src/main/resources/templates/goodsClass/banner1.html

@@ -15,7 +15,7 @@
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.config.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.all.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/lang/zh-cn/zh-cn.js}"></script>
-    <script src="http://www.jq22.com/jquery/jquery-1.7.1.js"></script>
+    <script src="https://s2.pstatp.com/cdn/expire-1-M/jquery/1.7.1/jquery.min.js"></script>
 
 
     <style>

src/main/resources/templates/groupBuy/addOrEdit.html

@@ -18,8 +18,8 @@
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.config.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.all.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/lang/zh-cn/zh-cn.js}"></script>
-    <script src="http://www.jq22.com/jquery/jquery-1.7.1.js"></script>
-    <script src="https://cdn.staticfile.org/layui/2.5.6/layui.min.js"></script>
+    <script src="https://s2.pstatp.com/cdn/expire-1-M/jquery/1.7.1/jquery.min.js"></script>
+    <script src="https://cdn.bootcdn.net/ajax/libs/layui/2.5.6/layui.min.js"></script>
     <!--    <link href="https://cdn.jsdelivr.net/npm/xm-select/dist/xm-select.css" rel="stylesheet">-->
     <script type="text/javascript" th:src="@{/js/xm-select.js}" charset="utf-8"></script>
 

src/main/resources/templates/groupOrder/detail.html

@@ -16,9 +16,9 @@
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.config.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.all.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/lang/zh-cn/zh-cn.js}"></script>
-    <script src="http://www.jq22.com/jquery/jquery-1.7.1.js"></script>
-    <link rel="stylesheet" href="https://cdn.staticfile.org/layui/2.5.6/css/layui.min.css">
-    <script src="https://cdn.staticfile.org/layui/2.5.6/layui.min.js"></script>
+    <script src="https://s2.pstatp.com/cdn/expire-1-M/jquery/1.7.1/jquery.min.js"></script>
+    <link href="https://cdn.bootcdn.net/ajax/libs/layui/2.5.6/css/layui.min.css" rel="stylesheet">
+    <script src="https://cdn.bootcdn.net/ajax/libs/layui/2.5.6/layui.min.js"></script>
 
 
     <style>

src/main/resources/templates/index.html

@@ -118,6 +118,6 @@
 
 </script>
 <script type="text/javascript" th:src="@{/js/xadmin.js}"></script>
-<script type="text/javascript" th:src="@{/beta/js/xadmin.js}"></script>
+<!--<script type="text/javascript" th:src="@{/beta/js/xadmin.js}"></script>-->
 </body>
 </html>

src/main/resources/templates/inteGoods/addOrEdit.html

@@ -15,7 +15,7 @@
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.config.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/ueditor.all.js}"></script>
     <script type="text/javascript" th:src="@{/js/ueditor/lang/zh-cn/zh-cn.js}"></script>
-    <script src="http://www.jq22.com/jquery/jquery-1.7.1.js"></script>
+    <script src="https://s2.pstatp.com/cdn/expire-1-M/jquery/1.7.1/jquery.min.js"></script>
 
 
     <style>