Merge branch 'pre' into 'master'

Pre

See merge request !144

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/js/remote-search-coupon-list.js

@@ -80,7 +80,8 @@
                     couType: couType,
                     bindType: '1,4'
                 };
-                var jAjax =  $.post;
+                var jAjax =  $.get;
+                // var jAjax = (that.ajax.method === "post") ? $.post : $.get;
                 jAjax(that.ajax.url, params, function(data){
                 	return that.render(data.rows);
                 });

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/js/remote-search-coupon.js

@@ -81,6 +81,7 @@
                     bindType: '1,4'
                 };
                 var jAjax =  $.post;
+                // var jAjax = (that.ajax.method === "post") ? $.post : $.get;
                 jAjax(that.ajax.url, params, function(data){
                 	return that.render(data.rows);
                 });

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/include.html

@@ -42,10 +42,10 @@
 	<script th:src="@{/ruoyi/js/common.js?v=4.6.1}"></script>
 	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.6.1}"></script>
 	<!--远程搜索下拉框-->
-	<script th:src="@{/js/remote-search-performance.js}"></script>
+<!--	<script th:src="@{/js/remote-search-performance.js}"></script>-->
 	<!--远程搜索下拉框:积分抽奖配置使用-->
-	<script th:src="@{/js/remote-search-coupon-list.js}"></script>
-	<script th:src="@{/js/remote-search-coupon.js}"></script>
+<!--	<script th:src="@{/js/remote-search-coupon-list.js}"></script>-->
+<!--	<script th:src="@{/js/remote-search-coupon.js}"></script>-->
 </div>
 
 <!-- ztree树插件 -->

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html

@@ -530,6 +530,7 @@
 
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: bootstrap-fileinput-js"/>
+<script th:src="@{/js/remote-search-coupon.js}"></script>
 
 
 <script th:inline="javascript">

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

@@ -39,6 +39,7 @@
 </div>
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: bootstrap-suggest-js"/>
+<script th:src="@{/js/remote-search-performance.js}"></script>
 
 <script th:inline="javascript">
     var prefix = ctx + "kylin/performances/recommend";

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

@@ -36,6 +36,7 @@
 </div>
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: bootstrap-suggest-js"/>
+<script th:src="@{/js/remote-search-performance.js}"></script>
 <script th:inline="javascript">
     var prefix = ctx + "kylin/performances/roadShow";
     var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html

@@ -158,6 +158,8 @@
 
     <th:block th:include="include :: footer"/>
     <script th:src="@{/js/jquery.tmpl.js}"></script>
+    <!--远程搜索下拉框:积分抽奖配置使用-->
+    <script th:src="@{/js/remote-search-coupon-list.js}"></script>
     <th:block th:include="include :: bootstrap-fileinput-js" />
 
     <script type="text/javascript">

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java

@@ -826,8 +826,10 @@ public class AdamRdmService {
     public String generateMemberUniqueSerialNumber(String mobile) {
         LocalDateTime now = LocalDateTime.now();
 
-        String snT = String.format("%s%sMS%s", now.getYear(), now.getMonthValue(), mobile.substring(7)).substring(2);
-        String sn = snT.replace("MS", String.valueOf(now.getLong(ChronoField.MILLI_OF_SECOND)));
+//        String snT = String.format("%s%sMS%s", now.getYear(), now.getMonthValue(), mobile.substring(7)).substring(2);
+//        String sn = snT.replace("MS", String.valueOf(now.getLong(ChronoField.MILLI_OF_SECOND)));
+        String snT = String.format("%s%sMS%s", now.getYear(), now.getMonthValue(), org.apache.commons.lang3.StringUtils.right(mobile, 4)).substring(2);
+        String sn = snT.replace("MS", org.apache.commons.lang3.StringUtils.leftPad(String.valueOf(LocalDateTime.now().getLong(ChronoField.MILLI_OF_SECOND)), 3, "0"));
         Object o = redisUtil.get(AdamRedisConst.SERIAL_NUMBER_MEMBER.concat(sn));
         while (null != o) {
             String nano = String.valueOf(System.nanoTime());