|
|
@@ -4,12 +4,7 @@ import com.uas.platform.b2c.common.account.model.User;
|
|
|
import com.uas.platform.b2c.core.config.SysConf;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.prod.store.facade.StoreApplyFacade;
|
|
|
-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;
|
|
|
@@ -123,17 +118,21 @@ public class StoreApplyFacadeImpl implements StoreApplyFacade {
|
|
|
storeApply.setReason(apply.getReason());
|
|
|
}
|
|
|
List<Qualification> qualifications = apply.getQualifications();
|
|
|
- qualifications.stream().filter(qualification -> StringUtils.isEmpty(qualification.getResourceUrl())).collect(Collectors.toList());
|
|
|
+ qualifications.stream().filter(qualification -> StringUtils.isEmpty(qualification.getResourceUrl())
|
|
|
+ || !QualificationType.BUSINESS_LICENSE.equals(qualification.getResourceUrl())).collect(Collectors.toList());
|
|
|
if (CollectionUtils.isEmpty(qualifications)) {
|
|
|
return new ResultMap(CodeType.NOT_PERMIT, "公司资质信息不能为空");
|
|
|
}
|
|
|
// 更新资质
|
|
|
List<Qualification> qualificationList = storeApply.getQualifications();
|
|
|
if (!CollectionUtils.isEmpty(qualificationList)) {
|
|
|
- Qualification qualification = qualificationList.get(0);
|
|
|
- qualification.setResourceUrl(qualifications.get(0).getResourceUrl());
|
|
|
- qualification.setType(qualifications.get(0).getType());
|
|
|
- qualification.setUpdateTime(new Date());
|
|
|
+ qualificationList.forEach( qualification -> {
|
|
|
+ if (QualificationType.BUSINESS_LICENSE.equals(qualification.getResourceUrl())) {
|
|
|
+ qualification.setResourceUrl(qualifications.get(0).getResourceUrl());
|
|
|
+ qualification.setType(qualifications.get(0).getType());
|
|
|
+ qualification.setUpdateTime(new Date());
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
storeApply.setQualifications(qualificationList);
|
|
|
// 保存审核时的审核人信息和是否通过状态
|