产品列表增加配件

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/ProductFittings.java

@@ -1,5 +1,7 @@
 package com.iamberry.wechat.core.entity.product;
 
+import com.iamberry.wechat.core.entity.PageBean;
+
 import java.util.Date;
 
 /**
@@ -21,6 +23,10 @@ public class ProductFittings implements java.io.Serializable {
     private String fittingsPic;         //介绍图
     private Integer fittingsStatus;     //状态    1：使用中 2：未使用
 
+    private Integer productType;    //产品大类id
+
+    private PageBean page = new PageBean();	//分页信息
+
     private Date fittingsCretaeTime;    //创建时间
 
     public Integer getFittingsId() {
@@ -110,4 +116,20 @@ public class ProductFittings implements java.io.Serializable {
     public void setFittingsCretaeTime(Date fittingsCretaeTime) {
         this.fittingsCretaeTime = fittingsCretaeTime;
     }
+
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
+
+    public PageBean getPage() {
+        return page;
+    }
+
+    public void setPage(PageBean page) {
+        this.page = page;
+    }
 }

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/ProductInfoService.java

@@ -2,17 +2,17 @@ package com.iamberry.wechat.face.cart;
 
 import java.util.List;
 
-import com.iamberry.wechat.core.entity.product.Product;
-import com.iamberry.wechat.core.entity.product.ProductChildType;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
+import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.core.entity.search.SearchInfo;
 
 public interface ProductInfoService {
 
 	//分页查询商品信息
 	public List<Product> selectPageProduct(int pageSize, int pageNO, String productName,Integer typeId);
-	
+
+	//分页查配件信息
+	public List<ProductFittings> selectPageProductFittings(int pageSize, int pageNO, Integer typeId);
+
 	//根据productID查询商品信息
 	public Product getProductByProductId(Integer productId);
 	

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/ProductInfoServiceImpl.java

@@ -3,16 +3,13 @@ package com.iamberry.wechat.service.cart;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.iamberry.wechat.core.entity.product.ProductChildType;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
+import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.core.entity.search.SearchInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.iamberry.wechat.core.entity.PaperBean;
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
-import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.face.cart.ProductInfoService;
 import com.iamberry.wechat.service.StaticCacheMemory;
 import com.iamberry.wechat.service.cart.dao.CartDao;
@@ -46,6 +43,23 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 		return productInfoDao.selectPageProduct(bean);
 	}
 
+
+	public List<ProductFittings> selectPageProductFittings(int pageSize, int pageNO, Integer typeId) {
+		// TODO Auto-generated method stub
+		PaperBean bean = new PaperBean();
+		if (pageNO == 1) {
+			bean.setMinNum((pageNO-1)*pageSize);
+		} else if (pageNO > 1) {
+			bean.setMinNum((pageNO-1)*pageSize+1);
+		}
+		bean.setMaxNum(pageSize);
+		if (null != typeId) {
+			bean.setOtherInt(typeId);
+		}
+		return productInfoDao.selectPageProductFittings(bean);
+	}
+
+
 	
 	public Product getProductByProductId(Integer productId) {
 		// TODO Auto-generated method stub

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/ProductInfoDao.java

@@ -4,16 +4,15 @@ import java.util.List;
 
 import com.iamberry.wechat.core.entity.PaperBean;
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
-import com.iamberry.wechat.core.entity.product.Product;
-import com.iamberry.wechat.core.entity.product.ProductChildType;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
+import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.core.entity.search.SearchInfo;
 
 public interface ProductInfoDao {
 
 	//分页查询商品信息
 	public List<Product> selectPageProduct(PaperBean bean);
+	//分页查配件信息
+	List<ProductFittings> selectPageProductFittings(PaperBean bean);
 	
 	//根据productID查询商品信息
 	public Product getProductByProductId(Integer productId);

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/ProductInfoDaoImpl.java

@@ -2,16 +2,13 @@ package com.iamberry.wechat.service.cart.dao.impl;
 
 import java.util.List;
 
-import com.iamberry.wechat.core.entity.product.ProductChildType;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
+import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.core.entity.search.SearchInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 import com.iamberry.wechat.core.entity.PaperBean;
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
-import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.service.cart.dao.ProductInfoDao;
 import com.iamberry.wechat.service.mapper.ProductInfoMapper;
 
@@ -26,6 +23,11 @@ public class ProductInfoDaoImpl implements ProductInfoDao {
 		// TODO Auto-generated method stub
 		return productInfoMapper.selectPageProduct(bean);
 	}
+	@Override
+	public List<ProductFittings> selectPageProductFittings(PaperBean bean) {
+		// TODO Auto-generated method stub
+		return productInfoMapper.selectPageProductFittings(bean);
+	}
 
 	@Override
 	public Product getProductByProductId(Integer productId) {

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ProductInfoMapper.java

@@ -3,16 +3,16 @@ import java.util.List;
 
 import com.iamberry.wechat.core.entity.PaperBean;
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
-import com.iamberry.wechat.core.entity.product.Product;
-import com.iamberry.wechat.core.entity.product.ProductChildType;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.product.ProductType;
+import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.core.entity.search.SearchInfo;
 
 public interface ProductInfoMapper {
 	
 	//分页查询商品信息
 	public List<Product> selectPageProduct(PaperBean bean);
+
+	//分页查询商品信息
+	public List<ProductFittings> selectPageProductFittings(PaperBean bean);
 	
 	//根据productID查询商品信息
 	public Product getProductByProductId(Integer productId);

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -76,6 +76,34 @@
 			#{minNum},#{maxNum}
 	</select>
 
+	<!-- 分页查询配件信息 -->
+	<select id="selectPageProductFittings" parameterType="PaperBean" resultType="ProductFittings">
+		SELECT
+			t.fittings_id,
+			t.product_color_id,
+			t.product_type,
+			t.product_child_type,
+			t.fittings_color,
+			t.fittings_name,
+			t.fittings_discount,
+			t.fittings_price,
+			t.fittings_bar,
+			t.fittings_pic,
+			t.fittings_status,
+			t.fittings_cretae_time
+		FROM
+			tb_iamberry_product_fittings t
+		WHERE
+		fittings_status = 1
+		<if test="otherInt != null and otherInt != ''">
+			AND t.product_type = #{otherInt}
+		</if>
+		ORDER BY t.fittings_cretae_time DESC
+		LIMIT
+		#{minNum},#{maxNum}
+	</select>
+
+
 	<!-- 根据产品id获取所有颜色信息 -->
 	<select id="selectProductColor" parameterType="Integer" resultMap="colorMap">
 		SELECT

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProductInfoHandler.java

@@ -112,20 +112,33 @@ public class ProductInfoHandler {
 		if (null == typeId) {
 			typeId = productTypeList.get(0).getTypeId();
 		}
-		ProductType productType = new ProductType();
-		productType.setTypeId(typeId);
-		Product product = new Product();
-		product.setProductName(productName);
-		product.setProductType(productType);
-		List<Product> productList = productInfoService.selectPageProduct(pageSize, pageNO,productName,typeId);
-		int num = this.productInfoService.selectProductCount(product);
-		int count = num % pageSize == 0? num/pageSize:(num/pageSize)+1;
+
 		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("productList", productList);
-		map.put("productTypeList", productTypeList);
-		map.put("total", count);
-		remsg.setMessage(ResultInfo.SUCCESSINFO);
-		remsg.setResultCode(ResultInfo.SUCCESSCODE);
+		//获取配件类型
+		ShopSystemRule shopSystemRule = systemService.selectOneShopRuleById(255);
+		if(shopSystemRule.getRuleType() == typeId){	//等于则标识为配件
+			ProductFittings fittings = new ProductFittings();
+			fittings.setProductType(typeId);
+			List<ProductFittings> productFittingsList = productInfoService.selectPageProductFittings(pageSize, pageNO,typeId);
+			map.put("productFittingsList", productFittingsList);
+			map.put("productTypeList", productTypeList);
+			remsg.setMessage(ResultInfo.SUCCESSINFO);
+			remsg.setResultCode(ResultInfo.SUCCESSCODE);
+		}else{
+			ProductType productType = new ProductType();
+			productType.setTypeId(typeId);
+			Product product = new Product();
+			product.setProductName(productName);
+			product.setProductType(productType);
+			List<Product> productList = productInfoService.selectPageProduct(pageSize, pageNO,productName,typeId);
+			int num = this.productInfoService.selectProductCount(product);
+			int count = num % pageSize == 0? num/pageSize:(num/pageSize)+1;
+			map.put("productList", productList);
+			map.put("productTypeList", productTypeList);
+			map.put("total", count);
+			remsg.setMessage(ResultInfo.SUCCESSINFO);
+			remsg.setResultCode(ResultInfo.SUCCESSCODE);
+		}
 		remsg.setStatus(true);
 		remsg.setData(map);
 		return remsg;