处理代码中出现的警告

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10145 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/dao/PagingReleaseCountDao.java

@@ -1,13 +1,13 @@
 package com.uas.platform.b2b.dao;
 
-import com.uas.platform.b2b.model.PagingReleaseCount;
-import com.uas.search.b2b.service.SearchService;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
+import com.uas.platform.b2b.model.PagingReleaseCount;
 
 /**
  * Created by wangmh on 2017/7/10.

src/main/java/com/uas/platform/b2b/dao/PagingReleaseDetailDao.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.dao;
 
-import com.uas.platform.b2b.model.PagingReleaseDetail;
-import org.hibernate.annotations.SQLUpdate;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -9,12 +9,8 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.PreUpdate;
-import java.util.List;
-
-import static com.alibaba.druid.stat.TableStat.Mode.Delete;
+import com.uas.platform.b2b.model.PagingReleaseDetail;
 
 /**
  * Created by dongbw

src/main/java/com/uas/platform/b2b/erp/controller/ProductSampleController.java

@@ -1,30 +1,29 @@
 package com.uas.platform.b2b.erp.controller;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import com.uas.platform.b2b.erp.model.ProductSample;
 import com.uas.platform.b2b.erp.model.ProductSampleApproval;
 import com.uas.platform.b2b.erp.model.SaleSampleSend;
-import com.uas.platform.b2b.erp.service.InquiryService;
 import com.uas.platform.b2b.erp.service.PurchaseSampleService;
 import com.uas.platform.b2b.erp.service.SaleSampleDownService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.model.Attach;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.service.AttachService;
-import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.service.PurchaseProofingService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 对买家ERP的数据接口<br>
@@ -37,12 +36,6 @@ import java.util.Map;
 @RequestMapping("/erp/purchase/sample")
 public class ProductSampleController {
 
-	@Autowired
-	private InquiryService inquiryService;
-
-	@Autowired
-	private PurchaseInquiryService purchaseInquiryService;
-
 	@Autowired
 	private AttachService attachService;
 	

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseController.java

@@ -1,6 +1,16 @@
 package com.uas.platform.b2b.erp.controller;
 
-import com.alibaba.fastjson.JSON;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import com.uas.platform.b2b.erp.model.MessageLog;
 import com.uas.platform.b2b.erp.model.Purchase;
 import com.uas.platform.b2b.erp.model.PurchaseDetailEnd;
@@ -10,16 +20,6 @@ import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
 
 /**
  * 对买家ERP的数据接口<br>

src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java

@@ -1,11 +1,32 @@
 package com.uas.platform.b2b.erp.controller;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.service.TenderService;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.EnterpriseBaseInfo;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.PurchaseTender;
+import com.uas.platform.b2b.model.SaleTenderItem;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.VendorContact;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.VendorService;
@@ -19,21 +40,12 @@ import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * Created by dongbw
  * 17/05/03 9:54.
  */
