Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/memberInfo.html

@@ -149,12 +149,18 @@
             "isExclusive": parseInt($("input[name^='isExclusive']:checked").val())
         }
         if ($.validate.form()) {
+
+            var canSubmit = 1;
+
             $("#ticket-table").find('.content-tr').each(function (i, tr) {
                 $(tr).find('td').each(function (y, td) {
                     var inputName = $(td).find("input").attr("name");
                     var inputValue = $(td).find("input").val();
                     if (inputName == "priceDiscountMember") {//过滤修改列
                         performanceMemberAuditParam["ticketMemberAudit[" + i + "].priceDiscountMember"] = parseFloat(inputValue);
+                        if (parseFloat($("td[name^='price']").text()) - parseFloat(inputValue) <= 0) {
+                            canSubmit = 0;
+                        }
                     }
                     if (inputName == "memberLimitCount") {//过滤修改列
                         performanceMemberAuditParam["ticketMemberAudit[" + i + "].memberLimitCount"] = parseInt(inputValue);
@@ -168,9 +174,13 @@
                 });
             });
 
-            $.operate.post(prefix + "/memberInfo/submit", performanceMemberAuditParam, function (res) {
-                location.reload();
-            });
+            if (canSubmit == 1) {
+                $.operate.post(prefix + "/memberInfo/submit", performanceMemberAuditParam, function (res) {
+                    location.reload();
+                });
+            } else {
+                alert("会员优惠后不能小于0")
+            }
         }
     }
 
@@ -193,4 +203,4 @@
 
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -153,6 +153,21 @@ public class KylinOrderTickets implements Serializable {
      */
     private String expressAddress;
 
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String county;
+
+    /**
+     * 省份
+     */
+    private String province;
+
     /**
      * 收货人联系方式
      */

liquidnet-bus-service/liquidnet-service-consumer/src/main/resources/bootstrap-service-consumer.yml

@@ -9,9 +9,9 @@ eureka:
 spring:
   cloud:
     config:
-#      uri: http://127.0.0.1:7002/support-config
+#      uri: http://39.106.122.201:7002/support-config
       profile: ${liquidnet.cloudConfig.profile}
       name: ${spring.application.name} #默认为spring.application.name
       discovery:
         enabled: true
-        service-id: liquidnet-support-config
+        service-id: liquidnet-support-config
\ No newline at end of file

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

@@ -373,6 +373,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderTickets.setExpressContacts(addressesVo.getName());
             orderTickets.setExpressAddress(addressesVo.getProvince() + addressesVo.getCity() + addressesVo.getCounty() + addressesVo.getAddress());
             orderTickets.setExpressPhone(addressesVo.getPhone());
+            orderTickets.setCity(addressesVo.getCity());
+            orderTickets.setProvince(addressesVo.getProvince());
+            orderTickets.setCounty(addressesVo.getCounty());
             orderTickets.setGetTicketType("express");
             currentTime = System.currentTimeMillis() - currentTime;
             log.debug("feign 获取入场人 -> time:" + (currentTime) + "毫秒");
@@ -380,6 +383,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderTickets.setExpressContacts("");
             orderTickets.setExpressAddress("");
             orderTickets.setExpressPhone("");
+            orderTickets.setCity("");
+            orderTickets.setProvince("");
+            orderTickets.setCounty("");
             orderTickets.setGetTicketType("electronic");
         }
         orderTickets.setCouponType("no");

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml

@@ -18,10 +18,10 @@ liquidnet:
     username: admin
     password: admin
   config:
-#    location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
-     location: /app/support-config
+    #    location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
+    location: /app/support-config
 # end-dev-这里是配置信息基本值
 
 spring:
   profiles:
-    include: support-config
+    include: support-config
\ No newline at end of file