单宽融合修改

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -451,13 +451,13 @@ public class DankuanController {
         if (Constant.Payment1.equals(ipay)) {
             //支付成功回调的页面
             // String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toPaymentSuccessPage?id=" + userId +"orderId="+id;
-            String MERCHANTURL = "https://www.baidu.com";
+            String MERCHANTURL = "http://hhrcode.winsun-aly.com/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
             map.put("MERCHANTURL", MERCHANTURL);
         }
         //单宽回调后端接口地址
         //  map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
 
-        map.put("BACKDROPURL", "http://167460x6b0.51mypc.cn/ciop/dankuan/toSubmisOrderPreser.do");
+        map.put("BACKDROPURL", "http://hhrcode.winsun-aly.com/ciop/dankuan/toSubmisOrderPreser.do");
 
 
         String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.KEY;//商户标识

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -327,12 +327,12 @@ public class RongHeController {
             //支付成功回调的页面
            /* String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
           /*  String MERCHANTURL =  "http://167460x6b0.51mypc.cn/ciop/rongHe/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
-            String MERCHANTURL = "www.baidu.com";
+            String MERCHANTURL = "http://hhrcode.winsun-aly.com/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
             map.put("MERCHANTURL", MERCHANTURL);
         }
         //单宽回调后端接口地址
         //  map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
-        map.put("BACKDROPURL", "http://167460x6b0.51mypc.cn/ciop/rongHe/toSubmisOrderPreser.do");
+        map.put("BACKDROPURL", "http://hhrcode.winsun-aly.com/ciop/rongHe/toSubmisOrderPreser.do");
 
         String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.KEY;//商户标识
         //*	将值转换为大写	*//*