查询正在使用的产品类型（更放位置），根据colorId查询产品信息，根据typeId查询产品信息

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

@@ -28,7 +28,9 @@ public class ProductColor implements java.io.Serializable{
 	private String color69Code;			//产品69码
 	private Date colorCretaeTime;		//创建时间
 	private Date colorUpdateTime;	//修改时间
-	
+
+	private String colorImg;		//封面图
+	private Integer colorStatus;	//状态
 	private PageBean page = new PageBean();		//分页
 	
 	public Integer getColorProductType() {

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

@@ -5,6 +5,7 @@ import java.util.List;
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
 import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.core.entity.product.ProductColor;
+import com.iamberry.wechat.core.entity.product.ProductType;
 import com.iamberry.wechat.core.entity.product.QrcodeGift;
 
 public interface ProductInfoService {
@@ -109,4 +110,25 @@ public interface ProductInfoService {
 	 * @return
 	 */
 	List<ProductColor> selectColorList(Integer colorProductId);
+
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	Product selectProductByColorId(Integer colorId);
+
+	/**
+	 * 根据产品类型id查询产品颜色信息
+	 * @param product
+	 * @return
+	 */
+
+	List<Product> listProductColorByTypeId(Product product);
+
+	/**
+	 * 查询正在使用的产品类型
+	 * @return
+	 */
+	List<ProductType> listProductType();
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/porduct/ProductService.java

@@ -74,4 +74,6 @@ public interface ProductService {
 	 * @return
 	 */
 	public Integer updateProductStatusByProductId(Product product);
+
+
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/porduct/ProductTypeService.java

@@ -46,9 +46,5 @@ public interface ProductTypeService {
 	 */
 	public Integer updateProductTypeStatusById(ProductType productType);
 
-	/**
-	 * 查询正在使用的产品类型
-	 * @return
-	 */
-	List<ProductType> listProductType();
+
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.product.ProductColor;
+import com.iamberry.wechat.core.entity.product.ProductType;
 import com.iamberry.wechat.core.entity.product.QrcodeGift;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -131,4 +132,26 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 	public List<ProductColor> selectColorList(Integer colorProductId) {
 		return productInfoDao.selectColorList(colorProductId);
 	}
+	/**
+	 * 查询正在使用的产品类型
+	 * @return
+	 */
+
+	public List<ProductType> listProductType() {
+		return productInfoDao.listProductType();
+	}
+	@Override
+	public List<Product> listProductColorByTypeId(Product product) {
+		return productInfoDao.listProductColorByTypeId(product);
+	}
+
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	@Override
+	public Product selectProductByColorId(Integer colorId) {
+		return productInfoDao.selectProductByColorId(colorId);
+	}
 }

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

@@ -6,6 +6,7 @@ import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
 import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.core.entity.product.ProductColor;
+import com.iamberry.wechat.core.entity.product.ProductType;
 import com.iamberry.wechat.core.entity.product.QrcodeGift;
 
 public interface ProductInfoDao {
@@ -105,4 +106,24 @@ public interface ProductInfoDao {
 	 * @return
 	 */
 	List<ProductColor> selectColorList(Integer colorProductId);
+
+	/**
+	 * 查询正在使用的产品类型
+	 * @return
+	 */
+	List<ProductType> listProductType();
+
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	Product selectProductByColorId(Integer colorId);
+
+	/**
+	 * 根据产品类型id查询产品颜色信息
+	 * @param product
+	 * @return
+	 */
+	List<Product> listProductColorByTypeId(Product product);
 }

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

@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.cart.dao.impl;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.product.ProductColor;
+import com.iamberry.wechat.core.entity.product.ProductType;
 import com.iamberry.wechat.core.entity.product.QrcodeGift;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -112,4 +113,24 @@ public class ProductInfoDaoImpl implements ProductInfoDao {
 	public List<ProductColor> selectColorList(Integer colorProductId) {
 		return productInfoMapper.selectColorList(colorProductId);
 	}
+
+	/**
+	 * 根据产品类型id查询产品颜色信息
+	 * @param product
+	 * @return
+	 */
+	@Override
+	public List<Product> listProductColorByTypeId(Product product) {
+		return productInfoMapper.listProductColorByTypeId(product);
+	}
+
+	@Override
+	public List<ProductType> listProductType() {
+		return productInfoMapper.listProductType();
+	}
+
+	@Override
+	public Product selectProductByColorId(Integer colorId) {
+		return productInfoMapper.selectProductByColorId(colorId);
+	}
 }

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

@@ -6,6 +6,7 @@ import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
 import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.core.entity.product.ProductColor;
+import com.iamberry.wechat.core.entity.product.ProductType;
 import com.iamberry.wechat.core.entity.product.QrcodeGift;
 
 public interface ProductInfoMapper {
@@ -107,4 +108,24 @@ public interface ProductInfoMapper {
 	 * @return
 	 */
 	List<ProductColor> selectColorList(Integer colorProductId);
+
+	/**
+	 * 查询正在使用的产品类型
+	 * @return
+	 */
+	List<ProductType> listProductType();
+
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	Product selectProductByColorId(Integer colorId);
+
+	/**
+	 * 根据产品类型id查询产品颜色信息
+	 * @param product
+	 * @return
+	 */
+	List<Product> listProductColorByTypeId(Product product);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ProductMapper.java

@@ -104,9 +104,4 @@ public interface ProductMapper {
 	 */
 	public Integer updateProductTypeStatusById(ProductType productType);
 
-	/**
-	 * 查询正在使用的产品类型
-	 * @return
-	 */
-	List<ProductType> listProductType();
 }

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

@@ -31,7 +31,58 @@
 		COLOR_PRICE colorPrice,
 		COLOR_69CODE color69Code 
 	</sql>
+	<!-- 产品类型 -->
+	<sql id="allTypeField">
+		TYPE_ID typeId,
+		TYPE_NAME typeName,
+		TYPE_DETILAS typeDetilas,
+		TYPE_CREATE_DATE typeCreateDate,
+		TYPE_UPDATE_DATE typeUpdateDate,
+		TYPE_STATE typeState
+	</sql>
+	<!--根据产品类型id查询产品信息-->
+	<select id="listProductColorByTypeId" resultType="Product" parameterType="Product">
+		SELECT
+		COLOR_ID "colorList.colorId",
+		COLOR_PRODUCT_ID "colorList.colorProductId",
+		COLOR_NAME "colorList.colorName",
+		COLOR_DISCOUNT "colorList.colorDiscount",
+		COLOR_PRICE "colorList.colorPrice",
+		COLOR_IMG "colorList.colorImg",
+		COLOR_STATUS "colorList.colorStatus",
+		COLOR_69CODE "colorList.color69Code",
+		COLOR_CRETAE_TIME "colorList.colorCretaeTime",
+		COLOR_UPDATE_TIME "colorList.colorUpdateTime",
+		<include refid="product"></include>
+		FROM tb_iamberry_product_info PI
+		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
+		WHERE PI.PRODUCT_TYPE=#{productType.typeId}
+		ORDER BY product_sort_num
+		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
+			limit ${page.recordBegin},${page.pageSize}
+		</if>
+		<if test="page!=null and page.recordBegin==0 and page.pageSize>0 ">
+			limit ${page.pageSize}
+		</if>
+	</select>
 
+	<!--根据产品颜色id查询产品信息-->
+	<select id="selectProductByColorId"  resultType="Product">
+		SELECT
+		<include refid="product"></include>,
+		PC.COLOR_NAME
+		FROM tb_iamberry_product_info PI
+		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
+		WHERE PC.color_id=#{colorId}
+	</select>
+
+	<!--查询正在使用的产品类型-->
+	<select id="listProductType" resultType="ProductType">
+		SELECT
+		<include refid="allTypeField"></include>
+		FROM TB_IAMBERRY_PRODUCT_TYPE
+		WHERE TYPE_STATE=1
+	</select>
 	<!-- 分页查询商品信息 -->
 	<select id="selectPageProduct" parameterType="Product" resultType="Product">
 		SELECT

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

@@ -16,7 +16,11 @@
 		PRODUCT_COLOR_DES productColorDes,
 		PRODUCT_REMARK productRemark,
 		PRODUCT_COLOR productColor,
-		PRODUCT_RENT_TYPE productRentType
+		PRODUCT_RENT_TYPE productRentType,
+		PRODUCT_DISCOUNT productDiscount,
+		PRODUCT_PRICE productPrice,
+		PRODUCT_STATUS productStatus
+
 	</sql>
 	<!-- 产品类型的所有字段 -->
 	<sql id="allTypeField">
@@ -27,13 +31,7 @@
 		TYPE_UPDATE_DATE typeUpdateDate,
 		TYPE_STATE typeState
 	</sql>
-	<!--查询正在使用的产品类型-->
-	<select id="listProductType" resultType="ProductType">
-		SELECT
-			<include refid="allTypeField"></include>
-		FROM TB_IAMBERRY_PRODUCT_TYPE
-		WHERE TYPE_STATE=1
-	</select>
+
 	<!-- 查询所有的产品并分页 -->
 	<select id="selectAllProductInfo" resultMap="productColorMap" parameterType="product">
 		SELECT

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

@@ -22,13 +22,13 @@
         LEFT JOIN tb_iamberry_integral_config c ON i.use_config_id = c.integral_config_id
         <where>
             <if test="openid!=null">
-                user_openid=#{openid}
+                user_openid=#{userOpenId}
             </if>
             <if test="useType != null">
                AND use_type = #{useType}
             </if>
         </where>
-        ORDER BY ORDER BY UI.use_integral_id DESC
+        ORDER BY UI.use_integral_id DESC
         <if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
             limit ${page.recordBegin},${page.pageSize}
         </if>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/product/ProductTypeServiceImpl.java

@@ -22,8 +22,6 @@ public class ProductTypeServiceImpl implements ProductTypeService {
 
 	@Autowired
 	private ProductDao productDao;
-	@Autowired
-	private ProductMapper productMapper;
 
 	@Override
 	public List<ProductType> getAll() {
@@ -54,9 +52,4 @@ public class ProductTypeServiceImpl implements ProductTypeService {
 		// TODO Auto-generated method stub
 		return productDao.updateProductTypeStatusById(productType);
 	}
-
-	@Override
-	public List<ProductType> listProductType() {
-		return productMapper.listProductType();
-	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/product/dao/ProductDao.java

@@ -102,4 +102,6 @@ public interface ProductDao {
 	 * @return
 	 */
 	public Integer updateProductTypeStatusById(ProductType productType);
+
+
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/product/dao/impl/ProductDAOImpl.java

@@ -120,5 +120,4 @@ public class ProductDAOImpl implements ProductDao{
 		// TODO Auto-generated method stub
 		return productMapper.updateProductTypeStatusById(productType);
 	}
-
 }

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

@@ -670,4 +670,88 @@ public class ProductInfoHandler {
 		remsg.setData(map);
 		return remsg;
 	}
+
+	/**
+	 * 查询正在使用的产品类型列表
+	 * @return
+	 */
+	@RequestMapping("/listProductType")
+	@ResponseBody
+	public ResultMsg listProductType(){
+		ResultMsg rm=new ResultMsg();
+		List<ProductType> list=productInfoService.listProductType();
+		if(list.size()<0){
+			rm.setStatus(false);
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+			return rm;
+		}
+		rm.setData(list);
+		rm.setResultCode(ResultInfo.SUCCESSCODE);
+		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		rm.setStatus(true);
+		return rm;
+	}
+	/**
+	 * 根据colorId查询产品信息
+	 * @param colorId
+	 * @return
+	 */
+	@RequestMapping("/getProductByColorId")
+	@ResponseBody
+	public ResultMsg getProductByColorId(Integer colorId){
+		ResultMsg rm=new ResultMsg();
+		if(colorId<0){
+			rm.setStatus(false);
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+			return  rm ;
+		}
+		Product product=productInfoService.selectProductByColorId(colorId);
+
+		rm.setStatus(true);
+		rm.setResultCode(ResultInfo.SUCCESSCODE);
+		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		rm.setData(product);
+		return rm ;
+	}
+
+	/**
+	 * 根据产品类型id查询产品颜色信息
+	 * @param typeId
+	 * @param pageSize
+	 * @param pageNO
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping("/listProductColorByTypeId")
+	public  ResultMsg listProductColorByTypeId(Integer typeId,
+											   @RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
+											   @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO){
+		ResultMsg rm=new ResultMsg();
+		if(typeId<=0){
+			rm.setStatus(false);
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
+			return rm;
+		}
+		Product product=new Product();
+		product.getProductType().setTypeId(typeId);
+		product.getPage().setPageSize(pageSize);
+		product.getPage().setPageNumber(pageNO);
+		List<Product> list=productInfoService.listProductColorByTypeId(product);
+		if(list==null||list.size()<=0){
+			rm.setStatus(false);
+			rm.setResultCode(ResultInfo.ERRORCODE);
+			return rm;
+		}
+		Map<String,Object> map=new HashMap<String, Object>();
+		map.put("productColorList",list);
+		map.put("typeId",product.getProductType().getTypeId());
+		rm.setStatus(true);
+		rm.setResultCode(ResultInfo.SUCCESSCODE);
+		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		rm.setData(map);
+		return rm ;
+	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/porduct/ProductHandler.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.product.*;
+import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.utils.Result;
 import org.apache.commons.lang.StringUtils;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/porduct/ProductTypeHandler.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 import org.apache.commons.lang.StringUtils;
@@ -26,6 +27,7 @@ import com.iamberry.wechat.face.porduct.ProductTypeService;
 public class ProductTypeHandler {
 	@Autowired
 	private ProductTypeService productTypeService;
+
 	
 	/**
 	 * 查询所有产品类型
@@ -140,25 +142,4 @@ public class ProductTypeHandler {
 		return "{\"status\":\"修改成功！\"}";
 	}
 
-	/**
-	 * 查询正在使用的产品类型列表
-	 * @return
-	 */
-	@RequestMapping("/listProductType")
-	@ResponseBody
-	public ResultMsg listProductType(){
-		ResultMsg rm=new ResultMsg();
-		List<ProductType> list=productTypeService.listProductType();
-		if(list.size()<0){
-			rm.setStatus(false);
-			rm.setResultCode(ResultInfo.ERRORCODE);
-			rm.setMessage(NameUtils.getConfig("ERRORINFO"));
-			return rm;
-		}
-		rm.setData(list);
-		rm.setResultCode(ResultInfo.SUCCESSCODE);
-		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-		rm.setStatus(true);
-		return rm;
-	}
 }