清理一些没有使用的方法

src/main/java/com/uas/platform/b2b/controller/EnterTogsController.java

@@ -1,76 +0,0 @@
-package com.uas.platform.b2b.controller;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.uas.platform.b2b.model.EnterpriseTogs;
-import com.uas.platform.b2b.service.EnterTogsService;
-
-@Controller
-@RequestMapping(value = "/entogs")
-public class EnterTogsController {
-	
-	@Autowired
-	private EnterTogsService enterTogsService;
-	
-	/**
-	 * 编辑企业标签
-	 */
-	@RequestMapping(value = "/edit", method = RequestMethod.POST)
-	@ResponseBody
-	private EnterpriseTogs EditTogs(@RequestBody Long id) {
-		return enterTogsService.findById(id);
-	}
-
-	/**
-	 * 删除企业标签
-	 * 
-	 * @param id
-	 */
-	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-	@ResponseBody
-	private void DeleteTogs(@RequestBody Long id) {
-		enterTogsService.deleteById(id);
-	}
-
-	/**
-	 * 查看默系统认标签列表
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/getTogsList", method = RequestMethod.GET)
-	private List<EnterpriseTogs> getAllDefalutTogs() {
-		return enterTogsService.getAllDefalutTogs();
-	}
-
-	/**
-	 * 通过营业执照查询该企业的标签
-	 * 
-	 * @param businessCode
-	 * @return
-	 */
-	@RequestMapping(value = "/getTogsByBusCode", method = RequestMethod.GET)
-	@ResponseBody
-	private List<EnterpriseTogs> getTogsByBusCode(@RequestBody String businessCode) {
-		return enterTogsService.findByBusCode(businessCode);
-	}
-
-	/**
-	 * 当前企业增加标签
-	 * 
-	 * @param name
-	 * @param paraphrase
-	 * @return
-	 */
-	@RequestMapping(value = "/createNewTog", method = RequestMethod.POST)
-	@ResponseBody
-	private EnterpriseTogs createNewTog(@RequestBody String name, String paraphrase) {
-		return enterTogsService.createNewTogByNameAndParaphrase(name, paraphrase);
-	}
-}

src/main/java/com/uas/platform/b2b/controller/EnterpriseNewsController.java

@@ -1,88 +0,0 @@
-package com.uas.platform.b2b.controller;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.uas.platform.b2b.model.EnterpriseNews;
-import com.uas.platform.b2b.service.BaseInfoService;
-import com.uas.platform.b2b.service.EnterpriseNewsService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import com.uas.search.b2b.model.SPage;
-
-/**
- * 企业发布动态Controller
- * 
- * @author hejq
- * @time 创建时间：2017年2月13日
- */
-@Controller
-@RequestMapping(value = "/enterpriseNews")
-public class EnterpriseNewsController {
-
-	@Autowired
-	private EnterpriseNewsService enterpriseNewsService;
-
-	@Autowired
-	private BaseInfoService baseInfoService;
-
-	/**
-	 * 写一条新的动态
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value="/createNews",method = RequestMethod.POST)
-	@ResponseBody
-	private EnterpriseNews CreateNews(@RequestBody String json) {
-		EnterpriseNews news = FlexJsonUtils.fromJson(json, EnterpriseNews.class);
-		return enterpriseNewsService.save(news);
-	}
-	
-	/**
-	 * 查询单个企业的所有动态
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/singleEnterNews", method = RequestMethod.GET)
-	@ResponseBody
-	private SPage<EnterpriseNews> getSingleEnterNews(@RequestBody String businessCode) {
-		if (businessCode == null) {
-			businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
-		}
-		return enterpriseNewsService.findByBusinessCode(businessCode);
-	}
-
-	/**
-	 * 查询所有
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/multipleEnterNews", method = RequestMethod.GET)
-	@ResponseBody
-	private SPage<EnterpriseNews> getmultipleEnterNews() {
-		try {
-			List<BasePartnersInfo> parters = baseInfoService
-					.getPartnersInfosByBusinessCode(SystemSession.getUser().getEnterprise().getEnBussinessCode());
-			for (BasePartnersInfo parter : parters) {
-				return enterpriseNewsService.findByBusinessCode(parter.getVendUID());
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	@RequestMapping(value = "/reprinted",method = RequestMethod.POST)
-	@ResponseBody
-	private EnterpriseNews reprintedTip(@RequestBody Long id) {
-		return enterpriseNewsService.reprintedTip(id);
-	}
-}

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

@@ -1,14 +1,12 @@
 package com.uas.platform.b2b.dao;
 
+import com.uas.platform.b2b.model.Customer;
+import com.uas.platform.core.data.repository.GenericRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 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 com.uas.platform.b2b.model.Customer;
-import com.uas.platform.core.data.repository.GenericRepository;
-
 import java.util.List;
 
 @Repository
@@ -22,19 +20,4 @@ public interface CustomerDao extends JpaSpecificationExecutor<Customer>, Generic
      */
     @Query("select count(p), p.status from Customer p where p.id in :ids group by p.status")
     List<Object[]> getUnreadCountEveryStatus(@Param("ids") List<Long> ids);
-
-    /**
-     * 初始化客户分配
-     *
-     * @param enuu 企业uu号
-     * @param useruu 个人uu号
-     */
-    @Procedure(procedureName = "init_customer")
-    void initCustomer(Long enuu, Long useruu);
-
-    /**
-     * 初始化客户分配，自动寻找符合条件的企业、用户进行分配
-     */
-    @Procedure(procedureName = "init_customer_all")
-    void initCustomerAll();
 }

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

