加入店铺资质获取的排序

src/main/java/com/uas/platform/b2c/prod/store/facade/impl/StoreInFacadeImpl.java

@@ -77,6 +77,16 @@ public class StoreInFacadeImpl implements StoreInFacade {
 				iterator.hasNext();
 			}
 		}
+		if ("BASIC_INFO".equals(kind)) {
+			Enterprise enter = enterpriseDao.findByUu(store.getEnUU());
+			enter.setEnAddress(store.getEnterprise().getEnAddress());
+			enter.setEnTel(store.getEnterprise().getEnTel());
+			enter.setEnFax(store.getEnterprise().getEnFax());
+			enter.setEnPhone(store.getEnterprise().getEnPhone());
+			enter.setEnWeixin(store.getEnterprise().getEnWeixin());
+			enter.setEnQQ(store.getEnterprise().getEnQQ());
+			enterpriseDao.save(enter);
+		}
 		store.setQualifications(qualifications);
         store = storeInDao.save(store);
 		return ResultMap.success(store);

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

@@ -168,22 +168,50 @@ public class StoreInServiceImpl implements StoreInService {
 		if (enUU == null) {
 			return null;
 		}
-
 		List<StoreIn> storeIns = storeDao.findByEnUU(enUU);
 		if(CollectionUtils.isEmpty(storeIns)) {
 			return null;
 		}else {
+			StoreIn returnStoreIn;
 			StoreIn storeInsOne = storeIns.get(0);
 			EnterpriseSimple enterpriseSimple = EnterpriseSimple.translateSimple(SystemSession.getUser().getEnterprise());
 			if (enterpriseSimple.getEnName().equals(storeInsOne.getEnterprise().getEnName())) {
-				return storeInsOne;
+				returnStoreIn = storeInsOne;
 			} else {
 				storeInsOne.setEnterprise(enterpriseSimple);
-				return storeDao.save(storeInsOne);
+				returnStoreIn = storeDao.save(storeInsOne);
 			}
+			Set<Qualification> qualifications = returnStoreIn.getQualifications();
+			Set<Qualification> qualificationsSort = getQualificationsSort();
+			qualificationsSort.addAll(qualifications);
+			returnStoreIn.setQualifications(qualificationsSort);
+			return returnStoreIn;
 		}
 	}
 
