Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/java/com/uas/platform/b2c/prod/store/model/StoreApply.java

@@ -41,6 +41,12 @@ public class StoreApply {
 	@Column(name = "apply_useruu")
 	private Long userUU;
 
+	/**
+	 * 主营产品
+	 */
+	@Column(name = "apply_description")
+	private String applyDescription;
+
 	/**
 	 * 申请人姓名
 	 */
@@ -181,6 +187,14 @@ public class StoreApply {
 	public StoreApply() {
 	}
 
+	public String getApplyDescription() {
+		return applyDescription;
+	}
+
+	public void setApplyDescription(String applyDescription) {
+		this.applyDescription = applyDescription;
+	}
+
 	public String getStoreUuid() {
 		return storeUuid;
 	}

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreInServiceImpl.java

@@ -151,6 +151,7 @@ public class StoreInServiceImpl implements StoreInService {
 		store.setType(storeApply.getType());
 		store.setCreateTime(date);
 		store.setUpdateTime(date);
+		store.setDescription(storeApply.getApplyDescription());
 
 		store.setEnUU(storeApply.getEnUU());
 		store.setEnterprise(storeApply.getEnterprise());

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

@@ -21,6 +21,8 @@ define(['app/app', 'jquery-uploadify'], function (app) {
 			taxRegistration: 'TAX_REGISTRATION',
 			businessLicense: 'BUSINESS_LICENSE'
 		};
+		// 初始化主营产品
+		$scope.description = '';
 		// 初始化品牌信息
 		$scope.brands = [{ type: 'BRAND' }];
 		$scope.reason = null;
@@ -388,6 +390,10 @@ define(['app/app', 'jquery-uploadify'], function (app) {
 				toaster.pop('error', '请上传品牌信息');
 				return ;
 			}
+			if(!$scope.description) {
+                toaster.pop('error', '请填写主营产品信息');
+                return ;
+			}
 
 			// 设置店铺申请资质信息
 			$scope.storeApply.qualifications = [];
@@ -441,6 +447,7 @@ define(['app/app', 'jquery-uploadify'], function (app) {
 				}
 
 				$scope.storeApply.brands = brands;
+				$scope.storeApply.applyDescription = $scope.description
 				console.log(brands);
 				console.log($scope.storeApply);
 				submitApplyInfo();

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

@@ -974,6 +974,18 @@
 					原因：<span style="color: #d32526;">{{reason}}</span>
 				</div>
 			</div>
+			<!--主营产品-->
+			<div class="row brand-type">
+				<div class="col-md-1" style="padding:0;">主营产品<em>*</em></div>
+				<div class="col-md-10">
+                  <textarea ng-model="description"
+							style="line-height: 20px;font-size: 14px;margin-top:25px;"
+							rows="8"
+							maxlength="500"
+							class="form-control"
+							placeholder="例：本店主营Panasonic、IT、三星等知名品牌的触控IC、显示驱动IC、液晶屏、功率模块类、电源芯片、高压熔断、被动器件等产品。"></textarea>
+				</div>
+			</div>
 		</div>
 		<!-- Submit button -->
 		<div style="padding: 28px 40px;">