发货，批量发货、货车发货时增加发货单号长度限制

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

@@ -247,7 +247,7 @@ public class BaseInfoController {
 	 */
 	@RequestMapping(value = "/updateProdInfo", method = RequestMethod.POST)
 	@ResponseBody
-	public ModelMap updateProdInfo(String prodInfo, FileUpload uploadItem) {
+	public ModelMap updateProdInfo(String prodInfo, FileUpload uploadItem) throws Exception {
 		Product productInfo = JSONObject.parseObject(prodInfo, Product.class);
 		logger.log("更新物料", "[" + SystemSession.getUser().getUserName() + "]更新了id为" + productInfo.getId() + "的["
 				+ productInfo.getTitle() + "]");
@@ -262,7 +262,7 @@ public class BaseInfoController {
 	 */
 	@RequestMapping(value = "/addNewProduct", method = RequestMethod.POST)
 	@ResponseBody
-	public ModelMap addNewProduct(String prodInfo, FileUpload uploadItem) {
+	public ModelMap addNewProduct(String prodInfo, FileUpload uploadItem) throws Exception {
 		Product productInfo = JSONObject.parseObject(prodInfo, Product.class);
 		return baseInfoService.addNewProduct(productInfo, uploadItem);
 	}
@@ -283,7 +283,7 @@ public class BaseInfoController {
 	/**
 	 * 导出Excel
 	 * 
-	 * @param params
+	 * @param keyword
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
@@ -442,8 +442,7 @@ public class BaseInfoController {
 	 * 通过关键词查询账户中心的相关的企业信息
 	 * 
 	 * @param keyword
-	 * @param pageNumber
-	 * @param pageSize
+	 * @param params
 	 * @return
 	 * @throws Exception
 	 */

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

@@ -1,12 +1,11 @@
 package com.uas.platform.b2b.controller;
 
+import com.uas.account.support.Page;
 import com.uas.platform.b2b.model.BrandInfo;
 import com.uas.platform.b2b.service.BrandService;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -47,8 +46,7 @@ public class BrandController {
 	 */
 	@RequestMapping(value = "/Info/ByPage", method = RequestMethod.GET)
 	public Page<BrandInfo> getBrandInfoPage(PageParams params, String keyword) {
-		PageInfo info = new PageInfo(params);
-		return brandService.getBrandInfoPage(info, keyword);
+		return brandService.getBrandInfoPage(params, keyword);
 	}
 
 	/**
@@ -58,7 +56,7 @@ public class BrandController {
 	 * @throws UnsupportedEncodingException
 	 */
 	@RequestMapping(value = "/ByName/{name}", method = RequestMethod.GET)
-	public BrandInfo getByName(@PathVariable("name") String name) throws UnsupportedEncodingException {
+	public BrandInfo getByName(@PathVariable("name") String name) throws Exception {
 		name = URLDecoder.decode(name, "utf-8");
 		BrandInfo brand =  brandService.findByName(name, name);
 		if (brand.getUuid() == null) {

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

@@ -1,10 +1,8 @@
 package com.uas.platform.b2b.controller;
 
 import com.uas.platform.b2b.model.Component;
-import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ComponentService;
-import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,40 +43,8 @@ public class ComponentController {
 	 * @return
 	 */
 	@RequestMapping(value = "/{uuid}", method = RequestMethod.GET)
-	public Component findComponentByUuid(@PathVariable("uuid") String uuid, HttpServletRequest request) {
-		//获取user信息 方便获取器件信息时 能根据是否登录 返回不同的附件链接，不登陆 不能看附件信息。
-		User user = (User) request.getSession().getAttribute("user");
-		SystemSession.setUser(user);
+	public Component findComponentByUuid(@PathVariable("uuid") String uuid, HttpServletRequest request) throws Exception {
 		return componentService.findByUuid(uuid);
 	}
 
-//	/**
-//	 * 分页查找类目下器件信息
-//	 *
-//	 * @param params
-//	 *            分页信息
-//	 * @return
-//	 */
-//	@RequestMapping(value = "/list", method = RequestMethod.GET)
-//	public Page<Component> findAllComponentActiveSimpleInfo(PageParams params, boolean reserve) {
-//		PageInfo info = new PageInfo(params);
-//		if (reserve) {
-//			SimpleExpression siExpression = new SimpleExpression("reserve", new Double(0), Operator.GT);
-//			info.expression(siExpression);
-//		}
-//		return componentService.findInfoPage(info);
-//	}
-//
-//	/**
-//	 * 查找所有简单有效标准器件信息
-//	 *
-//	 * @param params
-//	 *            分页信息
-//	 * @return
-//	 */
-//	@RequestMapping(value = "/info", method = RequestMethod.GET)
-//	public Page<Component> findPageComponentSimpleInfo(PageParams params) {
-//		PageInfo info = new PageInfo(params);
-//		return componentService.findInfoPage(info);
-//	}
 }

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

@@ -28,7 +28,7 @@ public class KindController {
 	 */
 	@RequestMapping(value = "/{parentId}/children", method = RequestMethod.GET)
 	@ResponseBody
-	public List<Kind> getProductKinds(@PathVariable("parentId") Long parentId) {
+	public List<Kind> getProductKinds(@PathVariable("parentId") Long parentId) throws Exception {
 		return kindService.getChildProductKinds(parentId);
 	}
 

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

@@ -1,20 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-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 org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.Component;
 import com.uas.platform.b2b.model.Product;
@@ -35,6 +20,16 @@ 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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * 物料
@@ -255,7 +250,7 @@ public class ProductController {
 	/**
 	 * 导出Excel
 	 * 
-	 * @param params
+	 * @param keyword
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
@@ -288,9 +283,7 @@ public class ProductController {
 	/**
 	 * 批量修改物料数据
 	 * 
-	 * @param products
-	 * @param updatetype
-	 * @param keyword
+	 * @param parameter
 	 * @return
 	 */
 	@RequestMapping(value = "/alterByBatch", method = RequestMethod.POST)
@@ -354,7 +347,7 @@ public class ProductController {
 	 */
 	@RequestMapping(value = "/matchall/{code}", method = RequestMethod.GET)
 	@ResponseBody
-	private List<Component> matchByCode(String code) {
+	private List<Component> matchByCode(String code) throws Exception {
 		return productService.matchByCode(code);
 	}
 
@@ -505,7 +498,7 @@ public class ProductController {
 	 */
 	@RequestMapping(value = "/matchone/{id}", method = RequestMethod.GET)
 	@ResponseBody
-	public List<ProductMatchResult> matchone(@PathVariable Long id) {
+	public List<ProductMatchResult> matchone(@PathVariable Long id) throws Exception {
 		return productService.matchaone(id);
 	}
 }

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

@@ -245,6 +245,42 @@ public class SaleOrderController {
 		return searchService.searchPurchaseDoneOrderIds(keyword, pageParams);
 	}
 
+	/**
+	 * 作为卖家，收到的客户的待结案的申请
+	 *
+	 * @param params
+	 * @param searchFilter
+	 * @return
+	 */
+	@RequestMapping(value="/items", params = RequestState.UPDATE, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseOrderAll> getToAgreedOrderItems(PageParams params, String searchFilter){
+		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待结案）");
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			pageParams.getFilters().put("pu_enuu", new MultiValue(list, true));
+		}
+		// 当前登录企业作为供应商
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("pu_status", Status.WAITSELLERCOMFIRM.value());
+		pageParams.getFilters().put("pu_end", Constant.NO);
+		return searchService.searchPurchaseOrderIds(keyword, pageParams);
+	}
+
+
 	/**
 	 * 作为卖家，收到的采购订单(含明细)(已结案)
 	 *
@@ -425,6 +461,36 @@ public class SaleOrderController {
 		return purchaseOrderService.findDoneOrders(pageInfo, filter);
 	}
 
+	/**
+	 * 作为卖家，收到的采购订单(含明细)(待结案)
+	 * <prep>
+	 *     客户发出的待结案申请，还未处理的
+	 * </prep>
+	 *
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/items/info", params = RequestState.UPDATE, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseOrderAll> getToAgreeSaleOrders(PageParams params, String searchFilter) {
+		logger.log("客户采购单", "查看收到的客户采购单列表（已结案）");
+		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
+				SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("status", Status.WAITSELLERCOMFIRM.value());
+		pageInfo.filter("end", Constant.NO);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
+			return null;
+		}
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+			filter.setDistribute(distribute.getDistribute());
+		}
+		return purchaseOrderService.findOrdersByPageInfo(pageInfo, filter);
+	}
+
 	/**
 	 * 作为卖家，收到的采购订单(含明细)(已结案)
 	 *
@@ -809,6 +875,26 @@ public class SaleOrderController {
 		return purchaseOrderService.findDoneOrders(pageInfo, filter);
 	}
 
+	/**
+	 * 作为买家，收到的采购订单(含明细)
+	 *
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/items/purc/info", params = RequestState.UPDATE,  method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseOrderAll> getToAgreePurcOrders(PageParams params, String searchFilter) {
+		logger.log("采购单", "查看采购订单列表（包括采购明细）（全部）");
+		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
+				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
+		purchaseOrderWaitingDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		pageInfo.filter("status", Status.WAITSELLERCOMFIRM.value());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		return purchaseOrderService.findOrdersByPageInfo(pageInfo, filter);
+	}
+
 	/**
 	 * 作为买家，查看发出的采购单（已结案）
 	 *

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

@@ -1,36 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.Brand;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 品牌
- * 
- * @author suntg
- * @since 2016年3月15日下午2:37:56
- */
-@Repository
-public interface BrandDao extends JpaSpecificationExecutor<Brand>, JpaRepository<Brand, Long> {
-
-	public Brand findByUuid(String uuid);
-
-	/**
-	 * 依据品牌中文名获取品牌信息
-	 * 
-	 * @param nameCn
-	 * @return
-	 */
-	public List<Brand> findByNameCn(String nameCn);
-
-	/**
-	 * 依据品牌英文名获取品牌信息
-	 * 
-	 * @param nameEn
-	 * @return
-	 */
-	public List<Brand> findByNameEn(String nameEn);
-}

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

@@ -1,55 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.BrandInfo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 品牌
- * 
- * @author suntg
- * @since 2016年3月15日下午2:37:56
- */
-@Repository
-public interface BrandInfoDao extends JpaSpecificationExecutor<BrandInfo>, JpaRepository<BrandInfo, Long> {
-
-	/**
-	 * 增加品牌权重
-	 * 
-	 * @param uuid
-	 */
-	@Modifying
-	@Query("update Brand b set b.weight = b.weight+ :increaseNum where b.uuid = :uuid")
-	public void increaseWeight(@Param("uuid") String uuid, @Param("increaseNum") Double increaseNum);
-
-	/**
-	 * 按id获取品牌，并且按照给定的id的顺序
-	 * 
-	 * @param ids
-	 * @return
-	 */
-	@Query("select b from BrandInfo b where b.id in (:ids) order by instr(':ids', b.id)")
-	public List<BrandInfo> findByIdsInOrder(@Param("ids") Long[] ids);
-
-	/**
-	 * 根据品牌中文名查找品牌信息
-	 * 
-	 * @param nameCn
-	 * @return
-	 */
-	public List<BrandInfo> findByNameCn(String nameCn);
-	
-	/**
-	 * 根据品牌英文名查找品牌信息
-	 * 
-	 * @param nameEn
-	 * @return
-	 */
-	public List<BrandInfo> findByNameEn(String nameEn);
-}

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

@@ -1,30 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.Component;
-import com.uas.search.b2b.model.SPage;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-import java.util.List;
-
-public interface ComponentDao extends JpaRepository<Component, Long>, JpaSpecificationExecutor<Component> {
-
-	/**
-	 * 通过code查询UUID<br>
-	 * 商务平台以code与cmpcode对应
-	 * 
-	 * @param code
-	 * @return
-	 */
-	List<Component> findByCode(String code);
-
-	/**
-	 * 通过类目id查询器件的信息
-	 * 
-	 * @param kindid
-	 * @return
-	 */
-	SPage<Component> findByKindid(Long kindid);
-
-    Component findByUuid(String uuid);
-}

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

@@ -1,35 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import javax.persistence.QueryHint;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.QueryHints;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.Kind;
-
-@Repository
-public interface KindDao extends JpaRepository<Kind, Long>, JpaSpecificationExecutor<Kind> {
-
-	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	List<Kind> findByParentidOrderByDetno(Long parentid);
-
-	/**
-	 * 通过中文类目名查询类目
-	 * 
-	 * @param nameCn
-	 * @return
-	 */
-	List<Kind> findByNameCn(String nameCn);
-
-	/**
-	 * 通过英文类目名查询类目
-	 * 
-	 * @param nameEn
-	 * @return
-	 */
-	List<Kind> findByNameEn(String nameEn);
-}

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

@@ -1,10 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-import com.uas.platform.b2b.model.KindInfo;
-
-public interface KindInfoDao extends JpaRepository<KindInfo, Long>, JpaSpecificationExecutor<KindInfo> {
-
-}

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

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.model;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,8 +9,6 @@ import java.util.Date;
  * @author suntg
  * @since 2016年3月11日上午9:30:00
  */
-@Entity
-@Table(name = "product$brand")
 public class Brand implements Serializable {
 
 	/**
@@ -22,126 +19,101 @@ public class Brand implements Serializable {
 	/**
 	 * id
 	 */
-	@Id
-	@Column(name = "br_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$brand_active_gen")
-	@SequenceGenerator(name = "product$brand_active_gen", sequenceName = "product$brand_active_seq", allocationSize = 1)
 	private Long id;
 
 	/**
 	 * uuid
 	 */
-	@Column(name = "br_uuid", unique = true)
 	private String uuid;
 
 	/**
 	 * 品牌中文名称
 	 */
-	@Column(name = "br_name_cn")
 	private String nameCn;
 
 	/**
 	 * 品牌英文名称
 	 */
-	@Column(name = "br_name_en")
 	private String nameEn;
 
 	/**
 	 * logo路径
 	 */
-	@Column(name = "br_logourl")
 	private String logoUrl;
 
 	/**
 	 * 品牌所属厂商
 	 */
-	@Column(name = "br_vendor")
 	private String vendor;
 
 	/**
 	 * 品牌官网
 	 */
-	@Column(name = "br_url")
 	private String url;
 
 	/**
 	 * 品牌简介
 	 */
-	@Column(name = "br_brief", length = 4000)
 	private String brief;
 
 	/**
 	 * 产品系列
 	 */
-	@Column(name = "br_series", length = 4000)
 	private String series;
 
 	/**
 	 * 主要成就
 	 */
-	@Column(name = "br_achievement", length = 4000)
 	private String achievement;
 
 	/**
 	 * 所属地区
 	 */
-	@Column(name = "br_area")
 	private String area;
 
 	/**
 	 * 应用领域
 	 */
-	@Column(name = "br_application")
 	private String application;
 
 	/**
 	 * 创建人
 	 */
-	@Column(name = "defineuu")
 	private Long defineuu;
 
 	/**
 	 * 创建人
 	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "defineuu", insertable = false, updatable = false)
 	private UserBaseInfo userDefine;
 
 	/**
 	 * 创建时间
 	 */
-	@Column(name = "br_createtime")
 	private Date createTime;
 
 	/**
 	 * 最近更新人
 	 */
-	@Column(name = "modifyuu")
 	private Long modifyuu;
 
 	/**
 	 * 最近更新人
 	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "modifyuu", insertable = false, updatable = false)
 	private UserBaseInfo userModify;
 
 	/**
 	 * 最后修改时间
 	 */
-	@Column(name = "br_modifytime")
 	private Date modifyTime;
 
 	/**
 	 * 版本号
 	 */
-	@Column(name = "br_version")
 	private Short version;
 
 	/**
 	 * 权重，可用于排序
 	 */
-	@Column(name = "br_weight")
 	private Double weight;
 
 	public Long getId() {

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

@@ -1,64 +1,48 @@
 package com.uas.platform.b2b.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 简要品牌信息
  * 
  * @author suntg
  * @since 2016年3月11日上午10:02:20
  */
-@Entity
-@Table(name = "product$brand")
 public class BrandInfo {
 
 	/**
 	 * id
 	 */
-	@Id
-	@Column(name = "br_id")
 	private Long id;
 
 	/**
 	 * uuid
 	 */
-	@Column(name = "br_uuid", unique = true)
 	private String uuid;
 
 	/**
 	 * 版本号
 	 */
-	@Column(name = "br_version")
 	private Short version;
 
 	/**
 	 * 品牌中文名称
 	 */
-	@Column(name = "br_name_cn")
 	private String nameCn;
 
 	/**
 	 * 品牌英文名称
 	 */
-	@Column(name = "br_name_en")
 	private String nameEn;
 
 	/**
 	 * logo路径
 	 */
-	@Column(name = "br_logourl")
 	private String logoUrl;
 
 	/**
 	 * 权重，可用于排序
 	 */
-	@Column(name = "br_weight")
 	private Double weight;
 
-	@Column(name = "br_vendor")
 	private String vendor;
 
 	public Long getId() {

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

@@ -2,22 +2,12 @@ package com.uas.platform.b2b.model;
 
 import java.io.Serializable;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
 /**
  * 标准器件
  * 
  * @author suntg
  * @since 2016年3月11日上午10:24:29
  */
-@Entity
-@Table(name = "product$component")
 public class Component implements Serializable {
 
 	/**
@@ -28,53 +18,42 @@ public class Component implements Serializable {
 	/**
 	 * id
 	 */
-	@Id
-	@Column(name = "cmp_id")
 	private Long id;
 
 	/**
 	 * 器件的uuid
 	 */
-	@Column(name = "cmp_uuid", unique = true, nullable = false)
 	private String uuid;
 
 	/**
 	 * 原厂型号
 	 */
-	@Column(name = "cmp_code")
 	private String code;
 
 	/**
 	 * 类目id
 	 */
-	@Column(name = "cmp_kiid")
 	private Long kindid;
 
 	/**
 	 * 器件的类目
 	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cmp_kiid", insertable = false, updatable = false)
 	private KindInfo kind;
 
 	/**
 	 * 品牌id
 	 */
-	@Column(name = "cmp_brid")
 	private Long brandid;
 
 	/**
 	 * 器件的品牌
 	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cmp_brid", insertable = false, updatable = false)
 	private BrandInfo brand;
 
 	/**
 	 * 器件封装规格 这个封装规格和下面的封装规格值应该是一样的。在componentInfo中有packaging 赋值给spec，
 	 * 现在已packaging 为准(spec 有值的只有一个器件)， by yujia
 	 */
-	@Column(name = "cmp_packaging")
 	private String packaging;
 
 	/**
@@ -82,13 +61,11 @@ public class Component implements Serializable {
 	 * 
 	 * @TODO 建立对应的附件表
 	 */
-	@Column(name = "cmp_attach")
 	private String attach;
 
 	/**
 	 * 图片path
 	 */
-	@Column(name = "cmp_img")
 	private String img;
 
 	public Long getId() {

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

@@ -1,26 +1,9 @@
 package com.uas.platform.b2b.model;
 
+import com.uas.platform.core.model.Constant;
+
 import java.io.Serializable;
 import java.util.List;
-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.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.uas.platform.core.model.Constant;
 
 /**
  * 产品类目
@@ -28,8 +11,6 @@ import com.uas.platform.core.model.Constant;
  * @author suntg
  * @since 2016年3月10日下午3:08:40
  */
-@Entity
-@Table(name = "product$kind")
 public class Kind implements Serializable {
 
 	/**
@@ -40,83 +21,61 @@ public class Kind implements Serializable {
 	/**
 	 * ID号
 	 */
-	@Id
-	@Column(name = "ki_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$kind_gen")
-	@SequenceGenerator(name = "product$kind_gen", sequenceName = "product$kind_seq", allocationSize = 1)
 	private Long id;
 
 	/**
 	 * 父级类目的id号
 	 */
-	@Column(name = "ki_parentid")
 	private Long parentid;
 
 	/**
 	 * 是否为叶子类目 1是 0否
 	 */
-	@Column(name = "ki_isleaf")
 	private Short isLeaf;
 
 	/**
 	 * 在父级类目中的排序序号
 	 */
-	@Column(name = "ki_detno")
 	private Short detno;
 
 	/**
 	 * 类目的名称
 	 */
-	@Column(name = "ki_name")
 	private String nameCn;
 
 	/**
 	 * 类目的英文名称
 	 */
-	@Column(name = "ki_name_en")
 	private String nameEn;
 
 	/**
 	 * 类目包含的器件总数，包括其所有子类目下的
 	 */
-	@Column(name = "ki_count")
 	private Long count;
 
 	/**
 	 * 类目的层级，从1开始，1、2、3、4
 	 */
-	@Column(name = "ki_level")
 	private Short level;
 
 	/**
 	 * 器件编号前缀
 	 */
-	@Column(name = "ki_cmpprefix")
 	private String componentPrefix;
 
 	/**
 	 * 当前器件编号后缀游标
 	 */
-	@Column(name = "ki_cmpsuffix")
 	private Long componentsuffix;
 
-	/**
-	 * 包含的属性
-	 */
-	@OneToMany(mappedBy = "kind", cascade = { CascadeType.PERSIST, CascadeType.REMOVE }, fetch = FetchType.LAZY)
-	@OrderBy("detno")
-	private Set<KindProperty> properties;
-
 	/**
 	 * 所含子类目
 	 */
-	@Transient
 	private List<Kind> children;
 
 	/**
 	 * 其兄弟类目
 	 */
-	@Transient
 	private List<Kind> bothers;
 
 	public Long getId() {
@@ -207,16 +166,6 @@ public class Kind implements Serializable {
 		this.bothers = bothers;
 	}
 
-	@JsonIgnore
-	@JSONField(serialize = false)
-	public Set<KindProperty> getProperties() {
-		return properties;
-	}
-
-	public void setProperties(Set<KindProperty> properties) {
-		this.properties = properties;
-	}
-
 	public Short getLevel() {
 		return level;
 	}

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

@@ -1,49 +1,36 @@
 package com.uas.platform.b2b.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 /**
  * 简要类目信息
  * 
  * @author suntg
  * @since 2016年3月10日下午5:15:28
  */
-@Entity
-@Table(name = "product$kind")
 public class KindInfo {
 
 	/**
 	 * id
 	 */
-	@Id
-	@Column(name = "ki_id")
 	private Long id;
 
 	/**
 	 * 类目名称
 	 */
-	@Column(name = "ki_name")
 	private String nameCn;
 
 	/**
 	 * 英文名
 	 */
-	@Column(name = "ki_name_en")
 	private String nameEn;
 
 	/**
 	 * 父节点id
 	 */
-	@Column(name = "ki_parentid")
 	private Long parentid;
 
 	/**
 	 * 类目的层级，从1开始，1、2、3、4
 	 */
-	@Column(name = "ki_level")
 	private Short level;
 
 	public Long getId() {

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

@@ -1,139 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-
-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.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
-/**
- * 类目对应的属性
- * 
- * @author suntg
- * @since 2016年3月11日下午3:10:34
- */
-@Entity
-@Table(name = "product$kindproperty")
-public class KindProperty implements Serializable {
-
-	/**
-	 * 序列号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@Column(name = "kp_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$kindproperty_gen")
-	@SequenceGenerator(name = "product$kindproperty_gen", sequenceName = "product$kindproperty_seq", allocationSize = 1)
-	private Long id;
-
-	/**
-	 * 类目id
-	 */
-	@Column(name = "kp_kindid")
-	private Long kindId;
-
-	/**
-	 * 类目
-	 */
-	@ManyToOne(cascade = { CascadeType.REFRESH }, fetch = FetchType.LAZY)
-	@JoinColumn(name = "kp_kindid", insertable = false, updatable = false)
-	private Kind kind;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "kp_detno")
-	private Short detno;
-
-	/**
-	 * 属性id
-	 */
-	@Column(name = "kp_propertyid")
-	private Long propertyId;
-
-	/**
-	 * 类目属性输入类型，N(number)\T(text)\F(fromTo)\S(search)
-	 */
-	@Column(name = "kp_type")
-	private String type;
-
-	/**
-	 * 基本单位
-	 */
-	@Column(name = "kp_unit")
-	private String unit;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	@JsonIgnore
-	@JSONField(serialize = false)
-	public Kind getKind() {
-		return kind;
-	}
-
-	public void setKind(Kind kind) {
-		this.kind = kind;
-	}
-
-	public Short getDetno() {
-		return detno;
-	}
-
-	public void setDetno(Short detno) {
-		this.detno = detno;
-	}
-
-	public Long getKindId() {
-		return kindId;
-	}
-
-	public void setKindId(Long kindId) {
-		this.kindId = kindId;
-	}
-
-	public Long getPropertyId() {
-		return propertyId;
-	}
-
-	public void setPropertyId(Long propertyId) {
-		this.propertyId = propertyId;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getUnit() {
-		return unit;
-	}
-
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-}

src/main/java/com/uas/platform/b2b/search/SearchController.java

@@ -1,48 +1,17 @@
 package com.uas.platform.b2b.search;
 
-import java.util.List;
-import java.util.Map;
-
+import com.uas.account.entity.UserSpaceDetail;
+import com.uas.platform.b2b.model.*;
+import com.uas.search.b2b.model.PageParams;
+import com.uas.search.b2b.model.SPage;
 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.ResponseBody;
 
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.platform.b2b.model.Component;
-import com.uas.platform.b2b.model.DeputyOrder;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.InvitationRecord;
-import com.uas.platform.b2b.model.Kind;
-import com.uas.platform.b2b.model.MakeAccept;
-import com.uas.platform.b2b.model.MakeOrder;
-import com.uas.platform.b2b.model.MakeOrderChangeItem;
-import com.uas.platform.b2b.model.MakeReturn;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurcInquiry;
-import com.uas.platform.b2b.model.PurcInquiryItemInfo;
-import com.uas.platform.b2b.model.PurchaseAccept;
-import com.uas.platform.b2b.model.PurchaseApBill;
-import com.uas.platform.b2b.model.PurchaseApCheck;
-import com.uas.platform.b2b.model.PurchaseBadIn;
-import com.uas.platform.b2b.model.PurchaseBadOut;
-import com.uas.platform.b2b.model.PurchaseForecastAll;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseMRB;
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderChange;
-import com.uas.platform.b2b.model.PurchaseProofingApproval;
-import com.uas.platform.b2b.model.PurchaseProofingItem;
-import com.uas.platform.b2b.model.PurchaseProofingSend;
-import com.uas.platform.b2b.model.PurchaseReturn;
-import com.uas.platform.b2b.model.SaleARCheck;
-import com.uas.platform.b2b.model.SaleQuotationAll;
-import com.uas.platform.b2b.model.SaleSendAll;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.search.b2b.model.PageParams;
-import com.uas.search.b2b.model.SPage;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 搜索请求
@@ -388,7 +357,7 @@ public class SearchController {
 	 */
 	@RequestMapping(value = "/similarComponents", method = RequestMethod.GET)
 	@ResponseBody
-	public List<Map<String, Object>> getSimilarComponents(String keyword) {
+	public List<Map<String, Object>> getSimilarComponents(String keyword) throws Exception {
 		return searchService.getSimilarComponents(keyword);
 	}
 
@@ -401,7 +370,7 @@ public class SearchController {
 	 */
 	@RequestMapping(value = "/similarBrands", method = RequestMethod.GET)
 	@ResponseBody
-	public List<Map<String, Object>> getSimilarBrand(String keyword) {
+	public List<Map<String, Object>> getSimilarBrand(String keyword) throws Exception {
 		return searchService.getSimilarBrands(keyword);
 	}
 
@@ -413,7 +382,7 @@ public class SearchController {
 	 */
 	@RequestMapping(value = "/getComponentByCode", method = RequestMethod.GET)
 	@ResponseBody
-	public Component getComponentByCode(String code) {
+	public Component getComponentByCode(String code) throws Exception {
 		return searchService.getComponentByCode(code);
 	}
 
@@ -427,7 +396,7 @@ public class SearchController {
 	 */
 	@RequestMapping(value = "/similarKinds", method = RequestMethod.GET)
 	@ResponseBody
-	public List<Map<String, Object>> getSimilarKind(String keyword) {
+	public List<Map<String, Object>> getSimilarKind(String keyword) throws Exception {
 		return searchService.getSimilarKinds(keyword);
 	}
 
@@ -439,7 +408,7 @@ public class SearchController {
 	 */
 	@RequestMapping(value = "/similarBrandByCode", method = RequestMethod.GET)
 	@ResponseBody
-	public List<Map<String, Object>> getSimilarBrandsByCode(String keyword) {
+	public List<Map<String, Object>> getSimilarBrandsByCode(String keyword) throws Exception {
 		return searchService.getSimilarBrandsByCode(keyword);
 	}
 
@@ -451,14 +420,14 @@ public class SearchController {
 	 */
 	@RequestMapping(value = "/getKindByKeyword", method = RequestMethod.GET)
 	@ResponseBody
-	public Kind getKindByKeyword(String keyword) {
+	public Kind getKindByKeyword(String keyword) throws Exception {
 		return searchService.getKindByKeyword(keyword);
 	}
 
 	/**
 	 * 供应商联想词,返回供应商信息
 	 * 
-	 * @param keyword
+	 * @param enName
 	 * @return
 	 */
 	@RequestMapping(value = "/getVendorByenName", method = RequestMethod.GET)
@@ -504,7 +473,7 @@ public class SearchController {
 	}
 
 	/**
-	 * 类目联想词，点击返回类目信息
+	 * 客户联想词，点击返回客户信息
 	 * 
 	 * @param keyword
 	 * @return

src/main/java/com/uas/platform/b2b/search/SearchService.java

@@ -27,8 +27,6 @@ public interface SearchService {
 	 *            搜索词
 	 * @param pageParams
 	 *            分页信息
-	 * @param status
-	 *            状态
 	 * @return 订单数据
 	 */
 	public SPage<PurchaseOrderAll> searchPurchaseOrderIds(String keyword, PageParams pageParams);
@@ -355,11 +353,11 @@ public interface SearchService {
 	 * @param code
 	 * @return
 	 */
-	Component getComponentByCode(String code);
+	Component getComponentByCode(String code) throws Exception;
 
-	List<Map<String, Object>> getSimilarComponents(String keyword);
+	List<Map<String, Object>> getSimilarComponents(String keyword) throws Exception;
 
-	List<Map<String, Object>> getSimilarBrands(String keyword);
+	List<Map<String, Object>> getSimilarBrands(String keyword) throws Exception;
 
 	/**
 	 * 分类获取品牌联想词
@@ -367,7 +365,7 @@ public interface SearchService {
 	 * @param keyword
 	 * @return
 	 */
-	public List<Map<String, Object>> getSimilarBrandsByCode(String keyword);
+	public List<Map<String, Object>> getSimilarBrandsByCode(String keyword) throws Exception;
 
 	/**
 	 * 类目联想词
@@ -376,12 +374,12 @@ public interface SearchService {
 	 * @param keyword
 	 * @return
 	 */
-	List<Map<String, Object>> getSimilarKinds(String keyword);
+	List<Map<String, Object>> getSimilarKinds(String keyword) throws Exception;
 
 	/**
 	 * 供应商关键词
 	 * 
-	 * @param code
+	 * @param keyword
 	 * @return
 	 */
 	Vendor getVendorByEnname(String keyword);
@@ -474,7 +472,7 @@ public interface SearchService {
 	 * @param keyword
 	 * @return
 	 */
-	public Kind getKindByKeyword(String keyword);
+	public Kind getKindByKeyword(String keyword) throws Exception;
 
 	/**
 	 * 点击关键词返回客户信息

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -11,6 +11,9 @@ import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.model.SaleTenderItemErp;
 import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.service.BrandService;
+import com.uas.platform.b2b.service.ComponentService;
+import com.uas.platform.b2b.service.KindService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.persistence.criteria.PredicateFactory;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
@@ -34,7 +37,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 搜索实现
- * 
+ *
  * @author sunyj
  * @since 2016年11月11日 上午10:43:25
  */
@@ -135,9 +138,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private ProductDao productDao;
 
-	@Autowired
-	private ComponentDao componentDao;
-	
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
@@ -156,9 +156,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private VendorDao vendorDao;
 
-	@Autowired
-	private BrandDao brandDao;
-
 	@Autowired
 	private PurcInquiryDao purcInquiryDao;
 
@@ -171,9 +168,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Autowired
 	private CartDao cartDao;
 
-	@Autowired
-	private KindDao kindDao;
-
 	@Autowired
 	private SaleTenderDao saleTenderDao;
 
@@ -184,7 +178,13 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	private SaleQuotationDoneDao saleQuotationDoneDao;
 
 	@Autowired
-	private SaleTenderQuestionDao saleTenderQuestionDao;
+	private ComponentService componentService;
+
+	@Autowired
+	private BrandService brandService;
+
+	@Autowired
+	private KindService kindService;
 
 	/**
 	 * 联想词size
@@ -230,7 +230,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	}
 
 	private <T> void sortByProperty(List<T> content, Class<T> targetCls, String properyName,
-			final List<Long> propertyList) {
+									final List<Long> propertyList) {
 		final Field field = getPropertyField(targetCls, properyName);
 		if (null != field)
 			Collections.sort(content, new Comparator<T>() {
@@ -264,7 +264,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 
 	/**
 	 * 将id的SPage信息、数据合并
-	 * 
+	 *
 	 * @param idsPage
 	 *            id的SPage信息
 	 * @param content
@@ -288,7 +288,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 
 	/**
 	 * 委外加工单
-	 * 
+	 *
 	 */
 	@Override
 	public SPage<MakeOrder> searchMakeOrderIds(String keyword, PageParams pageParams) {
@@ -322,7 +322,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 
 	/**
 	 * 不良品入库单
-	 * 
+	 *
 	 * @param keyword
 	 * @param pageParams
 	 * @return
@@ -373,7 +373,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		// }
 		List<PurchaseInquiryItem> content = purchaseInquiryItemDao.findAll(new Specification<PurchaseInquiryItem>() {
 			public Predicate toPredicate(Root<PurchaseInquiryItem> root, CriteriaQuery<?> query,
-					CriteriaBuilder builder) {
+										 CriteriaBuilder builder) {
 				query.where(factory.toPredicate(root, query, builder));
 				return null;
 			}
@@ -470,7 +470,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, content);
 	}
 
-    /**
+	/**
 	 * 平台发货单
 	 */
 	@Override
@@ -745,7 +745,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	@Override
 	public SPage<Component> searchProductComponentCheckIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PRODUCT$COMPONENT, pageParams);
-		List<Component> content = componentDao.findAll(idsPage.getContent());
+		List<Component> content = componentService.findAll(idsPage.getContent());
 		sortByProperty(content, Component.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
@@ -766,15 +766,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, content);
 	}
 
-    @Override
-    public SPage<PagingReleaseDetail> searchPagingReleaseDetailIds(String keyword, PageParams pageParams) {
+	@Override
+	public SPage<PagingReleaseDetail> searchPagingReleaseDetailIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$PAGINGRELEASEDETAIL, pageParams);
 		List<PagingReleaseDetail> content = pagingReleaseDetailDao.findAll(idsPage.getContent());
 		sortByProperty(content, PagingReleaseDetail.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
-    }
+	}
 
-    /**
+	/**
 	 *  招标单
 	 * @param keyword
 	 * @param pageParams
@@ -855,15 +855,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	 * @param pageParams
 	 * @return
 	 */
-    @Override
-    public SPage<Vendor> searchCustCheckIds(String keyword, PageParams pageParams) {
+	@Override
+	public SPage<Vendor> searchCustCheckIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$VENDORS_CUST, pageParams);
 		List<Vendor> content = vendorDao.findAll(idsPage.getContent());
 		sortByProperty(content, Vendor.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
-    }
+	}
 
-    /**
+	/**
 	 * 供应商
 	 */
 	@Override
@@ -936,8 +936,8 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	}
 
 	@Override
-	public Component getComponentByCode(String code) {
-		List<Component> comps = componentDao.findByCode(code);
+	public Component getComponentByCode(String code) throws Exception {
+		List<Component> comps = componentService.findByCode(code);
 		Component cmp = new Component();
 		if(!CollectionUtils.isEmpty(comps)){
 			cmp = comps.get(0);// 因为只能带一个，选找到的第一个
@@ -946,11 +946,11 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	}
 
 	@Override
-	public List<Map<String, Object>> getSimilarComponents(String keyword) {
+	public List<Map<String, Object>> getSimilarComponents(String keyword) throws Exception {
 		SPage<String> codePages = searchService.similar(keyword, Table_name.PRODUCT$COMPONENT, SIMILAR_NUM, "cmp_code");
 		List<Component> contents = new ArrayList<>();
 		for (String code : codePages.getContent()) {
-			List<Component> components = componentDao.findByCode(code);
+			List<Component> components = componentService.findByCode(code);
 			if (!CollectionUtils.isEmpty(components)) {
 				Component component = components.get(0);
 				contents.add(component);
@@ -986,15 +986,15 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 //	}
 
 	@Override
-	public List<Map<String, Object>> getSimilarBrands(String keyword) {
+	public List<Map<String, Object>> getSimilarBrands(String keyword) throws Exception {
 		List<String> brandList = similarBrands(keyword);
 		List<Brand> contents = new ArrayList<>();
 		for (String brand : brandList) {
-			List<Brand> temps = brandDao.findByNameCn(brand);
+			List<Brand> temps = brandService.findByNameCn(brand);
 			if (!CollectionUtils.isEmpty(temps)) {
 				contents.add(temps.get(0));
 			} else { // 中文品牌找不到，找英文的
-				temps = brandDao.findByNameEn(brand);
+				temps = brandService.findByNameEn(brand);
 				if (!CollectionUtils.isEmpty(temps)) {
 					contents.add(temps.get(0));
 				}
@@ -1039,18 +1039,18 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	}
 
 	@Override
-	public List<Map<String, Object>> getSimilarBrandsByCode(String keyword) {
+	public List<Map<String, Object>> getSimilarBrandsByCode(String keyword) throws Exception {
 		List<String> brandList = similarBrandsByCode(keyword);
 		List<Brand> contents = new ArrayList<>();
 		List<Map<String, Object>> brands = new ArrayList<>();
 		for (String brand : brandList) {
 			if (keyword.matches(CHINESE_REGEXP)) {
-				List<Brand> temps = brandDao.findByNameCn(brand);
+				List<Brand> temps = brandService.findByNameCn(brand);
 				if (!CollectionUtils.isEmpty(temps)) {
 					contents.add(temps.get(0));
 				}
 			} else {
-				List<Brand> temps = brandDao.findByNameEn(brand);
+				List<Brand> temps = brandService.findByNameEn(brand);
 				if (!CollectionUtils.isEmpty(temps)) {
 					contents.add(temps.get(0));
 				}
@@ -1113,21 +1113,14 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	}
 
 	@Override
-	public List<Map<String, Object>> getSimilarKinds(String keyword) {
+	public List<Map<String, Object>> getSimilarKinds(String keyword) throws Exception {
 		List<String> kindList = similarKinds(keyword);
 		List<Kind> contents = new ArrayList<>();
 		List<Map<String, Object>> kinds = new ArrayList<>();
 		for (String kind : kindList) {
-			if (keyword.matches(ENGLISH_REGEXP)) {
-				List<Kind> temps = kindDao.findByNameEn(kind);
-				if (!CollectionUtils.isEmpty(temps)) {
-					contents.add(temps.get(0));
-				}
-			} else {
-				List<Kind> temps = kindDao.findByNameCn(kind);
-				if (!CollectionUtils.isEmpty(temps)) {
-					contents.add(temps.get(0));
-				}
+			List<Kind> temps = kindService.findByNameCn(kind);
+			if (!CollectionUtils.isEmpty(temps)) {
+				contents.add(temps.get(0));
 			}
 		}
 		for (Kind kind : contents) {
@@ -1335,8 +1328,8 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	}
 
 	@Override
-	public Kind getKindByKeyword(String keyword) {
-		return kindDao.findByNameCn(keyword).get(0);
+	public Kind getKindByKeyword(String keyword) throws Exception {
+		return kindService.findByNameCn(keyword).get(0);
 	}
 
 	/**
@@ -1360,9 +1353,7 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 
 	@Override
 	public SPage<SaleTenderQuestion> searchSaleTenderQuestion(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.SALE$TENDERQUESTION, pageParams);
-		List<SaleTenderQuestion> content = saleTenderQuestionDao.findAll(idsPage.getContent());
-		sortByProperty(content, SaleTenderQuestion.class, "id", idsPage.getContent());
-		return toSPage(idsPage, content);
+		return null;
 	}
+
 }

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

@@ -31,7 +31,7 @@ public interface BaseInfoService {
 	 * @param prodInfo
 	 * @return
 	 */
-	public ModelMap update(Product prodInfo, FileUpload uploadItem);
+	public ModelMap update(Product prodInfo, FileUpload uploadItem) throws Exception;
 
 	/**
 	 * 新增物料
@@ -39,7 +39,7 @@ public interface BaseInfoService {
 	 * @param prodInfo
 	 * @return
 	 */
-	public ModelMap addNewProduct(Product prodInfo, FileUpload uploadItem);
+	public ModelMap addNewProduct(Product prodInfo, FileUpload uploadItem) throws Exception;
 
 	/**
 	 * 通过id查询物料信息

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

@@ -1,9 +1,9 @@
 package com.uas.platform.b2b.service;
 
+import com.uas.account.support.Page;
 import com.uas.platform.b2b.model.Brand;
 import com.uas.platform.b2b.model.BrandInfo;
-import com.uas.platform.core.model.PageInfo;
-import org.springframework.data.domain.Page;
+import com.uas.platform.core.model.PageParams;
 
 import java.util.List;
 
@@ -21,7 +21,7 @@ public interface BrandService {
 	 *
 	 * @return
 	 */
-	public Page<BrandInfo> getBrandInfoPage(PageInfo pageInfo, String keyword);
+	public Page<BrandInfo> getBrandInfoPage(PageParams params, String keyword);
 
 
 	/**
@@ -45,6 +45,21 @@ public interface BrandService {
 	 * @param brandNameEn
 	 * @return
 	 */
-	public BrandInfo findByName(String brandNameCn, String brandNameEn);
+	public BrandInfo findByName(String brandNameCn, String brandNameEn) throws Exception;
 
+	/**
+	 * 通过品牌中文名查询品牌信息
+	 * 
+	 * @param brand
+	 * @return
+	 */
+	List<Brand> findByNameCn(String brand) throws Exception;
+
+	/**
+	 * 通过品牌英文名查询品牌信息
+	 *
+	 * @param brand
+	 * @return
+	 */
+	List<Brand> findByNameEn(String brand) throws Exception;
 }

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

@@ -4,6 +4,8 @@ import com.uas.platform.b2b.model.Component;
 import com.uas.platform.core.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 
+import java.util.List;
+
 public interface ComponentService {
 
 	/**
@@ -14,5 +16,9 @@ public interface ComponentService {
 	 */
 	SPage<Component> getCmpListByKindId(Long kindid, PageParams params, String keyword);
 
-    Component findByUuid(String uuid);
+    Component findByUuid(String uuid) throws Exception;
+
+	List<Component> findAll(List<Long> content);
+
+	List<Component> findByCode(String code) throws Exception;
 }

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

@@ -12,7 +12,7 @@ public interface KindService {
 	 * @param parentId
 	 * @return
 	 */
-	List<Kind> getChildProductKinds(Long parentId);
+	List<Kind> getChildProductKinds(Long parentId) throws Exception;
 
 
 
@@ -22,7 +22,14 @@ public interface KindService {
 	 * @param parentId
 	 * @return
 	 */
-	List<Kind> getAllChildProductKinds(Long parentId);
+	List<Kind> getAllChildProductKinds(Long parentId) throws Exception;
 
 
+	/**
+	 * 通过类目名称查询类目信息
+	 *
+	 * @param kind
+	 * @return
+	 */
+	List<Kind> findByNameCn(String kind) throws Exception;
 }

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

@@ -105,7 +105,7 @@ public interface ProductService {
 	 * 
 	 * @return
 	 */
-	public List<Component> matchByCode(String code);
+	public List<Component> matchByCode(String code) throws Exception;
 
 	/**
 	 * 通过id更新物料
@@ -129,7 +129,7 @@ public interface ProductService {
 	 * @param id
 	 * @return
 	 */
-	public List<ProductMatchResult> matchaone(Long id);
+	public List<ProductMatchResult> matchaone(Long id) throws Exception;
 
 	/**
 	 * 全部更新

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

@@ -8,6 +8,7 @@ import com.uas.platform.b2b.model.*;
 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.service.ComponentService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.temporary.model.*;
@@ -43,7 +44,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	private ProductDao productDao;
 
 	@Autowired
-	private ComponentDao componentDao;
+	private ComponentService componentService;
 
 	@Autowired
 	private EnterpriseDao enterpriseDao;
@@ -256,7 +257,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	 * 更新物料信息
 	 */
 	@Override
-	public ModelMap update(Product prodInfo, FileUpload uploadItem) {
+	public ModelMap update(Product prodInfo, FileUpload uploadItem) throws Exception {
 		ModelMap map = new ModelMap();
 		if (uploadItem.getFile() != null) {// 附件存在
 			Attach attach = attachService.upload(uploadItem, "productAttach", "平台客户上传物料照片或附件");
@@ -272,7 +273,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		if (prodInfo.getIsbusiness().equals(Constant.YES)) {// 如果有业务关系，导入的信息不能更改，采用下面的数据操作
 			// 根据填写的标准器件库的信息进行关联判断
 			if (prodInfo.getPcmpcode() != null && prodInfo.getPbranden() != null && prodInfo.getKind() != null) {
-				List<Component> cmps = componentDao.findByCode(prodInfo.getPcmpcode());
+				List<Component> cmps = componentService.findByCode(prodInfo.getPcmpcode());
 				if (!CollectionUtils.isEmpty(cmps)) {
 					for (Component cmp : cmps) {
 						if (cmp.getBrand().getNameEn().equals(prodInfo.getPbranden())
@@ -297,7 +298,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 			}
 		} else {// 没有业务关系，可以修改导入的产品的信息，标准的数据不进行操作
 			if (prodInfo.getCmpCode() != null && prodInfo.getBrand() != null && prodInfo.getTitle() != null) {
-				List<Component> cmps = componentDao.findByCode(prodInfo.getCmpCode());
+				List<Component> cmps = componentService.findByCode(prodInfo.getCmpCode());
 				if (!CollectionUtils.isEmpty(cmps)) {
 					for (Component cmp : cmps) {
 						if (cmp.getBrand().getNameEn().equals(prodInfo.getBrand())
@@ -334,7 +335,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	 * 新增物料
 	 */
 	@Override
-	public ModelMap addNewProduct(Product prodInfo, FileUpload uploadItem) {
+	public ModelMap addNewProduct(Product prodInfo, FileUpload uploadItem) throws Exception {
 		ModelMap map = new ModelMap();
 		if (uploadItem.getFile() != null) {// 附件存在
 			Attach attach = attachService.upload(uploadItem, "productAttach", "平台客户上传物料照片或附件");
@@ -352,7 +353,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		} else {
 			prodInfo.setStandard(Constant.NO);
 			if (prodInfo.getCmpCode() != null && prodInfo.getBrand() != null && prodInfo.getTitle() != null) {
-				List<Component> cmps = componentDao.findByCode(prodInfo.getCmpCode());
+				List<Component> cmps = componentService.findByCode(prodInfo.getCmpCode());
 				if (!CollectionUtils.isEmpty(cmps)) {
 					for (Component cmp : cmps) {
 						if (cmp.getBrand().getNameEn().equals(prodInfo.getBrand())

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

@@ -1,44 +1,39 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.dao.BrandDao;
-import com.uas.platform.b2b.dao.BrandInfoDao;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.parser.Feature;
+import com.uas.account.support.Page;
 import com.uas.platform.b2b.model.Brand;
 import com.uas.platform.b2b.model.BrandInfo;
 import com.uas.platform.b2b.service.BrandService;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.persistence.criteria.CriterionExpression.Operator;
-import com.uas.platform.core.persistence.criteria.LogicalExpression;
-import com.uas.platform.core.persistence.criteria.SimpleExpression;
+import com.uas.platform.b2b.support.SysConf;
+import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.util.HttpUtil;
 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.util.StringUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import java.net.URLEncoder;
 import java.util.List;
 
 @Service
 public class BrandServiceImpl implements BrandService {
 
 	@Autowired
-	private BrandDao brandDao;
-
-	@Autowired
-	private BrandInfoDao brandInfoDao;
+	private SysConf conf;
 
 	@Override
 	public List<Brand> init(List<Brand> brands) {
-		return brandDao.save(brands);
+		return null;
+//		return brandDao.save(brands);
 	}
 
 	@Override
 	public List<BrandInfo> getAllBrandInfo() {
-		return brandInfoDao.findAll();
+		return null;
+//		return brandInfoDao.findAll();
 	}
 
 
@@ -54,42 +49,47 @@ public class BrandServiceImpl implements BrandService {
 	}
 
 	@Override
-	public Page<BrandInfo> getBrandInfoPage(final PageInfo pageInfo, String keyword) {
-		if (StringUtils.hasText(keyword)) {
-			SimpleExpression[] simpleArrs = new SimpleExpression[2];
-			simpleArrs[0] = new SimpleExpression("nameCn", keyword, Operator.LIKE, true);
-			simpleArrs[1] = new SimpleExpression("nameEn", keyword, Operator.LIKE, true);
-			LogicalExpression logical = new LogicalExpression(simpleArrs, Operator.OR);
-			pageInfo.expression(logical);
+	public Page<BrandInfo> getBrandInfoPage(final PageParams params, String keyword) {
+		String url = conf.getB2c() + "/api/product/brand/Info/ByPage";
+		JSONObject formData = JSON.parseObject(JSON.toJSONString(params));
+		if(keyword != null) {
+			formData.put("keyword", keyword);
 		}
-		return brandInfoDao.findAll(new Specification<BrandInfo>() {
-			@Override
-			public Predicate toPredicate(Root<BrandInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-				query.where(pageInfo.getPredicates(root, query, builder));
-				return null;
-			}
-		}, pageInfo);
+		try {
+			HttpUtil.Response res = HttpUtil.sendGetRequest(url, formData);
+			return (Page)JSONObject.parseObject(res.getResponseText(), new TypeReference<Page<BrandInfo>>() {
+			}, new Feature[0]);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
 	}
 
 	/**
 	 * 通过中文和英文品牌名查找品牌信息
 	 */
 	@Override
-	public BrandInfo findByName(String brandNameCn, String brandNameEn) {
+	public BrandInfo findByName(String brandNameCn, String brandNameEn) throws Exception {
 		BrandInfo brandInfo = new BrandInfo();
 		if (brandNameCn != null) {
-			List<BrandInfo> brandsCn = brandInfoDao.findByNameCn(brandNameCn);
+			String url = conf.getB2c() + "/api/product/brand/nameCn/" + brandNameCn;
+			HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
+			List<BrandInfo> brandsCn = JSONObject.parseArray(res.getResponseText(), BrandInfo.class);
 			if (CollectionUtils.isNotEmpty(brandsCn)) {
 				brandInfo = brandsCn.get(0);
 			} else if (brandNameEn != null) {
-				List<BrandInfo> brandsEn = brandInfoDao.findByNameEn(brandNameEn);
+				url = conf.getB2c() + "/api/product/brand/nameEn/" + URLEncoder.encode(brandNameEn, "UTF-8");
+				HttpUtil.Response ens = HttpUtil.sendGetRequest(url, null);
+				List<BrandInfo> brandsEn = JSONObject.parseArray(ens.getResponseText(), BrandInfo.class);
 				if (CollectionUtils.isNotEmpty(brandsEn)) {
 					brandInfo = brandsEn.get(0);
 				}
 			}
 		}
 		if (brandNameEn != null && brandInfo.getUuid() != null) {
-			List<BrandInfo> brandsEn = brandInfoDao.findByNameEn(brandNameEn);
+			String url = conf.getB2c() + "/api/product/brand/nameEn/" + URLEncoder.encode(brandNameEn, "UTF-8");
+			HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
+			List<BrandInfo> brandsEn = JSONObject.parseArray(res.getResponseText(), BrandInfo.class);
 			if (CollectionUtils.isNotEmpty(brandsEn)) {
 				brandInfo = brandsEn.get(0);
 			}
@@ -97,10 +97,26 @@ public class BrandServiceImpl implements BrandService {
 		return brandInfo;
 	}
 
+	@Override
+	public List<Brand> findByNameCn(String brandNameCn) throws Exception {
+		String url = conf.getB2c() + "/api/product/brand/nameCn/" + brandNameCn;
+		HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
+		if(res.getStatusCode() != 200) throw  new Exception("暂未查询到相关数据");
+		return JSONObject.parseArray(res.getResponseText(), Brand.class);
+	}
+
+	@Override
+	public List<Brand> findByNameEn(String brandNameEn) throws Exception {
+		String url = conf.getB2c() + "/api/product/brand/nameEn/" + URLEncoder.encode(brandNameEn, "UTF-8");
+		HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
+		System.out.println(JSON.toJSON(res));
+		return JSONObject.parseArray(res.getResponseText(), Brand.class);
+	}
 
 	@Override
 	public List<Brand> findAll() {
-		return brandDao.findAll();
+		return null;
+//		return brandDao.findAll();
 	}
 
 

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

@@ -1,28 +1,60 @@
 package com.uas.platform.b2b.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.dao.ComponentDao;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.Component;
 import com.uas.platform.b2b.service.ComponentService;
+import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.util.HttpUtil;
 import com.uas.search.b2b.model.SPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 public class ComponentServiceImpl implements ComponentService {
 
 	@Autowired
-	private ComponentDao componentDao;
+	private SysConf conf;
 
 	@Override
 	public SPage<Component> getCmpListByKindId(Long kindid, PageParams params, String keyword) {
-		return componentDao.findByKindid(kindid);
+		return null;
+	}
+
+	@Override
+	public Component findByUuid(String uuid) throws Exception {
+        HttpUtil.Response res = HttpUtil.sendGetRequest(conf.getB2c() + "/api/product/component/Info/" + uuid, null);
+		Component component = JSONObject.parseObject(res.getResponseText(), Component.class);
+		return component;
 	}
 
 	@Override
-	public Component findByUuid(String uuid) {
-		return componentDao.findByUuid(uuid);
+	public List<Component> findAll(List<Long> content) {
+	    List<Component> components = new ArrayList<Component>();
+		try {
+			String res = HttpUtil.doPost(conf.getB2c() + "/api/product/component/batchId", JSON.toJSONString(content));
+            components = JSONObject.parseArray(res, Component.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return components;
+	}
+
+	@Override
+	public List<Component> findByCode(String code) throws Exception {
+        HttpUtil.Response res = HttpUtil.sendGetRequest(conf.getB2c() + "/api/product/component/byCode/" + code, null);
+		if(res.getStatusCode() != 200) throw new Exception("数据查询失败");
+		return JSONObject.parseArray(res.getResponseText(), Component.class);
+	}
+
+	public static void main(String args[]) throws Exception {
+		String url = "http://192.168.253.60:9090/platform-b2c/api/product/component/HXB15H4G160AF-13KT";
+		com.uas.platform.core.util.HttpUtil.Response response = com.uas.platform.core.util.HttpUtil.sendGetRequest(url ,null);
+		System.out.println(response.getResponseText());
 	}
 
 }

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

@@ -1,8 +1,10 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.dao.KindDao;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.Kind;
 import com.uas.platform.b2b.service.KindService;
+import com.uas.platform.b2b.support.SysConf;
+import com.uas.platform.core.util.HttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,17 +14,22 @@ import java.util.List;
 public class KindServiceImpl implements KindService {
 
     @Autowired
-    private KindDao kindDao;
-
+    private SysConf conf;
 
     @Override
-    public List<Kind> getChildProductKinds(Long parentid) {
-        return kindDao.findByParentidOrderByDetno(parentid);
+    public List<Kind> getChildProductKinds(Long parentid) throws Exception {
+        String url = conf.getB2c() + "/api/product/kind/" + parentid + "/children";
+        HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
+        if(res.getStatusCode() != 200) throw new Exception("查询类目信息失败");
+        return JSONObject.parseArray(res.getResponseText(), Kind.class);
     }
 
     @Override
-    public List<Kind> getAllChildProductKinds(Long parentid) {
-        List<Kind> kinds = kindDao.findByParentidOrderByDetno(parentid);
+    public List<Kind> getAllChildProductKinds(Long parentid) throws Exception {
+        String url = conf.getB2c() + "/api/product/kind/" + parentid +"/children";
+        HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
+        if(res.getStatusCode() != 200) throw new Exception("查询类目信息失败");
+        List<Kind> kinds = JSONObject.parseArray(JSONObject.toJSONString(res.getResponseText()), Kind.class);
         for (Kind kind : kinds) {
             if (!kind.isLeaf()) {
                 kind.setChildren(getAllChildProductKinds(kind.getId()));
@@ -31,4 +38,12 @@ public class KindServiceImpl implements KindService {
         return kinds;
     }
 
+    @Override
+    public List<Kind> findByNameCn(String name) throws Exception {
+        String url = conf.getB2c() + "/api/product/kind/findByName" + name;
+        HttpUtil.Response res = HttpUtil.sendGetRequest(url, null);
+        if(res.getStatusCode() != 200) throw new Exception("查询类目信息失败");
+        return JSONObject.parseArray(res.getResponseText(), Kind.class);
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.event.ProductSaveEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
+import com.uas.platform.b2b.service.ComponentService;
 import com.uas.platform.b2b.service.ProductService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -45,7 +46,7 @@ public class ProductServiceImpl implements ProductService {
 	private CommonDao commonDao;
 
 	@Autowired
-	private ComponentDao componentDao;
+	private ComponentService componentService;
 
 	@Autowired
 	private ProductMatchResultDao productMatchResultDao;
@@ -279,8 +280,8 @@ public class ProductServiceImpl implements ProductService {
 	}
 
 	@Override
-	public List<Component> matchByCode(String code) {
-		return componentDao.findByCode(code);
+	public List<Component> matchByCode(String code) throws Exception {
+		return componentService.findByCode(code);
 	}
 
 	@Override
@@ -352,12 +353,12 @@ public class ProductServiceImpl implements ProductService {
 	}
 
 	@Override
-	public List<ProductMatchResult> matchaone(Long id) {
+	public List<ProductMatchResult> matchaone(Long id) throws Exception {
 		List<ProductMatchResult> results = productMatchResultDao.findByPrid(id);
 		if (CollectionUtils.isEmpty(results)) {// 如果还没有匹配过，再次进行匹配
 			Product prod = productDao.findOne(id);
 			if (prod != null) {
-				List<Component> components = componentDao.findByCode(prod.getCmpCode());
+				List<Component> components = componentService.findByCode(prod.getCmpCode());
 				short i = 1;
 				results = new ArrayList<ProductMatchResult>();
 				if (!CollectionUtils.isEmpty(components)) {

src/main/java/com/uas/platform/b2b/support/SysConf.java

@@ -28,6 +28,12 @@ public class SysConf {
 	@Value("#{sys.im}")
 	private String im;
 
+	/**
+	 * b2c路径
+	 */
+	@Value("#{sys.b2c}")
+	private String b2c;
+
 	/**
 	 * 打印服务的url
 	 */
@@ -72,6 +78,14 @@ public class SysConf {
 		this.im = im;
 	}
 
+	public String getB2c() {
+		return b2c;
+	}
+
+	public void setB2c(String b2c) {
+		this.b2c = b2c;
+	}
+
 	public String getReportPrintUrl() {
 		return reportPrintUrl;
 	}

src/main/resources/dev/sys.properties

@@ -3,6 +3,7 @@ b2b=http://218.17.158.219:9090/platform-b2b
 manage=http://218.17.158.219:9090/platform-manage
 manageInner=http://192.168.253.60:9090/platform-manage
 im=http://113.105.74.131:8092
+b2c=http://192.168.253.60:9090/platform-b2c
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s

src/main/resources/prod/sys.properties

@@ -3,6 +3,7 @@ b2b=http://www.ubtob.com
 manage=http://manage.ubtob.com
 manageInner=http://10.10.100.81:8080
 im=http://113.105.74.140:8092
+b2c=http://www.usoftmall.com
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
-reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
+reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s

src/main/resources/test/sys.properties

@@ -3,6 +3,7 @@ b2b=http://218.17.158.219:9090/platform-b2b
 manage=http://218.17.158.219:9090/platform-manage
 manageInner=http://192.168.253.60:9090/platform-manage
 im=http://113.105.74.131:8092
+b2c=http://192.168.253.60:9090/platform-b2c
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s

src/main/webapp/resources/js/index/app.js

@@ -15888,15 +15888,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 获取订单总价
         $scope.totalPrice = function () {
+            $scope.deOrder.totalamount = 0;
+            $scope.deOrder.usdpayment = 0;
+            $scope.deOrder.orderamount = 0;
+            $scope.deOrder.totalpayament = 0;
             angular.forEach($scope.deOrder.deputyOrderItems, function (item) {
-                $scope.deOrder.totalamount = 0;
-                $scope.deOrder.usdpayment = 0;
-                $scope.deOrder.orderamount = 0;
-                $scope.deOrder.totalpayament = 0;
-                $scope.deOrder.totalamount += DecimalNumber.accMul(item.amount, item.unitprice);
-                $scope.deOrder.usdpayment += DecimalNumber.accMul(item.amount, item.unitprice);
-                $scope.deOrder.totalpayament += DecimalNumber.accMul(item.amount, item.unitprice);
-                $scope.deOrder.orderamount += DecimalNumber.accMul(item.amount, item.purcprice);
+                if(item.amount != null && item.unitprice != null && item.purcprice != null) {
+                    $scope.deOrder.totalamount += DecimalNumber.accMul(item.amount, item.unitprice);
+                    $scope.deOrder.usdpayment += DecimalNumber.accMul(item.amount, item.unitprice);
+                    $scope.deOrder.totalpayament += DecimalNumber.accMul(item.amount, item.unitprice);
+                    $scope.deOrder.orderamount += DecimalNumber.accMul(item.amount, item.purcprice);
+                }
             });
         }
         
@@ -16370,10 +16372,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.deOrder.orderamount = 0;
             $scope.deOrder.totalpayament = 0;
             angular.forEach($scope.deOrder.deputyOrderItems, function (item) {
-                $scope.deOrder.totalamount += DecimalNumber.accMul(item.amount, item.unitprice);
-                $scope.deOrder.usdpayment += DecimalNumber.accMul(item.amount, item.unitprice);
-                $scope.deOrder.totalpayament += DecimalNumber.accMul(item.amount, item.unitprice);
-                $scope.deOrder.orderamount += DecimalNumber.accMul(item.amount, item.purcprice);
+                if(item.amount != null && item.unitprice != null && item.purcprice != null) {
+                    $scope.deOrder.totalamount += DecimalNumber.accMul(item.amount, item.unitprice);
+                    $scope.deOrder.usdpayment += DecimalNumber.accMul(item.amount, item.unitprice);
+                    $scope.deOrder.totalpayament += DecimalNumber.accMul(item.amount, item.unitprice);
+                    $scope.deOrder.orderamount += DecimalNumber.accMul(item.amount, item.purcprice);
+                }
             });
         }