Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -22,7 +22,7 @@ liquidnet:
   url-pay:
     pay: "http://testpay.zhengzai.tv/"
     check: "http://testpay.zhengzai.tv/order/verify"
-    localUrl: "https://zuul.zhengzai.tv/kylin/order/syncOrder"
+    localUrl: "http://devzuul.zhengzai.tv/kylin/order/syncOrder"
   url-service:
     url: "http://testservice.zhengzai.tv/"
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -460,9 +460,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<String, String>();
         httpData.add("type", "TICKET");
         if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
-            httpData.add("price", orderTickets.getPriceActual().toString());
-        } else {
             httpData.add("price", "0.01");
+        } else {
+            httpData.add("price", orderTickets.getPriceActual().toString());
         }
         httpData.add("name", useTime+ticketData.getTitle() + "-" + performanceData.getTitle());
         httpData.add("detail", performanceData.getTitle() + "-" + ticketData.getTitle() + "-" + useTime);