发货备注

src/main/java/com/yunniu/farming/webadmin/controller/GroupOrderController.java

@@ -57,7 +57,6 @@ public class GroupOrderController {
 
 
     /**
     /**
      * 发货
      * 发货
-     *
      * @param id
      * @param id
      * @return
      * @return
      */
      */

src/main/java/com/yunniu/farming/wx/WxConfigUtil.java

@@ -15,9 +15,9 @@ public class WxConfigUtil {
     public final static String UNIFIED_ORDER_URL = "https://api.mch.weixin.qq.com/pay/unifiedorder";
     public final static String UNIFIED_ORDER_URL = "https://api.mch.weixin.qq.com/pay/unifiedorder";
     public final static String PROFIT_SHARING_URL = "https://api.mch.weixin.qq.com/secapi/pay/profitsharing";
     public final static String PROFIT_SHARING_URL = "https://api.mch.weixin.qq.com/secapi/pay/profitsharing";
     public final static String PROFIT_SHARING_ADDRECEIVER = "https://api.mch.weixin.qq.com/pay/profitsharingaddreceiver";
     public final static String PROFIT_SHARING_ADDRECEIVER = "https://api.mch.weixin.qq.com/pay/profitsharingaddreceiver";
-    public final static String notify_url = "http://proud-panther-51.n.gaoyixia.com:8081/wx/notify"; // 订单回调接口
+    public final static String notify_url = "http://farming.nyinhong.com/wx/notify"; // 订单回调接口
     //    public final static String notify_url = "https://qpxdnyy.com/wx/notify"; // 订单回调接口
     //    public final static String notify_url = "https://qpxdnyy.com/wx/notify"; // 订单回调接口
-    public final static String refund_notify_url = "http://proud-panther-51.n.gaoyixia.com:8081/wx/wxRefundNotify"; // 订单回调接口
+    public final static String refund_notify_url = "http://farming.nyinhong.com/wx/wxRefundNotify"; // 订单回调接口
     //    public final static String refund_notify_url = "https://qpxdnyy.com/wx/wxRefundNotify"; // 订单回调接口
     //    public final static String refund_notify_url = "https://qpxdnyy.com/wx/wxRefundNotify"; // 订单回调接口
     public final static String REFUND_ORDER_URL = "https://api.mch.weixin.qq.com/secapi/pay/refund";
     public final static String REFUND_ORDER_URL = "https://api.mch.weixin.qq.com/secapi/pay/refund";
     public static String GET_MINICODE_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit";
     public static String GET_MINICODE_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit";

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

@@ -340,16 +340,16 @@
                 //     });
                 //     });
                 // });
                 // });
             } else if (obj.event === 'edit') {
             } else if (obj.event === 'edit') {
-                    var id = obj.data.orderId;
-                    var w = ($(window).width() * 0.95);
-                    var h = ($(window).height() * 0.95);
-                    layer.open({
-                        type: 2
-                        , title: '修改订单'
-                        , content: 'orderDetailEdit?orderId=' + id
-                        , area: [w + 'px', h + 'px']
-                        , fix: false //不固定
-                        , maxmin: true
+                var id = obj.data.orderId;
+                var w = ($(window).width() * 0.95);
+                var h = ($(window).height() * 0.95);
+                layer.open({
+                    type: 2
+                    , title: '修改订单'
+                    , content: 'orderDetailEdit?orderId=' + id
+                    , area: [w + 'px', h + 'px']
+                    , fix: false //不固定
+                    , maxmin: true
                         , shadeClose: true
                         , shadeClose: true
                         , shade: 0.4
                         , shade: 0.4
                         , btn: ['确认', '取消']
                         , btn: ['确认', '取消']