|
|
@@ -60,6 +60,8 @@ import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
+import com.goafanti.customer.bo.CustomerOrganizationDetailBo;
|
|
|
+import com.goafanti.customer.bo.CustomerPersonalDetailBo;
|
|
|
import com.goafanti.demand.bo.DemandAchievementListBo;
|
|
|
import com.goafanti.portal.bo.AchievementDetailBo;
|
|
|
import com.goafanti.portal.bo.AchievementPortalDetailBo;
|
|
|
@@ -148,6 +150,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
a.setDeletedSign(DeleteStatus.UNDELETE.getCode());
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
+ CustomerPersonalDetailBo up= new CustomerPersonalDetailBo();
|
|
|
+ CustomerOrganizationDetailBo uo=new CustomerOrganizationDetailBo();
|
|
|
if (TokenManager.getToken() instanceof Admin) {
|
|
|
a.setTechBrokerId(TokenManager.getAdminId());
|
|
|
}
|
|
|
@@ -159,18 +163,43 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
} else {
|
|
|
a.setAuditStatus(AchievementAuditStatus.CREATE.getCode());
|
|
|
}
|
|
|
- if (null!=TokenManager.getUserId()) {
|
|
|
+ Integer ownerType = a.getOwnerType();
|
|
|
+ String ownerMobile = a.getOwnerMobile();
|
|
|
+ String ownerName = a.getOwnerName();
|
|
|
+ String ownerId = "";
|
|
|
+ if (TokenManager.getToken() instanceof User) {
|
|
|
a.setOwnerId(TokenManager.getUserId());
|
|
|
User u=userMapper.selectByPrimaryKey(TokenManager.getUserId());
|
|
|
- if (null!=u.getType()) {
|
|
|
- a.setOwnerType(u.getType());
|
|
|
- }if (StringUtils.isNotBlank(u.getMobile())) {
|
|
|
- a.setOwnerMobile(u.getMobile());
|
|
|
- }if (StringUtils.isNotBlank(u.getNickname())) {
|
|
|
- a.setOwnerName(u.getNickname());
|
|
|
+ if (null != u) {
|
|
|
+ ownerId = u.getId();
|
|
|
+ if(ownerType == null) ownerType = u.getType();
|
|
|
+ if(StringUtils.isBlank(ownerMobile)) ownerMobile = u.getMobile();
|
|
|
+ if(StringUtils.isBlank(ownerName)) ownerName = u.getNickname();
|
|
|
+ // 如果是单位客户 -查询单位客户的邮件 和通讯地址、证件号码
|
|
|
+ //or
|
|
|
+ //如果是个人 。。。
|
|
|
+ if(ownerType==1){
|
|
|
+ uo=userMapper.findOrganizationCustomerDetail(ownerId);
|
|
|
+ }else if (ownerType==0){
|
|
|
+ up=userMapper.findPersonalCustomerDetail(ownerId);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
a.setCreateTime(now.getTime());
|
|
|
+ a.setOwnerType(ownerType);
|
|
|
+ a.setOwnerMobile(ownerMobile);
|
|
|
+ a.setOwnerName(ownerName);
|
|
|
+ a.setOrgId(ownerId);
|
|
|
+ //设置邮件和。。。
|
|
|
+ if(ownerType==1){
|
|
|
+ a.setOrgEmail(uo.getLegalPersonEmail());
|
|
|
+ a.setOwnerPostalAddress(uo.getPostalAddress());
|
|
|
+ a.setOwnerIdNumber(uo.getLicenceNumber());
|
|
|
+ }else if(ownerType==0){
|
|
|
+ a.setOrgEmail(up.getEmail());
|
|
|
+ a.setOwnerPostalAddress(up.getPostalAddress());
|
|
|
+ a.setOwnerIdNumber(up.getIdNumber());
|
|
|
+ }
|
|
|
achievementMapper.insert(a);
|
|
|
disposeAchievementKeyword(keywords, a, false);
|
|
|
}
|