+	private Set<Qualification> getQualificationsSort() {
+		return new TreeSet<Qualification>(new Comparator()
+            {
+                public int compare(Object o1, Object o2) {
+                    Qualification time1 = (Qualification)o1;
+                    Qualification time2 = (Qualification)o2;
+                    if (time1.getId().intValue() > time2.getId().intValue())
+                    {
+                        return 1;
+                    }
+                    else if (time1.getId().intValue() == time2.getId().intValue())
+                    {
+                        return 0;
+                    }
+                    else
+                    {
+                        return -1;
+                    }
+                }
+
+            });
+	}
+
 	@Override
 	public String findUUidByEnUU(Long enUU) {
 		if (enUU == null) {
@@ -212,26 +240,7 @@ public class StoreInServiceImpl implements StoreInService {
 		logger.info("Start to execute find.");
 		StoreIn store = storeDao.findByUuid(uuid);
 		// 为了给前端返回一致的顺序
-		Set<Qualification> qualifications = new TreeSet<Qualification>(new Comparator()
-		{
-			public int compare(Object o1, Object o2) {
-				Qualification time1 = (Qualification)o1;
-				Qualification time2 = (Qualification)o2;
-				if (time1.getId().intValue() > time2.getId().intValue())
-				{
-					return 1;
-				}
-				else if (time1.getId().intValue() == time2.getId().intValue())
-				{
-					return 0;
-				}
-				else
-				{
-					return -1;
-				}
-			}
-
-		});
+		Set<Qualification> qualifications = getQualificationsSort();
 		if (!CollectionUtils.isEmpty(store.getQualifications())) {
 			qualifications.addAll(store.getQualifications());
 		}

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

@@ -469,7 +469,8 @@ define(['app/app', 'jquery-uploadify'], function (app) {
 					toaster.pop('success', '感谢您对优软商城的支持，我们会尽快对您提交的信息进行审核，预计审核时间为3个工作日，审核结果将以站内消息及邮件形式通知您！');
 					$rootScope.applyStatus = 'PREPARE';
 					$timeout(function () {
-						window.location.reload();
+						//window.location.href=$scope.rootPath+'/vendor#/store-apply/wait';
+                        $state.go('vendor_store_wait');
 					}, 1000);
 				} else {
 					if (result.code == 6) {

src/main/webapp/resources/view/admin/store_application_maintenance.html

@@ -202,7 +202,7 @@
 			<tr>
 				<th width="50">序号</th>
 				<th>店铺名称</th>
-				<th>店铺简称</th>
+			<!--	<th>店铺简称</th>-->
 				<th>店铺类型</th>
 				<th>
 					<p ng-click="changeShorting()" style="margin: 0;">申请日期
@@ -220,7 +220,7 @@
 			<tr ng-repeat="application in $data ">
 				<td ng-bind="$index + (applicationTableParams.page()-1 )* 10 + 1"></td>
 				<td ng-bind="application.storeName" class="text-left"></td>
-				<td ng-bind="application.storeShortName"></td>
+				<!--<td ng-bind="application.storeShortName"></td>-->
 				<td ng-bind="application.type | storeType"></td>
 				<td>{{application.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
 				<td>

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

@@ -504,15 +504,16 @@
 						<div class="row" style="margin: 0;">
 							<div class="col-md-5 col-md-offset-1 show_image_area show_image">
 								<div ng-if="qualifications[qType.businessLicense]">
-									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
+									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
 									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf" src="static/img/vendor/store/timg.png"/>
 									<div class="hover-show" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf">
 										<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 										<a target="_blank" ng-href="{{qualifications[qType.businessLicense].resourceUrl || 'javascript:void(0);'}}"><i class="fa fa-search"></i>查看</a>
 									</div>
+
 								</div>
-								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense]" non-preview="true"></div>
-								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf">
+								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense].resourceUrl" non-preview="true"></div>
+								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl">
 									<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 									<a ng-click="showQualification(qualifications[qType.businessLicense], true)"><i class="fa fa-search"></i>查看</a>
 								</div>
@@ -679,15 +680,15 @@
 						<div class="row" style="margin: 0;">
 							<div class="col-md-5 col-md-offset-1 show_image_area show_image">
 								<div ng-if="qualifications[qType.businessLicense]">
-									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
+									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
 									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf" src="static/img/vendor/store/timg.png"/>
 									<div class="hover-show" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf">
 										<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 										<a target="_blank" ng-href="{{qualifications[qType.businessLicense].resourceUrl || 'javascript:void(0);'}}" ><i class="fa fa-search"></i>查看</a>
 									</div>
 								</div>
-								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense]" non-preview="true"></div>
-								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf">
+								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense].resourceUrl" non-preview="true"></div>
+								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl">
 									<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 									<a ng-click="showQualification(qualifications[qType.businessLicense], true)"><i class="fa fa-search"></i>查看</a>
 								</div>
@@ -853,15 +854,15 @@
 						<div class="row" style="margin: 0;">
 							<div class="col-md-5 col-md-offset-1 show_image_area show_image">
 								<div ng-if="qualifications[qType.businessLicense]">
-									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
+									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl" ng-src="{{qualifications[qType.businessLicense].resourceUrl}}"/>
 									<img class="previewImage" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf" src="static/img/vendor/store/timg.png"/>
 									<div class="hover-show" ng-if="qualifications[qType.businessLicense] && qualifications[qType.businessLicense].isPdf">
 										<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 										<a target="_blank" ng-href="{{qualifications[qType.businessLicense].resourceUrl || 'javascript:void(0);'}}"><i class="fa fa-search"></i>查看</a>
 									</div>
 								</div>
-								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense]" non-preview="true"></div>
-								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf">
+								<div image-upload data-src="static/img/example/upload-apply.png" on-success="onUploadQualification($data, qType.businessLicense)" ng-if="!qualifications[qType.businessLicense].resourceUrl" non-preview="true"></div>
+								<div class="hover-show" ng-if="qualifications[qType.businessLicense] && !qualifications[qType.businessLicense].isPdf && qualifications[qType.businessLicense].resourceUrl">
 									<span class="delete" ng-click="triggerDeleteTip(qType.businessLicense)" title="删除"><i class="fa fa-trash"></i></span>
 									<a ng-click="showQualification(qualifications[qType.businessLicense], true)"><i class="fa fa-search"></i>查看</a>
 								</div>