添加了按产品id查询所有颜色信息

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

@@ -102,4 +102,11 @@ public interface ProductInfoService {
 	 * @return
 	 */
 	ProductColor getProductColor(ProductColor productColor);
+
+	/**
+	 * 根据产品id获取所有颜色信息
+	 * @param colorProductId
+	 * @return
+	 */
+	List<ProductColor> selectColorList(Integer colorProductId);
 }

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

@@ -126,4 +126,9 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 	public ProductColor getProductColor(ProductColor productColor){
 		return productInfoDao.getProductColor(productColor);
 	}
+
+	@Override
+	public List<ProductColor> selectColorList(Integer colorProductId) {
+		return productInfoDao.selectColorList(colorProductId);
+	}
 }

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

@@ -98,4 +98,11 @@ public interface ProductInfoDao {
 	 * @return
 	 */
 	ProductColor getProductColor(ProductColor productColor);
+
+	/**
+	 * 根据产品id获取所有颜色信息
+	 * @param colorProductId
+	 * @return
+	 */
+	List<ProductColor> selectColorList(Integer colorProductId);
 }

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

@@ -107,4 +107,9 @@ public class ProductInfoDaoImpl implements ProductInfoDao {
     public Integer updateGiftStatus(QrcodeGift qrcodeGift) {
         return productInfoMapper.updateGiftStatus(qrcodeGift);
     }
+
+	@Override
+	public List<ProductColor> selectColorList(Integer colorProductId) {
+		return productInfoMapper.selectColorList(colorProductId);
+	}
 }

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

@@ -47,7 +47,7 @@ public interface ProductInfoMapper {
 	
 	/**
 	 * 根据商品id查询礼品信息
-	 * @param userProductId
+	 * @param userGiftDto
 	 * @return
 	 */
 	public UserGiftDto selectUserGift (UserGiftDto userGiftDto);
@@ -100,4 +100,11 @@ public interface ProductInfoMapper {
 	 * @return
 	 */
 	ProductColor getProductColor(ProductColor productColor);
+
+	/**
+	 * 根据产品id获取所有颜色信息
+	 * @param colorProductId
+	 * @return
+	 */
+	List<ProductColor> selectColorList(Integer colorProductId);
 }

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

@@ -211,7 +211,10 @@ public class ProductInfoHandler {
 		}
 
 		if (StaticInfo.pattern.matcher(productId).find()) {
+			//获取产品详情
 			Product product = this.productInfoService.getProductByProductId(Integer.parseInt(productId),colorId);
+			//获取该产品所有颜色信息
+			List<ProductColor> colorList = productInfoService.selectColorList(Integer.parseInt(productId));
 
 			String[] machineIds = {};
 			boolean codeFlag = false;
@@ -228,23 +231,6 @@ public class ProductInfoHandler {
 					}
 				}
 			}
-			//Map<String,Object> qrCodeMap = createQrCode(productId,colorId,member,codeFlag);
-
-            /*//如果是有二维码的商户，进入后显示优惠价
-            int num = productInfoService.getQrCodeByPlaceOpenId(member.getUserOpenid());
-            if (num > 0) {
-                QrcodeGift gift = new QrcodeGift();
-                List<QrcodeGift> giftList = productInfoService.listQrcodeGift(gift);
-                if (giftList != null && giftList.size() > 0 && product != null) {
-                    for (QrcodeGift qrcodeGift : giftList) {
-                        if (product.getColorId().intValue() == qrcodeGift.getQrcodeColorId()
-                            && qrcodeGift.getQrcodePreDiscount() != null
-                            && qrcodeGift.getQrcodePreDiscount() > 0) {
-                            product.setProductDiscount(qrcodeGift.getQrcodePreDiscount());
-                        }
-                    }
-                }
-            }*/
 
 			//如果用户是扫描二维码进入，则显示优惠价
 			String userQrcodeType = request.getParameter("userQrcodeType");
@@ -335,6 +321,7 @@ public class ProductInfoHandler {
 			map.put("cartDesc", ResultInfo.CARTDESC);
 			map.put("cart_url", ResultInfo.CART_URL);
 			map.put("product", product);
+			map.put("colorList",colorList);
 			map.put("shareOpenid", member.getUserOpenid());
 			remsg.setData(map);
 			remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));

tooth-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -231,6 +231,10 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.StatisticsSalesOrder" alias="StatisticsSalesOrder"/>
 		<!-- 水机租赁 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.rent.RentTypeInfo" alias="RentTypeInfo"/>
+
+		<!-- 机器 -->
+		<typeAlias type="com.iamberry.wechat.core.entity.apparatus.Apparatus" alias="Apparatus"/>
+
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>
 	<mappers>
@@ -315,5 +319,7 @@
 		<mapper resource="com/iamberry/rent/service/order/mapper/rentExchangeMapper.xml"/>-->
 		<!-- 机器编号，获取二维码-->
 		<mapper resource="com/iamberry/wechat/service/mapper/machineNumberMapper.xml"/>
+		<!-- 机器 -->
+		<mapper resource="com/iamberry/wechat/service/mapper/apparatusMapper.xml"/>
 	</mappers>
 </configuration>