@@ -1,38 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.EnterpriseTogs;
-
-@Repository
-public interface EnterTogsDao extends JpaRepository<EnterpriseTogs, Long>, JpaSpecificationExecutor<EnterpriseTogs> {
-
-	/**
-	 * 通过businessCode查询该企业所有的标签
-	 * 
-	 * @param businessCode
-	 * @return
-	 */
-	public List<EnterpriseTogs> findByEnbusinesscode(String businessCode);
-
-	/**
-	 * 通过营业执照和标签名称查询信息
-	 * 
-	 * @param businessCode
-	 * @param name
-	 * @return
-	 */
-	public EnterpriseTogs findByEnbusinesscodeAndName(String businessCode, String name);
-
-	/**
-	 * 查询默认标签
-	 * 
-	 * @param isdefault
-	 * @return
-	 */
-	public List<EnterpriseTogs> findByIsdefault(Short isdefault);
-}

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

@@ -1,21 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.EnterpriseNews;
-import com.uas.search.b2b.model.SPage;
-
-@Repository
-public interface EnterpriseNewsDao
-		extends JpaRepository<EnterpriseNews, Long>, JpaSpecificationExecutor<EnterpriseNewsDao> {
-
-	/**
-	 * 通过BusinessCode查询所有动态
-	 * 
-	 * @param businessCode
-	 * @return
-	 */
-	SPage<EnterpriseNews> findByBusinessCode(String businessCode);
-}

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

@@ -133,33 +133,6 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
 	 */
 	public List<Product> findByEnUUAndStandard(Long enuu, Short standard);
 
