|
|
@@ -6,28 +6,9 @@ import com.uas.ps.core.util.ContextUtils;
|
|
|
import com.uas.ps.entity.Product;
|
|
|
import com.uas.ps.entity.Status;
|
|
|
import com.uas.ps.inquiry.AccessConfiguration;
|
|
|
-import com.uas.ps.inquiry.dao.EnterpriseDao;
|
|
|
-import com.uas.ps.inquiry.dao.InquiryEnRemindDao;
|
|
|
-import com.uas.ps.inquiry.dao.InquiryRemindDao;
|
|
|
-import com.uas.ps.inquiry.dao.ProductDao;
|
|
|
-import com.uas.ps.inquiry.dao.PublicInquiryDao;
|
|
|
-import com.uas.ps.inquiry.dao.PublicInquiryItemDao;
|
|
|
-import com.uas.ps.inquiry.dao.PurcInquiryDao;
|
|
|
-import com.uas.ps.inquiry.dao.PurcInquiryItemDao;
|
|
|
-import com.uas.ps.inquiry.dao.PurcInquiryItemInfoDao;
|
|
|
-import com.uas.ps.inquiry.entity.Constant;
|
|
|
-import com.uas.ps.inquiry.entity.InquiryDetailInfo;
|
|
|
-import com.uas.ps.inquiry.entity.InquiryProductInfo;
|
|
|
-import com.uas.ps.inquiry.entity.InquirySource;
|
|
|
-import com.uas.ps.inquiry.entity.MessageModel;
|
|
|
-import com.uas.ps.inquiry.entity.OrderStatus;
|
|
|
-import com.uas.ps.inquiry.model.Enterprise;
|
|
|
-import com.uas.ps.inquiry.model.InquiryRemind;
|
|
|
-import com.uas.ps.inquiry.model.PublicInquiry;
|
|
|
-import com.uas.ps.inquiry.model.PublicInquiryItem;
|
|
|
-import com.uas.ps.inquiry.model.PurcInquiry;
|
|
|
-import com.uas.ps.inquiry.model.PurcInquiryItem;
|
|
|
-import com.uas.ps.inquiry.model.PurcInquiryItemInfo;
|
|
|
+import com.uas.ps.inquiry.dao.*;
|
|
|
+import com.uas.ps.inquiry.entity.*;
|
|
|
+import com.uas.ps.inquiry.model.*;
|
|
|
import com.uas.ps.inquiry.page.PageInfo;
|
|
|
import com.uas.ps.inquiry.page.SearchFilter;
|
|
|
import com.uas.ps.inquiry.page.criteria.CriterionExpression;
|
|
|
@@ -37,7 +18,6 @@ import com.uas.ps.inquiry.page.criteria.SimpleExpression;
|
|
|
import com.uas.ps.inquiry.page.exception.IllegalOperatorException;
|
|
|
import com.uas.ps.inquiry.service.InquiryService;
|
|
|
import com.uas.ps.inquiry.service.PublicInquiryService;
|
|
|
-import com.uas.ps.inquiry.support.InquiryBufferedLogger;
|
|
|
import com.uas.ps.inquiry.util.FlexJsonUtils;
|
|
|
import com.uas.ps.inquiry.util.HttpUtil;
|
|
|
import com.uas.ps.inquiry.util.ThreadUtils;
|
|
|
@@ -58,12 +38,9 @@ import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
|
import java.net.URLEncoder;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashSet;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Set;
|
|
|
+import java.text.ParseException;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 针对转询价报价单的数据查询操作
|
|
|
@@ -260,6 +237,18 @@ public class InquiryServiceImpl implements InquiryService {
|
|
|
*/
|
|
|
@Override
|
|
|
public PurcInquiry saveInquiry(PurcInquiry currentInquiry) throws NotFoundException {
|
|
|
+ // amount,code,date设置
|
|
|
+ if (StringUtils.isEmpty(currentInquiry.getAmount())) {
|
|
|
+ currentInquiry.setAmount(currentInquiry.getInquiryItems().size());
|
|
|
+ }
|
|
|
+ if (StringUtils.isEmpty(currentInquiry.getCode())) {
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddsss");
|
|
|
+ try {
|
|
|
+ currentInquiry.setCode("MALL" + sdf.parse(sdf.format(new Date())).getTime());
|
|
|
+ } catch (ParseException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
//通过流水号和企业号找到公共询价单
|
|
|
List<PurcInquiry> existInquiryList = purcInquiryDao.findByCodeAndEnUU(currentInquiry.getCode(), currentInquiry.getEnUU());
|
|
|
if (!CollectionUtils.isEmpty(existInquiryList)) {
|