|
|
@@ -7,16 +7,12 @@ import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.core.utils.UuidUtils;
|
|
|
import com.uas.platform.b2c.prod.store.dao.StoreApplyDao;
|
|
|
import com.uas.platform.b2c.prod.store.dao.StoreBrandInfoDao;
|
|
|
-import com.uas.platform.b2c.prod.store.model.EnterpriseSimple;
|
|
|
-import com.uas.platform.b2c.prod.store.model.Qualification;
|
|
|
-import com.uas.platform.b2c.prod.store.model.StoreApply;
|
|
|
-import com.uas.platform.b2c.prod.store.model.StoreBrandInfo;
|
|
|
-import com.uas.platform.b2c.prod.store.model.StoreIn;
|
|
|
-import com.uas.platform.b2c.prod.store.model.StoreType;
|
|
|
+import com.uas.platform.b2c.prod.store.model.*;
|
|
|
import com.uas.platform.b2c.prod.store.service.StoreApplyService;
|
|
|
import com.uas.platform.b2c.prod.store.service.StoreInService;
|
|
|
import com.uas.platform.b2c.trade.support.CodeType;
|
|
|
import com.uas.platform.b2c.trade.support.ResultMap;
|
|
|
+import com.uas.platform.core.exception.IllegalStatusException;
|
|
|
import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.persistence.criteria.CriterionExpression;
|
|
|
import com.uas.platform.core.persistence.criteria.SimpleExpression;
|
|
|
@@ -33,6 +29,7 @@ import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
|
import java.util.Date;
|
|
|
+import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
|
@@ -71,6 +68,28 @@ public class StoreApplyServiceImpl implements StoreApplyService {
|
|
|
&& StoreType.ORIGINAL_FACTORY != storeApply.getType()) {
|
|
|
return new ResultMap(CodeType.ERROR_STATE, "请选择正确的的店铺类型");
|
|
|
}
|
|
|
+ // 处理并验证资质证明信息
|
|
|
+ List<Qualification> qualificationList = storeApply.getQualifications();
|
|
|
+ if (CollectionUtils.isEmpty(qualificationList)) {
|
|
|
+ throw new IllegalStatusException("请上传营业执照信息");
|
|
|
+ }
|
|
|
+ boolean reasonable = false;
|
|
|
+ Iterator<Qualification> iterator = qualificationList.iterator();
|
|
|
+ while (iterator.hasNext()) {
|
|
|
+ Qualification qualification = iterator.next();
|
|
|
+ if (StringUtils.isEmpty(qualification.getResourceUrl())) {
|
|
|
+ iterator.remove();
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (QualificationType.BUSINESS_LICENSE == qualification.getType()) {
|
|
|
+ reasonable = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ storeApply.setQualifications(qualificationList);
|
|
|
+ // 验证是否上传营业执照信息
|
|
|
+ if (!reasonable) {
|
|
|
+ throw new IllegalStatusException("请上传营业执照信息");
|
|
|
+ }
|
|
|
|
|
|
User user = SystemSession.getUser();
|
|
|
if (user == null || user.getEnterprise() == null) {
|