Bläddra i källkod

本地上传个人库 bug修复

wangdy 8 år sedan
förälder
incheckning
dbc746c4e9

+ 6 - 4
src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -572,12 +572,14 @@ public class ReleaseProductByBatch implements Serializable {
 		setProductDate(productData);
 	}
 
-	public void setPackagingByExcel(Object value) {
+	public void setPackagingByExcel(Object value ,boolean isAPerson) {
 		if (!StringUtils.isEmpty(value)) {
 			String packaging = value.toString();
-			Matcher matcher = chineseAndEnglishPattern.matcher(packaging);
-			if (!matcher.find()) {
-				addErrmsg(ErrorInfoConstant.PACKAGE_METHOD_INFO.getInfo());
+			if (!isAPerson) {
+				Matcher matcher = chineseAndEnglishPattern.matcher(packaging);
+				if (!matcher.find()) {
+					addErrmsg(ErrorInfoConstant.PACKAGE_METHOD_INFO.getInfo());
+				}
 			}
 		} else {
 			addErrmsg(ErrorInfoConstant.PACKAGE_EMPTY_INFO.getInfo());

+ 2 - 2
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -504,7 +504,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 
 			Object packageMethodValue = readWorkBookCell(row.getCell(UploadConstant.PACKAGE_METHOD), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.PACKAGE_METHOD);
-			aProduct.setPackagingByExcel(packageMethodValue);
+			aProduct.setPackagingByExcel(packageMethodValue , isAPerson);
 
 			Object minValue = readWorkBookCell(row.getCell(UploadConstant.MIN_DELIVERY), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.MIN_DELIVERY);
@@ -533,7 +533,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		} else {
 			Object packageMethodValue = readWorkBookCell(row.getCell(UploadConstant.SPECIFICATION), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.SPECIFICATION);
-			aProduct.setPackagingByExcel(packageMethodValue);
+			aProduct.setPackagingByExcel(packageMethodValue , isAPerson);
 		}
 		return result;
 	}

BIN
src/main/resources/jxls-tpl/trade/releaseByBatch-person.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatchError-person.xls


+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_index.html

@@ -51,7 +51,7 @@
                     <span ng-bind="userInfo.userName" class="user" title="{{userInfo.userName}}"><br/><!--<em>账户余额:¥68899.99</em>--></span>
                     <span ng-bind="'|&nbsp;' + (vendor.enName || '个人账户')" class="enName" title="{{vendor.enName}}"><br/> <!--<em>账户余额:¥68899.99</em>--></span>
                     <a ui-sref="vendor_account_management" href="#/account/management/">账户设置&nbsp;》</a>
-                    <a class="count-result" href="http://113.105.74.135:8001/sso/center"><span>待审核:</span><span class="ac" ng-bind="count">10</span></a>
+                    <a class="count-result" href="http://113.105.74.135:8001/sso/center" target="_blank"><span>待审核:</span><span class="ac" ng-bind="count">10</span></a>
                     <!--<p><img src="static/img/vendor/images/sell_grade.png"/>专有服务:******</p>-->
                 </dd>
             </dl>