+@SuppressWarnings("deprecation")
 @RestController
 @RequestMapping(value = "/erp/tender")
 public class TenderController {

src/main/java/com/uas/platform/b2b/erp/controller/VendorRateController.java

@@ -1,10 +1,28 @@
 package com.uas.platform.b2b.erp.controller;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.uas.account.support.Page;
 import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.erp.model.*;
+import com.uas.platform.b2b.erp.model.B2BCustomer;
+import com.uas.platform.b2b.erp.model.B2BVendor;
+import com.uas.platform.b2b.erp.model.PageInfo;
+import com.uas.platform.b2b.erp.model.VendorInfo;
+import com.uas.platform.b2b.erp.model.VendorRate;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -24,20 +42,8 @@ import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.List;
 
+@SuppressWarnings("deprecation")
 @Controller
 @RequestMapping("/erp/vendor")
 public class VendorRateController {

src/main/java/com/uas/platform/b2b/erp/model/PurchaseTenderErp.java

@@ -1,14 +1,26 @@
 package com.uas.platform.b2b.erp.model;
 
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.PurchaseTenderProd;
-
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.Enterprise;
+
 /**
  *  招标单信息(因为存在根据日期判断状态，需要使用定时任务，采用视图)
  * Created by dongbw on 17/03/07 11:16.

src/main/java/com/uas/platform/b2b/erp/model/SaleTenderProdErp.java

@@ -1,11 +1,17 @@
 package com.uas.platform.b2b.erp.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
 /**
  * 招标单产品信息

src/main/java/com/uas/platform/b2b/erp/service/impl/APCheckServiceImpl.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import com.uas.platform.b2b.dao.PurchaseApCheckDao;
-import com.uas.platform.b2b.dao.PurchaseApCheckItemDao;
 import com.uas.platform.b2b.erp.model.APCheck;
 import com.uas.platform.b2b.erp.service.APCheckService;
 import com.uas.platform.b2b.model.PurchaseApCheck;
@@ -22,9 +21,6 @@ public class APCheckServiceImpl implements APCheckService {
 	@Autowired
 	private PurchaseApCheckDao purchaseAPCheckDao;
 
-	@Autowired
-	private PurchaseApCheckItemDao purchaseAPCheckitemDao;
-
 	@Override
 	public List<APCheck> convertApCheck(List<PurchaseApCheck> apCheck) {
 		List<APCheck> APChecks = new ArrayList<APCheck>();

src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryMouldServiceImpl.java

@@ -10,8 +10,6 @@ import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.PurchaseInquiryMouldDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryMouldDetailDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryMouldItemDao;
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.erp.model.InquiryMould;
@@ -34,12 +32,6 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
 	@Autowired
 	private PurchaseInquiryMouldDao purchaseInquiryMouldDao;
 
-	@Autowired
-	private PurchaseInquiryMouldItemDao purchaseInquiryMouldItemDao;
-
-	@Autowired
-	private PurchaseInquiryMouldDetailDao purchaseInquiryMouldDetailDao;
-
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 

src/main/java/com/uas/platform/b2b/erp/service/impl/MakeServiceImpl.java

@@ -10,9 +10,7 @@ import org.springframework.util.CollectionUtils;
 
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.MakeOrderDao;
-import com.uas.platform.b2b.dao.MakeOrderItemDao;
 import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.erp.model.Make;
 import com.uas.platform.b2b.erp.model.MakeEnd;
@@ -32,18 +30,12 @@ public class MakeServiceImpl implements MakeService {
 	@Autowired
 	private MakeOrderDao makeOrderDao;
 
-	@Autowired
-	private MakeOrderItemDao makeOrderItemDao;
-
 	@Autowired
 	private ProductDao productDao;
 
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
-	@Autowired
-	private UserDao userDao;
-
 	@Autowired
 	private VendorDao vendorDao;
 

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseQuaMRBServiceImpl.java

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Service;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.PurchaseBadInDao;
 import com.uas.platform.b2b.dao.PurchaseMRBDao;
-import com.uas.platform.b2b.dao.PurchaseOrderDao;
 import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
 import com.uas.platform.b2b.erp.model.PurchaseQuaMRB;
 import com.uas.platform.b2b.erp.service.PurchaseQuaMRBService;
@@ -23,9 +22,6 @@ import com.uas.platform.b2b.support.SystemSession;
 @Service
 public class PurchaseQuaMRBServiceImpl implements PurchaseQuaMRBService {
 
-	@Autowired
-	private PurchaseOrderDao purchaseOrderDao;
-
 	@Autowired
 	private PurchaseOrderItemDao purchaseOrderItemDao;
 

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseServiceImpl.java

@@ -1,21 +1,36 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.platform.b2b.dao.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.ProductDao;
+import com.uas.platform.b2b.dao.PurchaseOrderDao;
+import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.erp.model.MessageLog;
 import com.uas.platform.b2b.erp.model.Purchase;
 import com.uas.platform.b2b.erp.model.PurchaseDetailEnd;
 import com.uas.platform.b2b.erp.model.PurchaseReply;
 import com.uas.platform.b2b.erp.service.PurchaseService;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.PrintLog;
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderAllItem;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
+import com.uas.platform.b2b.model.PurchaseOrderReply;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 @Service
 public class PurchaseServiceImpl implements PurchaseService {
@@ -32,9 +47,6 @@ public class PurchaseServiceImpl implements PurchaseService {
 	private PurchaseOrderDao purchaseOrderDao;
 	@Autowired
 	private PurchaseOrderItemDao purchaseOrderItemDao;
-	@Autowired
-	private PrintLogDao printLogDao;
-
 	@Override
 	public List<PurchaseOrderAllItem> convertPurchase(List<Purchase> purchases) {
 		List<PurchaseOrderAllItem> orderItems = new ArrayList<PurchaseOrderAllItem>();

src/main/java/com/uas/platform/b2b/erp/service/impl/QuotationDownServiceImpl.java

@@ -3,11 +3,9 @@ package com.uas.platform.b2b.erp.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import com.uas.platform.b2b.dao.AttachDao;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.model.QuotationDownDecide;
 import com.uas.platform.b2b.erp.model.RemoteFile;
@@ -18,9 +16,6 @@ import com.uas.platform.b2b.model.PurchaseInquiryItem;
 @Service
 public class QuotationDownServiceImpl implements QuotationDownService {
 
-	@Autowired
-	private AttachDao attachDao;
-
 	@Override
 	public List<QuotationDown> convertPurchaseInquiry(List<PurchaseInquiryItem> inquiryItems) {
 		List<QuotationDown> downs = new ArrayList<QuotationDown>();

src/main/java/com/uas/platform/b2b/erp/service/impl/SaleSampleDownServiceImpl.java

@@ -4,11 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.uas.platform.b2b.dao.AttachDao;
-import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
 import com.uas.platform.b2b.erp.model.RemoteFile;
 import com.uas.platform.b2b.erp.model.SaleSampleApproval;
 import com.uas.platform.b2b.erp.model.SaleSampleDown;
@@ -22,11 +19,6 @@ import com.uas.platform.b2b.model.PurchaseProofingSend;
 @Service
 public class SaleSampleDownServiceImpl implements SaleSampleDownService {
 	
-	@Autowired
-	private AttachDao attachDao;
-	@Autowired
-	private PurchaseProofingSendDao purchaseProofingSendDao;
-
 	@Override
 	public List<SaleSampleDown> convertPurchaseProofingItems(
 			List<PurchaseProofingItem> proofingItems) {

src/main/java/com/uas/platform/b2b/erp/service/impl/TenderServiceImpl.java

@@ -1,14 +1,16 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.erp.model.SaleTenderErp;
-import com.uas.platform.b2b.erp.service.TenderService;
-import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.service.AttachService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.PurcTenderProd;
-import com.uas.platform.b2b.temporary.model.TenderContactInfo;
-import com.uas.platform.core.model.Constant;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -19,11 +21,33 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.*;
+import com.uas.platform.b2b.dao.AttachDao;
+import com.uas.platform.b2b.dao.EnterpriseBaseInfoDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.PurchaseTenderDao;
+import com.uas.platform.b2b.dao.PurchaseTenderProdDao;
+import com.uas.platform.b2b.dao.SaleTenderDao;
+import com.uas.platform.b2b.dao.SaleTenderErpDao;
+import com.uas.platform.b2b.dao.SaleTenderItemDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.VendorContactDao;
+import com.uas.platform.b2b.erp.model.SaleTenderErp;
+import com.uas.platform.b2b.erp.service.TenderService;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.EnterpriseBaseInfo;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.PurchaseTender;
+import com.uas.platform.b2b.model.PurchaseTenderProd;
+import com.uas.platform.b2b.model.SaleTender;
+import com.uas.platform.b2b.model.SaleTenderItem;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.VendorContact;
+import com.uas.platform.b2b.service.AttachService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.temporary.model.PurcTenderProd;
+import com.uas.platform.b2b.temporary.model.TenderContactInfo;
+import com.uas.platform.core.model.Constant;
 
 /**
  * Created by dongbw on 17/03/07 14:16.
@@ -839,8 +863,7 @@ public class TenderServiceImpl implements TenderService {
      */
     @Override
     public ModelMap decide(List<SaleTenderItem> saleTenderItems) {
-        boolean isApply = false;
-//        Set<SaleTender> saleTenders = new HashSet<>();
+		// Set<SaleTender> saleTenders = new HashSet<>();
 //        for (SaleTenderItem tenderItem : saleTenderItems) {
 //            tenderItem = saleTenderItemDao.findOne(tenderItem.getId());
 //            if (tenderItem.getApplyStatus() != null && tenderItem.getApplyStatus() == Constant.YES) {

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemDecideReleaseEvent.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2b.event;
 
+import java.util.Date;
+import java.util.List;
+
 import com.uas.platform.b2b.model.PagingRelease;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * 询价单保存时生成消息事件
  *
@@ -15,7 +15,12 @@ import java.util.List;
  */
 public class PurchaseInquiryItemDecideReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
-    public PurchaseInquiryItemDecideReleaseEvent(List<PurchaseInquiryItem> savedList) {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public PurchaseInquiryItemDecideReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
     }
 

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemInvalidReleaseEvent.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2b.event;
 
+import java.util.Date;
+import java.util.List;
+
 import com.uas.platform.b2b.model.PagingRelease;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * erp用户作废询价单时生成消息事件
  *
@@ -15,7 +15,12 @@ import java.util.List;
  */
 public class PurchaseInquiryItemInvalidReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
-    public PurchaseInquiryItemInvalidReleaseEvent(List<PurchaseInquiryItem> savedList) {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public PurchaseInquiryItemInvalidReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
     }
 

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemReplyReleaseEvent.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2b.event;
 
+import java.util.Date;
+import java.util.List;
+
 import com.uas.platform.b2b.model.PagingRelease;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * 回复询价单时生成消息事件
  * Created by dongbw
@@ -14,7 +14,12 @@ import java.util.List;
 public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
 
-    public PurchaseInquiryItemReplyReleaseEvent(List<PurchaseInquiryItem> savedList) {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public PurchaseInquiryItemReplyReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
     }
 

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemSaveReleaseEvent.java

@@ -1,12 +1,12 @@
 package com.uas.platform.b2b.event;
 
+import java.util.Date;
+import java.util.List;
+
 import com.uas.platform.b2b.model.PagingRelease;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * 询价单保存时生成消息事件
  *
@@ -15,7 +15,12 @@ import java.util.List;
  */
 public class PurchaseInquiryItemSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
-    public PurchaseInquiryItemSaveReleaseEvent(List<PurchaseInquiryItem> savedList) {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public PurchaseInquiryItemSaveReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
     }
 

src/main/java/com/uas/platform/b2b/event/PurchaseOrderEndReleaseEvent.java

@@ -1,13 +1,13 @@
 package com.uas.platform.b2b.event;
 
+import java.util.Date;
+import java.util.List;
+
 import com.uas.platform.b2b.model.PagingRelease;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.core.model.Constant;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * 采购订单保存时生成消息事件
  * Created by dongbw
@@ -15,7 +15,12 @@ import java.util.List;
  */
 public class PurchaseOrderEndReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrderItem> {
 
-    public PurchaseOrderEndReleaseEvent(List<PurchaseOrderItem> savedList) {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public PurchaseOrderEndReleaseEvent(List<PurchaseOrderItem> savedList) {
         super(savedList);
     }
 

src/main/java/com/uas/platform/b2b/event/PurchaseOrderReplyReleaseEvent.java

@@ -1,14 +1,14 @@
 package com.uas.platform.b2b.event;
 
+import java.util.Date;
+import java.util.List;
+
 import com.uas.platform.b2b.model.PagingRelease;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * 回复采购订单时生成消息事件
  * Created by dongbw
@@ -16,7 +16,12 @@ import java.util.List;
  */
 public class PurchaseOrderReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrder> {
 
-    public PurchaseOrderReplyReleaseEvent(List<PurchaseOrder> savedList) {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public PurchaseOrderReplyReleaseEvent(List<PurchaseOrder> savedList) {
         super(savedList);
     }
 

src/main/java/com/uas/platform/b2b/event/PurchaseOrderSaveReleaseEvent.java

@@ -1,13 +1,13 @@
 package com.uas.platform.b2b.event;
 
+import java.util.Date;
+import java.util.List;
+
 import com.uas.platform.b2b.model.PagingRelease;
 import com.uas.platform.b2b.model.PagingReleaseDetail;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.core.model.Constant;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * 采购订单保存时生成消息事件
  * Created by dongbw
@@ -15,7 +15,12 @@ import java.util.List;
  */
 public class PurchaseOrderSaveReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseOrderAll> {
 
-    public PurchaseOrderSaveReleaseEvent(List<PurchaseOrderAll> savedList) {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public PurchaseOrderSaveReleaseEvent(List<PurchaseOrderAll> savedList) {
         super(savedList);
     }
 

src/main/java/com/uas/platform/b2b/filter/AccessSignatureInterceptor.java

@@ -22,6 +22,7 @@ import com.uas.platform.core.util.encry.HmacUtils;
  * @author yingp
  *
  */
+@SuppressWarnings("deprecation")
 public class AccessSignatureInterceptor extends HandlerInterceptorAdapter {
 
 	private final static String idParam = "access_id";

src/main/java/com/uas/platform/b2b/filter/AccessTokenInterceptor.java

@@ -29,6 +29,7 @@ import com.uas.platform.core.util.AgentUtils;
  * @author yingp
  *
  */
+@SuppressWarnings("deprecation")
 public class AccessTokenInterceptor extends HandlerInterceptorAdapter {
 
 	private static final String access_token_param = "access_token";

src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -1,22 +1,17 @@
 package com.uas.platform.b2b.filter;
 
-import com.uas.platform.b2b.dao.ResourceItemDao;
-import com.uas.platform.b2b.manage.service.AccessTokenService;
-import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.service.EnterpriseService;
-import com.uas.platform.b2b.service.RoleService;
-import com.uas.platform.b2b.service.SigninLogService;
-import com.uas.platform.b2b.service.UserService;
-import com.uas.platform.b2b.support.SecurityConstant;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.UserCreater;
-import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.util.AgentUtils;
-import com.uas.platform.core.util.encry.Md5Utils;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import com.uas.sso.SSOHelper;
-import com.uas.sso.SSOToken;
-import com.uas.sso.web.spring.AbstractSSOInterceptor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,10 +29,30 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.util.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import com.uas.platform.b2b.dao.ResourceItemDao;
+import com.uas.platform.b2b.manage.service.AccessTokenService;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.ResourceItem;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.SigninLog;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.service.EnterpriseService;
+import com.uas.platform.b2b.service.RoleService;
+import com.uas.platform.b2b.service.SigninLogService;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.SecurityConstant;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.UserCreater;
+import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.util.AgentUtils;
+import com.uas.platform.core.util.encry.Md5Utils;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.sso.SSOHelper;
+import com.uas.sso.SSOToken;
+import com.uas.sso.web.spring.AbstractSSOInterceptor;
 
+@SuppressWarnings("deprecation")
 public class SSOInterceptor extends AbstractSSOInterceptor {
 
 	private static final Logger logger = Logger.getLogger(SSOInterceptor.class);

src/main/java/com/uas/platform/b2b/manage/controller/OrdersController.java

@@ -31,6 +31,7 @@ import com.uas.platform.b2b.service.PurchaseSendService;
  * @author aof
  * @date 2015年9月24日
  */
+@SuppressWarnings("deprecation")
 @Controller(value = "manage.OrdersController")
 @RequestMapping(value = "/manage/orders")
 public class OrdersController {

src/main/java/com/uas/platform/b2b/mobile/service/impl/MobileReleaseServiceImpl.java

@@ -1,6 +1,22 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import com.uas.platform.b2b.dao.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.PagingReleaseDao;
+import com.uas.platform.b2b.dao.PagingReleaseDetailDao;
+import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.mobile.model.ReleaseDetail;
 import com.uas.platform.b2b.mobile.model.ReleaseTotal;
 import com.uas.platform.b2b.mobile.service.MobileReleaseService;
@@ -11,12 +27,6 @@ import com.uas.platform.b2b.model.User;
 import com.uas.platform.core.model.Constant;
 import com.uas.sso.common.util.HttpUtil;
 import com.uas.sso.common.util.HttpUtil.ResponseWrap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
 
 /**
  * Created by dongbw
@@ -42,8 +52,6 @@ public class MobileReleaseServiceImpl implements MobileReleaseService {
 
     private final static String PROD_URL = "http://113.105.74.140:8092/tigase/baiduPush";
 
-    private final static String DEV_URL = "http://192.168.253.222:8092/tigase/baiduPush";
-
     @Override
     public ModelMap getReleaseCounts(Long vendUseruu, Long venduu) {
         ModelMap map = new ModelMap();

src/main/java/com/uas/platform/b2b/model/PurchaseOrder.java

@@ -218,6 +218,7 @@ public class PurchaseOrder implements Serializable {
 	/**
 	 * 打印日志
 	 */
+	@SuppressWarnings("deprecation")
 	@OneToMany(fetch = FetchType.EAGER)
 	@JoinColumn(name = "pl_foreign", insertable = false, updatable = false)
 	@org.hibernate.annotations.ForeignKey(name = "none")

src/main/java/com/uas/platform/b2b/model/PurchaseProofingSend.java

@@ -4,11 +4,21 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
-import org.hibernate.annotations.ForeignKey;
-import org.hibernate.annotations.Where;
 
 import com.alibaba.fastjson.annotation.JSONField;
 
@@ -18,7 +28,6 @@ import com.alibaba.fastjson.annotation.JSONField;
  * @author suntg
  *
  */
-@SuppressWarnings("deprecation")
 @Table(name = "purc$proofingsend")
 @Entity
 public class PurchaseProofingSend implements Serializable {

src/main/java/com/uas/platform/b2b/model/SaleTender.java

@@ -1,15 +1,29 @@
 package com.uas.platform.b2b.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.uas.platform.b2b.temporary.model.TenderContactInfo;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.hibernate.annotations.Where;
-
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Set;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.OrderBy;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.uas.platform.b2b.temporary.model.TenderContactInfo;
+
 /**
  * 投标单主表 （uas招标需要投标状态根据公布结果时间判断，用视图处理，
  *            投标单保存时，报错此处不允许虚拟列，所以这个实体还是用投标单表）

src/main/java/com/uas/platform/b2b/openapi/controller/AuthedWebPageController.java

@@ -40,6 +40,7 @@ import com.uas.platform.core.util.AgentUtils;
  * @author yingp
  *
  */
+@SuppressWarnings("deprecation")
 @RequestMapping("/openapi")
 @Controller
 public class AuthedWebPageController {

src/main/java/com/uas/platform/b2b/openapi/controller/OpenAccessTokenController.java

@@ -29,6 +29,7 @@ import com.uas.platform.core.util.AgentUtils;
  * @author yingp
  *
  */
+@SuppressWarnings("deprecation")
 @RestController
 @RequestMapping("/openapi/access_token")
 public class OpenAccessTokenController {

src/main/java/com/uas/platform/b2b/service/impl/AttachServiceImpl.java

@@ -1,23 +1,19 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
-import com.uas.dfs.service.FileClient;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import com.uas.dfs.service.FileClient;
 import com.uas.platform.b2b.core.util.PathUtils;
 import com.uas.platform.b2b.dao.AttachDao;
 import com.uas.platform.b2b.model.Attach;

src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -1,15 +1,55 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.transaction.Transactional;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
 import com.uas.account.entity.RequsetStatus;
 import com.uas.account.util.AccountUtils;
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.dao.ComponentDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.PagingReleaseDao;
+import com.uas.platform.b2b.dao.ProductDao;
+import com.uas.platform.b2b.dao.ProductMatchResultDao;
+import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
+import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.Component;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.EnterpriseInfo;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.ProductMatchResult;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderAllItem;
+import com.uas.platform.b2b.model.UserBaseInfo;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.*;
+import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
+import com.uas.platform.b2b.temporary.model.NewPurcOrder;
+import com.uas.platform.b2b.temporary.model.OrderItems;
+import com.uas.platform.b2b.temporary.model.PartStatus;
+import com.uas.platform.b2b.temporary.model.ProdInfo;
+import com.uas.platform.b2b.temporary.model.UserSpaceDetail;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
@@ -19,18 +59,6 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
-import javax.transaction.Transactional;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 @Service
 @Transactional
@@ -59,18 +87,12 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	@Autowired
 	private AttachService attachService;
 
-	@Autowired
-	private CartDetailDao cartDetailDao;
-
 	@Autowired
 	private SearchService searchService;
 
 	@Autowired
 	private ProductMatchResultDao productMatchResultDao;
 
-	@Autowired
-	private PagingReleaseDetailDao pagingReleaseDetailDao;
-
 	@Autowired
 	private PagingReleaseDao pagingReleaseDao;
 
@@ -719,8 +741,8 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	@Override
 	public ModelMap addtoCart(NewPurcOrder neworder) {
 		ModelMap map = new ModelMap();
-		Cart cart = new Cart();
-		Set<CartDetail> cartDetails = new HashSet<CartDetail>();
+		PurchaseOrderAll order = new PurchaseOrderAll();
+		Set<PurchaseOrderAllItem> orderDetails = new HashSet<PurchaseOrderAllItem>();
 		EnterpriseInfo enter = enterpriseDao.findEnterpriseInfoByUu(SystemSession.getUser().getEnterprise().getUu());
 		List<UserBaseInfo> userBaseInfos = userBaseInfoDao.findByUserTel(neworder.getVendusertel());
 		UserBaseInfo userBaseInfo = new UserBaseInfo();
@@ -728,59 +750,59 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 			userBaseInfo = userBaseInfos.get(0);
 		}
 		// 主记录
-		cart.setCode(neworder.getCode());
-		cart.setDate(neworder.getDate());
-		cart.setEnUU(SystemSession.getUser().getEnterprise().getUu());
-		cart.setRecorder(SystemSession.getUser().getUserName());
-		cart.setUserUU(SystemSession.getUser().getUserUU());
-		cart.setEnterprise(enter);
-		cart.setUser(SystemSession.getUser());
+		order.setCode(neworder.getCode());
+		order.setDate(neworder.getDate());
+		order.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+		order.setRecorder(SystemSession.getUser().getUserName());
+		order.setUserUU(SystemSession.getUser().getUserUU());
+		order.setEnterprise(enter);
+		order.setUser(SystemSession.getUser());
 		if (userBaseInfo != null) {// 如果供应商联系人存在uu号，录入该uu号；如果不存在，录入企业管理员uu
-			cart.setVendUserUU(userBaseInfo.getUserUU());
+			order.setVendUserUU(userBaseInfo.getUserUU());
 		} else {
-			cart.setVendUserUU(neworder.getCustUserUU());
+			order.setVendUserUU(neworder.getCustUserUU());
 		}
-		cart.setVendUU(neworder.getCust().getUu());
-		cart.setCurrency(neworder.getCurrency());
-		cart.setShipAddress(neworder.getShipaddress());
-		cart.setReceiveName(neworder.getCust().getEnName());
-		cart.setReceiveCode(String.valueOf(neworder.getCust().getUu()));
-		cart.setEnName(neworder.getCust().getEnName());
-		cart.setStatus(Status.UNAUDIT.value());
-		cart.setCurrency(neworder.getCurrency());
-		cart.setPayments(neworder.getPayments());
-		cart.setRemark(neworder.getRemark());
-		cart.setVenduser(neworder.getVenduser());
-		cart.setVendusertel(neworder.getVendusertel());
+		order.setVendUU(neworder.getCust().getUu());
+		order.setCurrency(neworder.getCurrency());
+		order.setShipAddress(neworder.getShipaddress());
+		order.setReceiveName(neworder.getCust().getEnName());
+		order.setReceiveCode(String.valueOf(neworder.getCust().getUu()));
+		order.setEnName(neworder.getCust().getEnName());
+		order.setStatus((short) Status.UNAUDIT.value());
+		order.setCurrency(neworder.getCurrency());
+		order.setPayments(neworder.getPayments());
+		order.setRemark(neworder.getRemark());
+		order.setVenduser(neworder.getVenduser());
+		order.setVendusertel(neworder.getVendusertel());
 		short i = 1;
 		if (!CollectionUtils.isEmpty(neworder.getOrderItems())) {
 			for (OrderItems orderitem : neworder.getOrderItems()) {
 				// 采购详情
-				CartDetail cartDetail = new CartDetail();
-				cartDetail.setDelivery(orderitem.getDelivery());
-				cartDetail.setQty(Double.valueOf(orderitem.getQty()));
-				cartDetail.setProduct(productDao.findOne(orderitem.getId()));
-				cartDetail.setRemark(orderitem.getRemark());
-				cartDetail.setProductId(orderitem.getId());
-				cartDetail.setNumber(i);
-				cartDetail.setCart(cart);
-				cartDetail.setPrice(Double.valueOf(orderitem.getPrice()));
-				cartDetail.setTaxrate(orderitem.getRate());
-				cartDetails.add(cartDetail);
+				PurchaseOrderAllItem orderDetail = new PurchaseOrderAllItem();
+				orderDetail.setDelivery(orderitem.getDelivery());
+				orderDetail.setQty(Double.valueOf(orderitem.getQty()));
+				orderDetail.setProduct(productDao.findOne(orderitem.getId()));
+				orderDetail.setRemark(orderitem.getRemark());
+				orderDetail.setProductId(orderitem.getId());
+				orderDetail.setNumber(i);
+				orderDetail.setOrder(order);
+				orderDetail.setPrice(Double.valueOf(orderitem.getPrice()));
+				orderDetail.setTaxrate(orderitem.getRate());
+				orderDetails.add(orderDetail);
 				i++;
 			}
 		}
-		List<CartDetail> cartDets = cartDetailDao.save(cartDetails);
-		logger.log("购物车添加商品", "向购物车添加商品（id=" + cartDets.get(0).getCart().getId() + "）",
+		List<PurchaseOrderAllItem> orderDets = purchaseOrderAllItemDao.save(orderDetails);
+		logger.log("购物车添加商品", "向购物车添加商品（id=" + orderDets.get(0).getOrder().getId() + "）",
 				SystemSession.getUser().getUserUU(), SystemSession.getUser().getIp());
 		map.put("success", "加入购物车成功");
-		map.put("id", cartDets.get(0).getCart().getId());
+		map.put("id", orderDets.get(0).getOrder().getId());
 		// 保存这次下单的付款方式，方便下次自动带入
 		List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(SystemSession.getUser().getEnterprise().getUu(),
-				cart.getVendUU());
+				order.getVendUU());
 		if (!CollectionUtils.isEmpty(vendors)) {
 			for (Vendor vendor : vendors) {
-				vendor.setPaymethod(cart.getPayments());
+				vendor.setPaymethod(order.getPayments());
 				vendorDao.save(vendor);
 			}
 		}

src/main/java/com/uas/platform/b2b/service/impl/MakeOrderChangeServiceImpl.java

@@ -11,8 +11,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.model.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -22,7 +20,16 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.dao.MakeOrderChangeIndexDao;
+import com.uas.platform.b2b.dao.MakeOrderChangeItemDao;
+import com.uas.platform.b2b.dao.MakeOrderDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.event.MakeOrderChangeSaveEvent;
+import com.uas.platform.b2b.model.MakeOrder;
+import com.uas.platform.b2b.model.MakeOrderChangeItem;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.UserBaseInfo;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeOrderChangeService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -44,9 +51,6 @@ public class MakeOrderChangeServiceImpl implements MakeOrderChangeService {
 	@Autowired
 	private MakeOrderDao makeOrderDao;
 
-	@Autowired
-	private MakeOrderChangeDao makeOrderChangeDao;
-
 	@Autowired
 	private UserBaseInfoDao userBaseInfoDao;
 

src/main/java/com/uas/platform/b2b/service/impl/MakeReturnServiceImpl.java

@@ -9,7 +9,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import com.uas.platform.b2b.dao.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -19,6 +18,10 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.dao.MakeOrderDao;
+import com.uas.platform.b2b.dao.MakeReturnDao;
+import com.uas.platform.b2b.dao.MakeReturnItemDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.event.MakeReturnSaveEvent;
 import com.uas.platform.b2b.model.MakeOrder;
 import com.uas.platform.b2b.model.MakeReturn;
@@ -44,9 +47,6 @@ public class MakeReturnServiceImpl implements MakeReturnService {
 	@Autowired
 	private MakeOrderDao makeOrderDao;
 
-	@Autowired
-	private MakeReturnIndexDao makeReturnIndexDao;
-
 	@Autowired
 	private SearchService searchService;
 

src/main/java/com/uas/platform/b2b/service/impl/PurcInquiryServiceImpl.java

@@ -1,21 +1,16 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
-import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.service.AttachService;
-import com.uas.platform.b2b.service.PurcInquiryService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.*;
-import com.uas.platform.b2b.temporary.model.PurcInquiryInfo;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.model.Status;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -29,11 +24,45 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.*;
+import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.ProductDao;
+import com.uas.platform.b2b.dao.PurcInquiryDao;
+import com.uas.platform.b2b.dao.PurcInquiryItemDao;
+import com.uas.platform.b2b.dao.PurcInquiryItemInfoDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryInfoDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryReplyDao;
+import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.PurcInquiry;
+import com.uas.platform.b2b.model.PurcInquiryItem;
+import com.uas.platform.b2b.model.PurcInquiryItemInfo;
+import com.uas.platform.b2b.model.PurchaseInquiry;
+import com.uas.platform.b2b.model.PurchaseInquiryInfo;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
+import com.uas.platform.b2b.model.PurchaseInquiryItemInfo;
+import com.uas.platform.b2b.model.PurchaseInquiryReply;
+import com.uas.platform.b2b.service.AttachService;
+import com.uas.platform.b2b.service.PurcInquiryService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.b2b.temporary.model.InquiryDetailInfo;
+import com.uas.platform.b2b.temporary.model.InquiryProductInfo;
+import com.uas.platform.b2b.temporary.model.PurcInquiryInfo;
+import com.uas.platform.b2b.temporary.model.PurcInquiryProductInfo;
+import com.uas.platform.b2b.temporary.model.VendorAndContact;
+import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.model.Status;
 
 @Service
 public class PurcInquiryServiceImpl implements PurcInquiryService {
@@ -540,6 +569,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 		return map;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public ModelMap transtoInquiry(Long id) {
 		ModelMap map = new ModelMap();

src/main/java/com/uas/platform/b2b/service/impl/PurchaseBadInServiceImpl.java

@@ -1,9 +1,25 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.dao.PurchaseBadInDao;
-import com.uas.platform.b2b.dao.PurchaseBadInIndexDao;
 import com.uas.platform.b2b.dao.PurchaseBadInItemDao;
 import com.uas.platform.b2b.event.PurchaseBadInSaveEvent;
 import com.uas.platform.b2b.model.PurchaseBadIn;
@@ -17,21 +33,6 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 @Service
 public class PurchaseBadInServiceImpl implements PurchaseBadInService {
@@ -42,9 +43,6 @@ public class PurchaseBadInServiceImpl implements PurchaseBadInService {
 	@Autowired
 	private PurchaseBadInDao purchaseBadInDao;
 
-	@Autowired
-	private PurchaseBadInIndexDao purchaseBadInIndexDao;
-
 	@Autowired
 	private SearchService searchService;
 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseBadOutServiceImpl.java

@@ -1,9 +1,25 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.dao.PurchaseBadOutDao;
-import com.uas.platform.b2b.dao.PurchaseBadOutIndexDao;
 import com.uas.platform.b2b.dao.PurchaseBadOutItemDao;
 import com.uas.platform.b2b.event.PurchaseBadOutSaveEvent;
 import com.uas.platform.b2b.model.PurchaseBadOut;
@@ -17,21 +33,6 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 @Service
 public class PurchaseBadOutServiceImpl implements PurchaseBadOutService {
@@ -42,9 +43,6 @@ public class PurchaseBadOutServiceImpl implements PurchaseBadOutService {
 	@Autowired
 	private PurchaseBadOutItemDao purchaseBadOutItemDao;
 
-	@Autowired
-	private PurchaseBadOutIndexDao purchaseBadOutIndexDao;
-
 	@Autowired
 	private SearchService searchService;
 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseForecastOrderServiceImpl.java

@@ -15,7 +15,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.PurchaseForecastAllDao;
 import com.uas.platform.b2b.dao.PurchaseForecastAllItemDao;
 import com.uas.platform.b2b.dao.PurchaseForecastItemIndexDao;
 import com.uas.platform.b2b.event.PurchaseForecastItemSaveEvent;
@@ -33,9 +32,6 @@ public class PurchaseForecastOrderServiceImpl implements PurchaseForecastOrderSe
 	@Autowired
 	private PurchaseForecastAllItemDao purchaseForecastAllItemDao;
 
-	@Autowired
-	private PurchaseForecastAllDao purchaseForecastAllDao;
-
 	@Autowired
 	private PurchaseForecastItemIndexDao purchaseForecastItemIndexDao;
 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryMouldServiceImpl.java

@@ -1,11 +1,44 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
 import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.AttachDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryMouldDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryMouldDetailDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryMouldItemDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryMouldProdReplyDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryMouldReplyDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.event.PurchaseInquiryMouldSaveEvent;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.PurchaseInquiryMould;
+import com.uas.platform.b2b.model.PurchaseInquiryMouldDetail;
+import com.uas.platform.b2b.model.PurchaseInquiryMouldItem;
+import com.uas.platform.b2b.model.PurchaseInquiryMouldProdReply;
+import com.uas.platform.b2b.model.PurchaseInquiryMouldReply;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.UserBaseInfo;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseInquiryMouldService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -18,23 +51,6 @@ import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
 
 @Service
 public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldService {
@@ -156,6 +172,7 @@ public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldServ
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public void saveAttach(List<Attach> attachs) {
 		List<Attach> validAttachs = new ArrayList<Attach>();

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -1,13 +1,53 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.ThreadUtils;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.AttachDao;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.ProductDao;
+import com.uas.platform.b2b.dao.PurcInquiryItemDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryReplyDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.model.QuotationDownDetail;
-import com.uas.platform.b2b.event.*;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemInvalidReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemReplyReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemSaveEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.PurcInquiryItem;
+import com.uas.platform.b2b.model.PurchaseInquiry;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
+import com.uas.platform.b2b.model.PurchaseInquiryReply;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.UserBaseInfo;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
@@ -23,20 +63,6 @@ import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.*;
 
 
 @Service
@@ -380,6 +406,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		return null;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public void saveAttach(List<Attach> attachs) {
 		List<Attach> validAttachs = new ArrayList<Attach>();

src/main/java/com/uas/platform/b2b/service/impl/PurchaseMRBServiceImpl.java

@@ -1,9 +1,25 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.PagingReleaseCountDao;
 import com.uas.platform.b2b.dao.PurchaseMRBDao;
-import com.uas.platform.b2b.dao.PurchaseMRBIndexDao;
 import com.uas.platform.b2b.event.PurchaseMRBSaveEvent;
 import com.uas.platform.b2b.model.PurchaseMRB;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -14,21 +30,6 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 @Service
 public class PurchaseMRBServiceImpl implements PurchaseMRBService {
@@ -36,9 +37,6 @@ public class PurchaseMRBServiceImpl implements PurchaseMRBService {
 	@Autowired
 	private PurchaseMRBDao purchaseMRBDao;
 
-	@Autowired
-	private PurchaseMRBIndexDao purchaseMRBIndexDao;
-
 	@Autowired
 	private SearchService searchService;
 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseNoticeServiceImpl.java

@@ -13,7 +13,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import com.uas.platform.b2b.dao.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -24,6 +23,19 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.dao.B2bCodeSetDao;
+import com.uas.platform.b2b.dao.BarLPSetingDao;
+import com.uas.platform.b2b.dao.BarPackageDao;
+import com.uas.platform.b2b.dao.BarPackageDetailDao;
+import com.uas.platform.b2b.dao.BarSendNotifyDao;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.PurchaseNoticeDao;
+import com.uas.platform.b2b.dao.SaleSendAllDao;
+import com.uas.platform.b2b.dao.SaleSendDao;
+import com.uas.platform.b2b.dao.SaleSendItemDao;
+import com.uas.platform.b2b.dao.SaleSendItemVerifyDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.erp.model.PurchaseNotify;
 import com.uas.platform.b2b.event.PurchaseNoticeSaveEvent;
 import com.uas.platform.b2b.event.SaleSendSaveEvent;
@@ -70,12 +82,6 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 	@Autowired
 	private SaleSendAllDao saleSendAllDao;
 
-	@Autowired
-	private PurchaseNoticeIndexDao purchaseNoticeIndexDao;
-
-	@Autowired
-	private SaleSendIndexDao saleSendIndexDao;
-
 	@Autowired
 	private SaleSendItemVerifyDao saleSendItemVerifyDao;
 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderChangeServiceImpl.java

@@ -1,10 +1,43 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.transaction.Transactional;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
 import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.PagingReleaseDao;
+import com.uas.platform.b2b.dao.PurchaseOrderChangeDao;
+import com.uas.platform.b2b.dao.PurchaseOrderChangeItemDao;
+import com.uas.platform.b2b.dao.PurchaseOrderDao;
+import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.erp.model.SaleDownChangeReply;
 import com.uas.platform.b2b.event.PurchaseOrderChangeSaveEvent;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderChange;
+import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.UserBaseInfo;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseOrderChangeService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -14,20 +47,6 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.transaction.Transactional;
-import java.util.*;
 
 @Service
 @Transactional
@@ -48,9 +67,6 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 	@Autowired
 	private PurchaseOrderItemDao purchaseOrderItemDao;
 
-	@Autowired
-	private PurchaseOrderChangeIndexDao purchaseOrderChangeIndexDao;
-
 	@Autowired
 	private UserBaseInfoDao userBaseInfoDao;
 
@@ -60,9 +76,6 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 	@Autowired
 	private PagingReleaseCountDao pagingReleaseCountDao;
 
-	@Autowired
-	private PagingReleaseDetailDao pagingReleaseDetailDao;
-
 	@Autowired
 	private PagingReleaseDao pagingReleaseDao;
 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseProofingServiceImpl.java

@@ -9,7 +9,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import com.uas.platform.b2b.dao.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -20,6 +19,15 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.dao.AttachDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.PurchaseProofingApprovalDao;
+import com.uas.platform.b2b.dao.PurchaseProofingDao;
+import com.uas.platform.b2b.dao.PurchaseProofingItemDao;
+import com.uas.platform.b2b.dao.PurchaseProofingItemDoneDao;
+import com.uas.platform.b2b.dao.PurchaseProofingItemTodoDao;
+import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.event.PurchaseProofingApprovalSaveEvent;
 import com.uas.platform.b2b.event.PurchaseProofingItemSaveEvent;
 import com.uas.platform.b2b.model.Attach;
@@ -42,6 +50,7 @@ import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 
+@SuppressWarnings("deprecation")
 @Service
 public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 
@@ -100,6 +109,7 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 			attachDao.save(validAttachs);
 	}
 
+
 	@Override
 	public void saveSendAttach(List<Attach> attachs) {
 		List<Attach> validAttachs = new ArrayList<Attach>();

src/main/java/com/uas/platform/b2b/service/impl/PurchaseReturnServiceImpl.java

@@ -1,9 +1,31 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+
 import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
+import com.uas.platform.b2b.dao.PurchaseReturnDao;
+import com.uas.platform.b2b.dao.PurchaseReturnItemDao;
 import com.uas.platform.b2b.event.PurchaseReturnSaveEvent;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
+import com.uas.platform.b2b.model.PurchaseReturn;
+import com.uas.platform.b2b.model.PurchaseReturnItem;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseReturnService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -12,20 +34,6 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.List;
 
 @Service
 public class PurchaseReturnServiceImpl implements PurchaseReturnService {
@@ -36,9 +44,6 @@ public class PurchaseReturnServiceImpl implements PurchaseReturnService {
 	@Autowired
 	private PurchaseReturnDao purchaseReturnDao;
 
-	@Autowired
-	private PurchaseReturnIndexDao purchaseReturnIndexDao;
-
 	@Autowired
 	private PurchaseOrderItemDao purchaseOrderItemDao;
 

src/main/java/com/uas/platform/b2b/service/impl/SaleARCheckServiceImpl.java

@@ -9,7 +9,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import com.uas.platform.b2b.dao.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -19,6 +18,10 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.SaleARCheckDao;
+import com.uas.platform.b2b.dao.SaleARCheckItemDao;
+import com.uas.platform.b2b.dao.SaleARCheckReplyDao;
 import com.uas.platform.b2b.event.SaleArCheckSaveEvent;
 import com.uas.platform.b2b.model.SaleARCheck;
 import com.uas.platform.b2b.model.SaleARCheckItem;
@@ -45,9 +48,6 @@ public class SaleARCheckServiceImpl implements SaleARCheckService {
 	@Autowired
 	private SaleARCheckReplyDao saleARCheckReplyDao;
 
-	@Autowired
-	private SaleARCheckIndexDao saleARCheckIndexDao;
-
 	@Autowired
 	private SearchService searchService;
 

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -1,13 +1,40 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
 import com.uas.account.entity.UserDetail;
 import com.uas.account.util.AccountUtils;
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.DistributeDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.model.Distribute;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.UserInfo;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.SendMailService;
-import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.TokenService;
 import com.uas.platform.core.exception.IllegalOperatorException;
@@ -16,15 +43,6 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.encry.Md5Utils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 /**
  * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
@@ -35,15 +53,11 @@ import java.util.*;
 @Service
 public class UserServiceImpl implements UserService {
 
-	@Autowired
-	private SysConf sysConf;
 	@Autowired
 	private UserDao userDao;
 	@Autowired
 	private VendorDao vendorDao;
 	@Autowired
-	private RoleDao roleDao;
-	@Autowired
 	private DistributeDao distributeDao;
 	@Autowired
 	private SendMailService sendMailService;
@@ -109,7 +123,6 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public User findUserByUserTel(String tel) {
 		List<User> users = userDao.findUserByUserTel(tel);
-		User user = new User();
 		if (users.size() == 0) {
 			throw new UsernameNotFoundException("没有找到您的账号 " + tel);
 		} else {
@@ -386,22 +399,18 @@ public class UserServiceImpl implements UserService {
 		userInfo.setUid(user.getUserTel());
 		userInfo.setSecondUID(user.getUserEmail());
 		userInfo.setDialectUID(String.valueOf(uu));
-		if (user != null) {
-			if (user.getEnterprises().contains(SystemSession.getUser().getEnterprise())) {
-				user.removeEnterprise(SystemSession.getUser().getEnterprise());
-				if (user.getEnterprises().size() == 0)
-					user.setEnable((short) Status.DISABLED.value());
-				userDao.save(user);
-				if (user.getEnterprises().size() == 0) {
-					try {
-						userDao.delete(user);
-						AccountUtils.unbindUser(userInfo);// 同步数据到账户中心
-					} catch (Exception e) {
-						// 尝试删除，存在关联的单据则不删
-					}
+		if (user.getEnterprises().contains(SystemSession.getUser().getEnterprise())) {
+			user.removeEnterprise(SystemSession.getUser().getEnterprise());
+			if (user.getEnterprises().size() == 0)
+				user.setEnable((short) Status.DISABLED.value());
+			userDao.save(user);
+			if (user.getEnterprises().size() == 0) {
+				try {
+					userDao.delete(user);
+					AccountUtils.unbindUser(userInfo);// 同步数据到账户中心
+				} catch (Exception e) {
+					// 尝试删除，存在关联的单据则不删
 				}
-			} else {
-				throw new IllegalArgumentException();
 			}
 		} else {
 			throw new IllegalArgumentException();