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

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseBomController.java

@@ -3,7 +3,6 @@ package com.uas.platform.b2c.trade.seek.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.base.model.FileUpload;
-import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
@@ -47,7 +46,7 @@ public class SeekPurchaseBomController {
     @Autowired
     private SeekPurchaseBomService seekPurchaseBomService;
 
-    @Value("#{sys.inquiryServiceUrl ?: 'http://218.17.158.219:24000'}")
+    @Value("#{sys.inquiryServiceUrl}")
     private String inquiryServiceUrl;
 
     /**
@@ -109,7 +108,7 @@ public class SeekPurchaseBomController {
         JSONObject object = FastjsonUtils.parseObject(json);
         logger.log("求购", "确认发布bom求购，bomId:" + object.get("bomId"));
         User user = SystemSession.getUser();
-        return seekPurchaseBomService.confirmBom(Long.valueOf(object.get("bomId").toString()), user);
+        return seekPurchaseBomService.confirmBom(Long.valueOf(object.get("bomId").toString()), user, inquiryServiceUrl);
     }
 
     /**

src/main/java/com/uas/platform/b2c/trade/seek/service/SeekPurchaseBomService.java

@@ -39,7 +39,7 @@ public interface SeekPurchaseBomService {
      * @param spIds
      * @return
      */
-    ResultMap confirmBom(Long bomId, User user);
+    ResultMap confirmBom(Long bomId, User user, String url);
 
     /**
      * 分页获取bom求购列表

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -54,7 +54,6 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -108,9 +107,6 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
     @Autowired
     private SearcherService searcherService;
 
-    @Value("#{sys.inquiryServiceUrl ?: 'http://218.17.158.219:24000'}")
-    private String inquiryServiceUrl;
-
     private int mallColNum = 8;
     private int mallRowNum = 500;
     private int startRow = 3;
@@ -419,7 +415,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
     }
 
     @Override
-    public ResultMap confirmBom(Long bomId, User user) {
+    public ResultMap confirmBom(Long bomId, User user, String url) {
         SeekPurchaseBom seekPurchaseBom = seekPurchaseBomDao.findOne(bomId);
         if (seekPurchaseBom == null) {
             return new ResultMap(CodeType.NOT_PERMIT, "请勿重复发布");
@@ -490,7 +486,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
         inquiry.setInquiryItems(inquiryItems);
         String res = "";
         try {
-            res = HttpUtil.doPost(inquiryServiceUrl + "/inquiry/buyer/save",  FlexJsonUtils.toJsonDeep(inquiry));
+            res = HttpUtil.doPost(url + "/inquiry/buyer/save",  FlexJsonUtils.toJsonDeep(inquiry));
         } catch (Exception e) {
             throw new IllegalOperatorException("发布失败");
         }

src/main/resources/test/sys.properties

@@ -45,3 +45,6 @@ productServiceIp=http://192.168.253.12:24000
 
 # Kafka
 kafka-bootstrap-servers=10.10.100.11:9292,10.10.100.12:9292,10.10.100.13:9292,10.10.100.14:9292,10.10.100.15:9292,10.10.100.16:9292
+
+#inquiry service url
+inquiryServiceUrl=http://218.17.158.219:24000

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -278,6 +278,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		// 全选
 		$scope.chooseAllItem = function () {
 			$scope.chooseAll = !$scope.chooseAll;
+			$scope.cancelTip();
 			angular.forEach($scope.currenctMaterial, function (material) {
 				material.isChoosed = $scope.chooseAll;
 			});

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -710,7 +710,7 @@
         </div>
         <div class="content">
             <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与买家在线沟通！</p>
-            <p>买家联系电话：<span ng-bind="seekListData[linkBoxIndex].userTel"></span></p>
+            <p>买家联系电话：<span ng-bind="(seekListData.content)[linkBoxIndex].userTel"></span></p>
             <div>
                 <a ng-click="setLinkBoxIndex(-1)">我知道了</a>
             </div>

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1523,7 +1523,7 @@
 		background: none !important;
 	}
 	.standard-tab.table > tbody > tr.batch-tr {
-		height: 40px;
+		height: 30px;
 	}
 	.standard-tab.table > tbody > tr.batch-tr.active {
 		position: fixed;
@@ -1540,9 +1540,9 @@
 	}
 	.standard-tab.table>tbody>tr>td .batch-line {
 		width: 100%;
-		height: 40px;
-		background: #dff3fd;
-		line-height: 40px;
+		height: 30px;
+		background: #fdd6d6;
+		line-height: 30px;
 	}
 </style>
 <div class="user_right fr">
@@ -1628,6 +1628,20 @@
 								<span>*匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="cancelTip()">&times;</a>
 							</td>
 						</tr>
+						<tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctMaterial.length != 0">
+							<td colspan="7">
+								<div class="batch-line" ng-if="chooseAll && !chooseAllPage">
+									已选中当前页
+									<em class="red" ng-bind="materialAll.numberOfElements"></em>个产品，
+									<a ng-click="turnAllPage()" class="blue">点击此处</a>切换选中所有页面<em class="red" ng-bind="materialAll.totalElements"></em>个产品
+								</div>
+								<div class="batch-line" ng-if="chooseAllPage">
+									已选中所有页面
+									<em class="red" ng-bind="materialAll.totalElements"></em>个产品，
+									<a ng-click="cancelAllPage()" class="blue">点击此处</a>全部取消选中
+								</div>
+							</td>
+						</tr>
 					</tbody>
 					<tbody ng-repeat="material in currenctMaterial">
 					<!--<tr ng-class="{ 'active': material.selected }" class="gre-bg">-->
@@ -2009,20 +2023,6 @@
 					</tr>
 					</tbody>
 					<tbody>
-					<tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctMaterial.length != 0">
-						<td colspan="7">
-							<div class="batch-line" ng-if="chooseAll && !chooseAllPage">
-								已选中当前页
-								<em class="red" ng-bind="materialAll.numberOfElements"></em>个产品，
-								<a ng-click="turnAllPage()" class="blue">点击此处</a>切换选中所有页面<em class="red" ng-bind="materialAll.totalElements"></em>个产品
-							</div>
-							<div class="batch-line" ng-if="chooseAllPage">
-								已选中所有页面
-								<em class="red" ng-bind="materialAll.totalElements"></em>个产品，
-								<a ng-click="cancelAllPage()" class="blue">点击此处</a>全部取消选中
-							</div>
-						</td>
-					</tr>
 					<!--<tr class="no-hover batch-tr" ng-if="chooseAll && !chooseAllPage" ng-class="{'active': $data.length > 10}">-->
 					</tbody>
 				</table>
@@ -2284,6 +2284,7 @@
     }
 </style>
 
+<!--
 <script>
 	$(function(){
 		$(document).on('click', function () {
@@ -2301,4 +2302,4 @@
 			}
 		});
 	})
-</script>
+</script>-->

src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -695,7 +695,7 @@
 					<span>地&nbsp;&nbsp;&nbsp;&nbsp;址<strong class="text-inverse">*</strong></span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<input type="text" class="form-control" style="border-radius: inherit;" title="address" ng-model="sampleStore.enterprise.address" maxlength="30"/>
+					<input type="text" class="form-control" style="border-radius: inherit;" title="address" ng-model="sampleStore.enterprise.address" maxlength="50"/>
 				</div>
 			</div>
 			<div class="row com_row" style="margin-top: 10px;">
@@ -703,7 +703,7 @@
 					<span>电&nbsp;&nbsp;&nbsp;&nbsp;话<strong class="text-inverse">*</strong></span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<input type="text" class="form-control" style="border-radius: inherit;" title="enTel"  ng-pattern="/^(\d){8,12}$/" ng-model="sampleStore.enterprise.enTel" maxlength="12"/>
+					<input type="text" class="form-control" style="border-radius: inherit;" title="enTel"  ng-pattern="/^[\d-]{8,20}$/" ng-model="sampleStore.enterprise.enTel" maxlength="20"/>
 				</div>
 			</div>
 			<div class="row com_row" style="margin-top: 10px;">