-	/**
-	 * 通过uu查询非标准器件进行存储
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	@Procedure(procedureName = "PRODUCT$MATCHES")
-	public String upateResultByEnuu(Long enuu);
-
-	/**
-	 * 通过uu查询非标准器件进行存储
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	@Procedure(procedureName = "PRODUCT$MATCHES_SALE")
-	public String upateResultByEnuuForSale(Long enuu);
-
-	/**
-	 * 通过uu查询非标准器件进行存储
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	@Procedure(procedureName = "PRODUCT$MATCHES_PURC")
-	public String upateResultByEnuuForPurc(Long enuu);
-
 	/**
 	 * 根据状态更新数据
 	 * 

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

@@ -4,7 +4,6 @@ import com.uas.platform.b2b.model.ProductUsers;
 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.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
@@ -29,14 +28,6 @@ public interface ProductUsersDao extends JpaSpecificationExecutor<ProductUsers>,
     @Query("select p from ProductUsers p where p.enuu = :enuu and p.useruu = :useruu and p.product.title = :title and p.product.cmpCode = :spec and p.product.brand = :brand")
     List<ProductUsers> findByEnuuAndUseruuAndTitleAndCmpCodeAndBrand(@Param("enuu") Long enuu, @Param("useruu") Long useruu, @Param("title") String title, @Param("spec") String spec, @Param("brand") String brand);
 
-    /**
-     * 通过选择的id批量转入我的物料 -- 弃用存储过程，在后台调用公共服务接口处理
-     *
-     * @param ids
-     */
-    @Procedure(procedureName = "product_coverto_user")
-    Integer coverToUserProd(String ids, Long useruu, Long enuu);
-
     /**
      * 通过企业UU，个人uu和物料id查询我的产品库物料信息
      *
@@ -47,26 +38,6 @@ public interface ProductUsersDao extends JpaSpecificationExecutor<ProductUsers>,
      */
     ProductUsers findByEnuuAndUseruuAndPrid(Long enuu, Long useruu, Long prid);
 
-    /**
-     * 自动更新所有企业的物料信息
-     */
-    @Procedure(procedureName = "init_covertouser")
-    void initProductUser();
-
-    /**
-     * 通过物料id，enuu,useruu精确
-     */
-    @Procedure(procedureName = "prid_covertouser")
-    void coverToUserByPrid(Long prid, Long enuu, Long useruu);
-
-    /**
-     * 通过企业uu更新个人物料信息
-     *
-     * @param enuu
-     */
-    @Procedure(procedureName = "product_covertouser_byenuu")
-    void coverToUserByEnuu(Long enuu);
-
     /**
      * 通过ERPid查询个人物料信息
      *

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

@@ -1,18 +1,16 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseInquiryMouldItem;
 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 com.uas.platform.b2b.model.PurchaseInquiryMouldItem;
+import java.util.List;
 
 public interface PurchaseInquiryMouldItemDao
 		extends JpaSpecificationExecutor<PurchaseInquiryMouldItem>, JpaRepository<PurchaseInquiryMouldItem, Long> {
 
-
 	/**
 	 * 按卖家企业ID和询价主记录ID查找
 	 * 
@@ -35,7 +33,6 @@ public interface PurchaseInquiryMouldItemDao
 	List<PurchaseInquiryMouldItem> findByEnuuAndSendStatus(@Param("enuu") long enuu,
 			@Param("sendStatus") short sendStatus);
 
-
 	/**
 	 * 按卖家企业ID和询价明细的报价信息传到卖家ERP的状态查找询价明细
 	 * 
@@ -46,7 +43,6 @@ public interface PurchaseInquiryMouldItemDao
 	@Query("from PurchaseInquiryMouldItem d where d.inquiryMould.venduu = :venduu and d.inquiryMould.replySendStatus = :replySendStatus")
 	List<PurchaseInquiryMouldItem> findByVendUUAndReplySendStatus(long venduu, short replySendStatus);
 
-	
 	/**
 	 * 按卖家企业ID和询价明细的报价信息的采纳结果传到卖家ERP的状态查找询价明细
 	 * 
@@ -57,10 +53,4 @@ public interface PurchaseInquiryMouldItemDao
 	@Query("from PurchaseInquiryMouldItem d where d.inquiryMould.venduu = :venduu and d.inquiryMould.adoptStatus = :adoptStatus")
 	List<PurchaseInquiryMouldItem> findByVenduuAndAdoptStatus(long venduu, short adoptStatus);
 
-
-
-
-	
-
-
 }

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

@@ -78,6 +78,15 @@ public interface PurchaseOrderItemDao extends JpaSpecificationExecutor<PurchaseO
 	@Query("update PurchaseOrderItem p set p.replyQty=(select sum(r.qty) from PurchaseOrderReply r where r.orderItem=p),p.replyDelivery= :delivery,p.replyRemark= :remark where p.id= :id")
 	public void updateByReply(@Param("delivery") Date delivery, @Param("remark") String remark, @Param("id") long id);
 
+	/**
+	 * 批量回复采购订单
+	 *
+	 * @param idString id拼接成的字符串
+	 * @param username 用户姓名
+	 * @param userip ip
+	 * @param enuu enUU
+	 * @param useruu userUU
+	 */
     @Procedure(procedureName = "purc$reply_batch")
     public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu);
 }

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

@@ -1,22 +1,12 @@
 package com.uas.platform.b2b.dao;
 
+import com.uas.platform.b2b.model.SaleQuotationAll;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.SaleQuotationAll;
-
 @Repository
 public interface SaleQuotationAllDao
 		extends JpaSpecificationExecutor<SaleQuotationAll>, JpaRepository<SaleQuotationAll, Long> {
 
-	/**
-	 * 更新主表同意（不同意）状态<br>
-	 * 主动报价单只有一条明细，而且为了和询价单对应，客户的同意状态存在从表，所以每次查询客户审核状态时要先更新主表的状态
-	 * 
-	 * @param enuu
-	 */
-	@Procedure(procedureName = "sale$quotation_agreed_update")
-	public void updateAgreedStatus(Long enuu);
 }

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

@@ -1,183 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.validation.constraints.Max;
-
-/**
- * 企业发布动态
- * 
- * @author hejq
- * @time 创建时间：2017年2月13日
- */
-@Entity
-@Table(name = "sec$enternews")
-public class EnterpriseNews implements Serializable {
-
-	/**
-	 * 序号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$enternews_gen")
-	@SequenceGenerator(name = "sec$enternews_gen", sequenceName = "sec$enternews_seq", allocationSize = 1)
-	@Column(name = "news_id")
-	private Long id;
-	
-	/**
-	 * 发布人
-	 */
-	@Column(name = "news_creater")
-	private String creater;
-	
-	/**
-	 * 发布人uu
-	 */
-	@Column(name = "news_createruu")
-	private Long createruu;
-
-	/**
-	 * 发布时间
-	 */
-	@Column(name = "news_date")
-	private Date date;
-
-	/**
-	 * 动态内容
-	 */
-	@Column(name = "news_content")
-	@Max(value = 4000)
-	private String content;
-	
-	/**
-	 * 企业
-	 */
-	@Column(name = "news_enname")
-	private String enname;
-	
-	/**
-	 * 企业uu
-	 */
-	@Column(name = "news_enuu")
-	private Long enuu;
-	
-	/**
-	 * 企业营业执照
-	 */
-	@Column(name = "news_businesscode")
-	private String businessCode;
-
-	/**
-	 * 转载来源
-	 */
-	@Column(name = "news_source")
-	private String source;
-
-	/**
-	 * 是否原创 <br>
-	 * 1. 是 <br>
-	 * 2. 否 <br>
-	 */
-	@Column(name = "news_isdeafult")
-	private Short isdefault;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCreater() {
-		return creater;
-	}
-
-	public void setCreater(String creater) {
-		this.creater = creater;
-	}
-
-	public Long getCreateruu() {
-		return createruu;
-	}
-
-	public void setCreateruu(Long createruu) {
-		this.createruu = createruu;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public String getEnname() {
-		return enname;
-	}
-
-	public void setEnname(String enname) {
-		this.enname = enname;
-	}
-
-	public Long getEnuu() {
-		return enuu;
-	}
-
-	public void setEnuu(Long enuu) {
-		this.enuu = enuu;
-	}
-
-	public String getBusinessCode() {
-		return businessCode;
-	}
-
-	public void setBusinessCode(String businessCode) {
-		this.businessCode = businessCode;
-	}
-
-	public String getSource() {
-		return source;
-	}
-
-	public void setSource(String source) {
-		this.source = source;
-	}
-
-	public Short getIsdefault() {
-		return isdefault;
-	}
-
-	public void setIsdefault(Short isdefault) {
-		this.isdefault = isdefault;
-	}
-
-	@Override
-	public String toString() {
-		return "EnterpriseNews [id=" + id + ", creater=" + creater + ", createruu=" + createruu + ", date=" + date
-				+ ", content=" + content + ", enname=" + enname + ", enuu=" + enuu + ", businessCode=" + businessCode
-				+ ", source=" + source + ", isdefault=" + isdefault + "]";
-	}
-
-}

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

@@ -1,109 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 企业标签
- * 
- * @author hejq
- * @time 创建时间：2017年2月13日
- */
-@Entity
-@Table(name = "sec$entogs")
-public class EnterpriseTogs implements Serializable {
-
-	/**
-	 * 序号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$entertog_gen")
-	@SequenceGenerator(name = "sec$entertog_gen", sequenceName = "sec$entertog_seq", allocationSize = 1)
-	@Column(name = "tog_id")
-	private Long id;
-
-	/**
-	 * 标签名字
-	 */
-	@Column(name = "tog_name")
-	private String name;
-
-	/**
-	 * 简介
-	 */
-	@Column(name = "tog_paraphrase")
-	private String paraphrase;
-
-	/**
-	 * 关联的企业营业执照号
-	 */
-	@Column(name = "tog_enbusinesscode")
-	private String enbusinesscode;
-
-	/**
-	 * 是否系统默认<br>
-	 * 1. 默认,不可删除 <br>
-	 * 0. 用户自定义，可删除
-	 */
-	@Column(name = "tog_isdefault")
-	private Short isdefault;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getParaphrase() {
-		return paraphrase;
-	}
-
-	public void setParaphrase(String paraphrase) {
-		this.paraphrase = paraphrase;
-	}
-
-	public String getEnbusinesscode() {
-		return enbusinesscode;
-	}
-
-	public void setEnbusinesscode(String enbusinesscode) {
-		this.enbusinesscode = enbusinesscode;
-	}
-
-	public Short getIsdefault() {
-		return isdefault;
-	}
-
-	public void setIsdefault(Short isdefault) {
-		this.isdefault = isdefault;
-	}
-
-	@Override
-	public String toString() {
-		return "EnterpriseTogs [id=" + id + ", name=" + name + ", paraphrase=" + paraphrase + ", enbusinesscode="
-				+ enbusinesscode + ", isdefault=" + isdefault + "]";
-	}
-
-}

src/main/java/com/uas/platform/b2b/service/EnterTogsService.java

@@ -1,57 +0,0 @@
-package com.uas.platform.b2b.service;
-
-import java.util.List;
-
-import com.uas.platform.b2b.model.EnterpriseTogs;
-
-public interface EnterTogsService {
-
-	/**
-	 * 通过标签名称和企业营业执照查询标签
-	 * 
-	 * @param name
-	 * @param businessCode
-	 * @return
-	 */
-	public EnterpriseTogs findByTogsnameAndBusCode(String name, String businessCode);
-
-	/**
-	 * 通过营业执照查询该企业的标签
-	 * 
-	 * @param businessCode
-	 * @return
-	 */
-	public List<EnterpriseTogs> findByBusCode(String businessCode);
-
-	/**
-	 * 查询默认的所有标签
-	 * 
-	 * @return
-	 */
-	public List<EnterpriseTogs> getAllDefalutTogs();
-
-	/**
-	 * 通过id查找
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public EnterpriseTogs findById(Long id);
-
-	/**
-	 * 通过id删除
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public void deleteById(Long id);
-
-	/**
-	 * 通过name，paraphrase保存新的标签
-	 * 
-	 * @param name
-	 * @param paraphrase
-	 * @return
-	 */
-	public EnterpriseTogs createNewTogByNameAndParaphrase(String name, String paraphrase);
-}

src/main/java/com/uas/platform/b2b/service/EnterpriseNewsService.java

@@ -1,33 +0,0 @@
-package com.uas.platform.b2b.service;
-
-import com.uas.platform.b2b.model.EnterpriseNews;
-import com.uas.search.b2b.model.SPage;
-
-public interface EnterpriseNewsService {
-
-	/**
-	 * 新增一条动态
-	 * 
-	 * @param news
-	 * @return
-	 */
-	public EnterpriseNews save(EnterpriseNews news);
-
-	/**
-	 * 通过businessCode查询企业所有动态<br>
-	 * 采用businessCode是方便做成接口形式
-	 * 
-	 * @param businessCode
-	 * @return
-	 */
-	public SPage<EnterpriseNews> findByBusinessCode(String businessCode);
-
-	/**
-	 * 转载日志
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public EnterpriseNews reprintedTip(Long id);
-
-}

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

@@ -1,55 +0,0 @@
-package com.uas.platform.b2b.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.dao.EnterTogsDao;
-import com.uas.platform.b2b.model.EnterpriseTogs;
-import com.uas.platform.b2b.service.EnterTogsService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Constant;
-
-@Service
-public class EnterTogsServiceImpl implements EnterTogsService {
-
-	@Autowired
-	private EnterTogsDao enterTogsDao;
-
-	@Override
-	public EnterpriseTogs findByTogsnameAndBusCode(String name, String businessCode) {
-		return enterTogsDao.findByEnbusinesscodeAndName(businessCode, name);
-	}
-
-	@Override
-	public List<EnterpriseTogs> findByBusCode(String businessCode) {
-		return enterTogsDao.findByEnbusinesscode(businessCode);
-	}
-
-	@Override
-	public List<EnterpriseTogs> getAllDefalutTogs() {
-		return enterTogsDao.findByIsdefault(Constant.YES);
-	}
-
-	@Override
-	public EnterpriseTogs findById(Long id) {
-		return enterTogsDao.findOne(id);
-	}
-
-	@Override
-	public void deleteById(Long id) {
-		enterTogsDao.delete(id);
-	}
-
-	@Override
-	public EnterpriseTogs createNewTogByNameAndParaphrase(String name, String paraphrase) {
-		EnterpriseTogs enterTog = new EnterpriseTogs();
-		enterTog.setEnbusinesscode(SystemSession.getUser().getEnterprise().getEnBussinessCode());
-		enterTog.setIsdefault(Constant.NO);
-		enterTog.setName(name);
-		enterTog.setParaphrase(paraphrase);
-		return enterTogsDao.save(enterTog);
-	}
-
-}

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

@@ -1,54 +0,0 @@
-package com.uas.platform.b2b.service.impl;
-
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.dao.EnterpriseNewsDao;
-import com.uas.platform.b2b.model.EnterpriseNews;
-import com.uas.platform.b2b.service.EnterpriseNewsService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Constant;
-import com.uas.search.b2b.model.SPage;
-
-@Service
-public class EnterpriseNewsServiceImpl implements EnterpriseNewsService {
-
-	@Autowired
-	private EnterpriseNewsDao enterpriseNewsDao;
-
-	@Override
-	public EnterpriseNews save(EnterpriseNews news) {
-		news.setIsdefault(Constant.YES);
-		return enterpriseNewsDao.save(news);
-	}
-
-	@Override
-	public SPage<EnterpriseNews> findByBusinessCode(String businessCode) {
-		return enterpriseNewsDao.findByBusinessCode(businessCode);
-	}
-
-	@Override
-	public EnterpriseNews reprintedTip(Long id) {
-		EnterpriseNews oldNews = enterpriseNewsDao.findOne(id);
-		EnterpriseNews news = new EnterpriseNews();
-		news.setContent(oldNews.getContent());
-		if (oldNews.getIsdefault() != null) {
-			if (oldNews.getIsdefault().equals(Constant.YES)) {
-				news.setSource(oldNews.getCreater());
-			}
-			if (oldNews.getIsdefault().equals(Constant.NO)) {
-				news.setSource(oldNews.getSource());
-			}
-		}
-		news.setCreater(SystemSession.getUser().getUserName());
-		news.setCreateruu(SystemSession.getUser().getUserUU());
-		news.setDate(new Date());
-		news.setEnname(SystemSession.getUser().getEnterprise().getEnName());
-		news.setEnuu(SystemSession.getUser().getEnterprise().getUu());
-		news.setIsdefault(Constant.NO);
-		news.setBusinessCode(SystemSession.getUser().getEnterprise().getEnBussinessCode());
-		return enterpriseNewsDao.save(news);
-	}
-}

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

@@ -545,13 +545,6 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 	@Override
 	public List<PurchaseApCheckItem> findDoneApCheckItems(List<Long> filter, String keyword, Long fromDate, Long endDate) {
 		Long enUu = SystemSession.getUser().getEnterprise().getUu();
-		/*String sql = "select c.pa_id id,c.pa_apdate apDate,c.pa_begindate beginDate,c.pa_checkamount checkAmount," +
-				"c.pa_checkstatus checkStatus,c.pa_code code,c.pa_commitdate commitDate,c.pa_currency currency," +
-				"c.pa_custuu custUu,c.pa_enuu enUu,c.pa_enddate endDate,c.pa_payments payments," +
-				"c.pa_recorddate recordDate,c.pa_recorder recorder,c.pa_remark remark,c.pa_resdate resDate," +
-				"c.pa_resman resMan,c.pa_status status,c.pa_taxrate taxrate,c.pa_custname custName," +
-				"c.pa_custreply custreply,c.pa_rate rate,c.pa_print print " +
-				" from purc$apcheck c  where c.PA_CHECKSTATUS='已确认' and c.PA_ENUU = ?";*/
 		String sql = "select i.pai_id id from purc$apcheck c,purc$apcheckItem i  where i.pai_paid=c.pa_id and i.PAI_CHECKQTY>0 and i.PAI_CHECKQTY>nvl(i.PAI_BILLED,0) and c.PA_CHECKSTATUS='已确认' and c.PA_ENUU = ?";
 		if (!org.apache.axis.utils.StringUtils.isEmpty(keyword)) {
 			// 物料名称和规格存在特殊符号,用|做分隔符

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

@@ -2,28 +2,8 @@ package com.uas.platform.b2b.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.uas.message.mail.service.MailService;
-import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.core.util.DateFormatUtils;
-import com.uas.platform.b2b.core.util.SplitArray;
-import com.uas.platform.b2b.core.util.StringUtil;
-import com.uas.platform.b2b.core.util.ThreadTask;
-import com.uas.platform.b2b.core.util.ThreadUtils;
-import com.uas.platform.b2b.dao.AttachDao;
-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.NoticeDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.ProductTempDao;
-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.RoleDao;
-import com.uas.platform.b2b.dao.UserBaseInfoDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.UserOrderDao;
-import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.core.util.*;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.model.QuotationDownDetail;
@@ -32,21 +12,7 @@ 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.PurchaseInquiryItemSaveReleaseEvent;
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.Distribute;
-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.ProductTemp;
-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.Role;
-import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.UserBaseInfo;
-import com.uas.platform.b2b.model.UserOrders;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
@@ -83,15 +49,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Pattern;
 
 
@@ -930,55 +888,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 
 	@Override
 	public List<InquiryMessage> getMessageList() throws Exception {
-		/*String sql = "select * from (select p.id_id id, p.id_prid productId, p.id_date as \"date\", i.in_enuu enuu from purc$puinquiryitems p left join purc$puinquiry i on i.in_id = p.id_inid where i.in_isopen = 1 and i.in_enuu <> "
-				+ SystemSession.getUser().getEnterprise().getUu()
-				+ "and i.in_enddate > trunc(sysdate) and nvl(p.id_overdue, 0) <> 1 order by id_id desc) where rownum <= 7";
-		List<PurcInquiryItem> items = commonDao.query(sql, PurcInquiryItem.class);
-		List<InquiryMessage> messages = new ArrayList<InquiryMessage>();
-		if (!CollectionUtils.isEmpty(items)) {
-			for (PurcInquiryItem item : items) {
-				InquiryMessage message = new InquiryMessage();
-				if (null != item.getEnuu()) {
-					Enterprise enterprise = enterpriseDao.findEnterpriseByUu(item.getEnuu());
-					message.setEnName(enterprise.getEnName());
-				}
-				Product prod = productDao.findOne(item.getProductId());
-				message.setPordName(prod.getTitle());
-				item = purcInquiryItemDao.findOne(item.getId());
-				message.setRead(getReadStatus(item.getId(), SystemSession.getUser().getUserUU()));
-				message.setInid(item.getId());
-				message.setLastest(isToday(item.getDate()));
-				messages.add(message);
-			}
-		}*/
 		return InquiryUtils.getQutation(SystemSession.getUser().getEnterprise().getUu(), 7);
 	}
 
-	/**
-	 * 判断该条单据是否当天单据
-	 *
-	 * @param date
-	 * @return
-	 */
-	private boolean isToday(Date date) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		String inDate = sdf.format(date);
-		String nowDate = sdf.format(new Date());
-		return inDate.equals(nowDate);
-	}
-
-	/**
-	 * 当前公共询价明细的阅读状态
-	 *
-	 * @param id
-	 * @param userUU
-	 */
-	private boolean getReadStatus(Long id, Long userUU) {
-		String sql = "select count(1) from inquiryitems$readstatus where id_id = " + id + " and id_useruu = " + userUU;
-		Integer count = commonDao.queryForObject(sql, Integer.class);
-		return count == 0 ? false : true;
-	}
-
 	@Override
 	public void onReplyInvalid(List<Inquiry> inquiries) {
 		final Long enuu = SystemSession.getUser().getEnterprise().getUu();

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

@@ -1,24 +1,10 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.core.util.StringUtil;
-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.ProductDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.UserOrderDao;
-import com.uas.platform.b2b.dao.VendorContactDao;
-import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.B2BCustomer;
 import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.VendorRecommend;
-import com.uas.platform.b2b.model.Distribute;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.b2b.model.VendorContact;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
@@ -496,8 +482,6 @@ public class VendorsServiceImpl implements VendorService {
 		String rownumSql = " t where rownum <= " + page * size + ") where r1 > " + (page - 1) * size;
 		idSql.append("select pr_id from (select t.*,rownum as r1 from (").append(productsMatchSql).append(" union all ").append(notMatchProductsSql)
 				.append(")").append(rownumSql);
-//		System.out.println(idSql.toString());
-//        System.out.println(productsMatchSql.toString());
 		List<Long> matchedIds = commonDao.queryForList(productsMatchSql.toString(), Long.class);
 		Integer count = commonDao.queryForObject(countSql, Integer.class);
 		List<Long> ids = commonDao.queryForList(idSql.toString(), Long.class);
@@ -508,7 +492,6 @@ public class VendorsServiceImpl implements VendorService {
 		    	StringBuffer matchCodeSql = new StringBuffer();
 		    	matchCodeSql.append("select wm_concat(pr_code) from v$products where nvl(pr_issale,0) <> 1 and pr_ispurchase = 1 and pr_b2bdisabled <> 1 and pr_enuu = ")
 						.append(enUU).append(" and pr_cmpcode = '").append(product.getCmpCode()).append("'").append(" and rownum <= 20");
-//				System.out.println("matchcode:" + matchCodeSql.toString());
 		    	String matchCodes = commonDao.queryForObject(matchCodeSql.toString(), String.class);
 		    	product.setIfMatched(matchCodes);
 			}

src/main/java/com/uas/platform/b2b/v2/service/impl/InviteRecordServiceImpl.java

@@ -96,7 +96,11 @@ public class InviteRecordServiceImpl implements InviteRecordService {
                 List<InvitationRecord> records = invitationRecordService.findbyVendName(e.getEnName());
                 if (!CollectionUtils.isEmpty(records)) {
                     Enterprise enterprise = enterpriseService.findByEnUU(records.get(0).getEnuu());
-                    baseInfo.setInviteEnName(enterprise.getEnName());
+                    if (null == enterprise) {
+                        enterprise = enterpriseService.findByenBussinessCode(records.get(0).getBussinesscode());
+                    }
+                    String enName = enterprise != null ? enterprise.getEnName() : null;
+                    baseInfo.setInviteEnName(enName);
                     String userName = records.get(0).getUser() != null ? records.get(0).getUser().getUserName() : null;
                     baseInfo.setInviteUserName(userName);
                 }