watero售后改版

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/order/Order.java

@@ -39,6 +39,7 @@ public class Order implements java.io.Serializable{
 	private String salesAddressTel;						//收件人电话
 	private String salesAddressName;				//收件人姓名
 	private String salesReturnDes;						//退款备注
+	private String salesExchangeDes;						//换货备注
 	private String salesAdminRemark;				//后台的备注
 	private String salesUserRemark;					//用户备注
 	
@@ -376,4 +377,12 @@ public class Order implements java.io.Serializable{
 	public void setUserResource(String userResource) {
 		this.userResource = userResource;
 	}
+
+	public String getSalesExchangeDes() {
+		return salesExchangeDes;
+	}
+
+	public void setSalesExchangeDes(String salesExchangeDes) {
+		this.salesExchangeDes = salesExchangeDes;
+	}
 }

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

@@ -20,6 +20,16 @@ public class IndexProduct  implements  Serializable{
     private Integer indeProdSort;
     //状态： 1使用中 2未使用'
     private Integer indeProdStatus;
+    //类型：1.第一栏  2.第二栏
+    private Integer indeProdType;
+    //图片
+    private String indeProdImg;
+    //图片尺寸  1.小图  2.大图
+    private Integer indeProdImgSize;
+    //产品名称
+    private String productName;
+    //产品简介
+    private String productColorDes;
 
     private Integer colorProductId;		//所属产品id
     private String colorProductName;	    //所属产品名称
@@ -143,4 +153,44 @@ public class IndexProduct  implements  Serializable{
     public void setColorImg(String colorImg) {
         this.colorImg = colorImg;
     }
+
+    public Integer getIndeProdType() {
+        return indeProdType;
+    }
+
+    public void setIndeProdType(Integer indeProdType) {
+        this.indeProdType = indeProdType;
+    }
+
+    public String getIndeProdImg() {
+        return indeProdImg;
+    }
+
+    public void setIndeProdImg(String indeProdImg) {
+        this.indeProdImg = indeProdImg;
+    }
+
+    public Integer getIndeProdImgSize() {
+        return indeProdImgSize;
+    }
+
+    public void setIndeProdImgSize(Integer indeProdImgSize) {
+        this.indeProdImgSize = indeProdImgSize;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductColorDes() {
+        return productColorDes;
+    }
+
+    public void setProductColorDes(String productColorDes) {
+        this.productColorDes = productColorDes;
+    }
 }

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

@@ -220,8 +220,9 @@ PUBLIC
 			<if test="salesChangeOrderid != null and salesChangeOrderid != ''">
 				SALES_CHANGE_ORDERID = #{salesChangeOrderid},
 			</if>
-			SALES_STATUS = #{salesStatus} 
-		WHERE 
+			SALES_STATUS = #{salesStatus},
+			sales_exchange_des = #{salesExchangeDes}
+		WHERE
 			SALES_ORDERID = #{salesOrderid} 
 		AND 
 			SALES_STATUS = #{oldStatus} 

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

@@ -7,13 +7,19 @@
         <result    column="color_id"    property="colorId" />
         <result    column="inde_prod_sort"    property="indeProdSort" />
         <result    column="inde_prod_status"    property="indeProdStatus" />
+        <result    column="inde_prod_type"    property="indeProdType" />
+        <result    column="inde_prod_img"    property="indeProdImg" />
+        <result    column="inde_prod_img_size"    property="indeProdImgSize" />
     </resultMap>
     <sql    id="Base_List" >
         t.inde_prod_id,
         t.product_id,
         t.color_id,
         t.inde_prod_sort,
-        t.inde_prod_status
+        t.inde_prod_status,
+        t.inde_prod_type,
+        t.inde_prod_img,
+        t.inde_prod_img_size
     </sql>
     <select id="getIndexProductList" resultMap="BaseResultMap" parameterType="IndexProduct" >
         select
@@ -22,10 +28,11 @@
         pc.color_name,
         pc.color_discount,
         pc.color_price,
-        pc.color_69code,
-        pc.color_img
+        pi.product_name,
+        pi.product_color_des
         from tb_iamberry_index_product t
         LEFT JOIN tb_iamberry_product_color pc ON  t.color_id = pc.color_id
+        LEFT JOIN tb_iamberry_product_info pi ON pi.product_id = pc.color_product_id
         <where>
             <if test="indeProdId != null ">
                 AND t.inde_prod_id = #{indeProdId}
@@ -42,6 +49,9 @@
             <if test="indeProdStatus != null ">
                 AND t.inde_prod_status = #{indeProdStatus}
             </if >
+            <if test="indeProdType != null ">
+                AND t.inde_prod_type = #{indeProdType}
+            </if >
         </where>
         ORDER BY t.inde_prod_sort
     </select>

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

@@ -807,6 +807,7 @@ public class CartHandlers {
 	public ResultMsg exchangeOrder(HttpServletRequest request, 
 			@RequestParam(value = "orderId",defaultValue = "")String orderId, 
 			@RequestParam(value = "status",defaultValue = "-1") Integer status,
+			@RequestParam(value = "remake",defaultValue = "") String remake,
 			@RequestParam(value = "changeOrderId",defaultValue = "") String changeOrderId) throws Exception{
 		ResultMsg remsg=new ResultMsg();
 		
@@ -815,6 +816,7 @@ public class CartHandlers {
 		order.setSalesOrderid(orderId);
 		order.setSalesChangeOrderid(changeOrderId);
 		order.setOldStatus(status);
+		order.setSalesExchangeDes(remake);
 		ShopSystemRule shopSystemRule = this.adminOrderService.getReluByRid(103);
 		if (null != orderId && !"".equals(orderId)) {
 			ShopSalesOrderDto orderDto = this.cartService.getOpenIdAndStatus(orderId);

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

@@ -75,7 +75,7 @@ public class ProductInfoHandler {
 	@ResponseBody
 	@RequestMapping(value = "/productIndex",method = RequestMethod.POST)
 	public ResultMsg productIndex(HttpServletRequest request,
-			@RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize, 
+			@RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
 			@RequestParam(value = "pageNO", defaultValue = "1") Integer pageNO,
 			@RequestParam(value = "productName", defaultValue = "")String productName,
 			@RequestParam(value = "productType", defaultValue = "1") Integer productType,
@@ -96,61 +96,61 @@ public class ProductInfoHandler {
 		product.getPage().initRecordBegin();
 		List<Product> productList = productInfoService.selectPageProduct(product);
 
-		
+
 		//根据openid查询该用户是否购买过订单
-		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
-		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
-		shopSalesOrderDto.setSalesStatus("2");
-		
-		//判断是否为金牌会员下线，如果是，则以优惠价显示，如果不是则按原价显示
-		//查询金牌会员模板id
-		int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
-		//查询用户信息
-		Member user= memberService.getMemberByUserOpenId(member.getUserOpenid());
-		if (user == null) {
-			remsg.setMessage(ResultInfo.loginOutError);
-			remsg.setStatus(false);
-			remsg.setMessage(ResultInfo.loginOutError);
-			return remsg;
-		}
-		//如果模板id等于金牌会模板id，则该用户为金牌会员下线
-		if (user.getUserDealers() != null && user.getTemplateId() != null && 
-				templateId == user.getTemplateId().intValue() && user.getUserResType().intValue() == 3) {
-			//若果是金牌会员下线，产品的价格就以优惠价显示
-			if (productList != null && productList.size() >= 1) {
-				for (Product productInfo : productList) {
-					UserGiftDto userGiftDto = new UserGiftDto();
-					userGiftDto.setUserLevel(2);
-					userGiftDto.setUserProductId(productInfo.getProductId());
-					userGiftDto.setUserColorId(productInfo.getColorId());
-					//根据商品id和会员等级查询礼品信息
-					userGiftDto = productInfoService.selectUserGift(userGiftDto);
-					if (userGiftDto != null) {
-						productInfo.setProductDiscount(userGiftDto.getUserDiscount());
-					}
-				}
-			}
-		}
-		
-		int orderNum = cartService.selectOrderCount(shopSalesOrderDto);
-		//如果购买过订单，则滤芯的价格可按折扣价购买
-		if (orderNum > 0) {
-			if (productList != null && productList.size() >= 1) {
-				for (Product productInfo : productList) {
-					if (productInfo.getProductType().getTypeId().intValue() == 2) {
-						UserGiftDto userGiftDto = new UserGiftDto();
-						userGiftDto.setUserLevel(3);
-						userGiftDto.setUserProductId(productInfo.getProductId());
-						userGiftDto.setUserColorId(productInfo.getColorId());
-						//根据商品id和会员等级查询礼品信息
-						userGiftDto = productInfoService.selectUserGift(userGiftDto);
-						if (userGiftDto != null) {
-							productInfo.setProductDiscount(userGiftDto.getUserDiscount());
-						}
-					}
-				}
-			}
-		}
+//		ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
+//		shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
+//		shopSalesOrderDto.setSalesStatus("2");
+//
+//		//判断是否为金牌会员下线，如果是，则以优惠价显示，如果不是则按原价显示
+//		//查询金牌会员模板id
+//		int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
+//		//查询用户信息
+//		Member user= memberService.getMemberByUserOpenId(member.getUserOpenid());
+//		if (user == null) {
+//			remsg.setMessage(ResultInfo.loginOutError);
+//			remsg.setStatus(false);
+//			remsg.setMessage(ResultInfo.loginOutError);
+//			return remsg;
+//		}
+//		//如果模板id等于金牌会模板id，则该用户为金牌会员下线
+//		if (user.getUserDealers() != null && user.getTemplateId() != null &&
+//				templateId == user.getTemplateId().intValue() && user.getUserResType().intValue() == 3) {
+//			//若果是金牌会员下线，产品的价格就以优惠价显示
+//			if (productList != null && productList.size() >= 1) {
+//				for (Product productInfo : productList) {
+//					UserGiftDto userGiftDto = new UserGiftDto();
+//					userGiftDto.setUserLevel(2);
+//					userGiftDto.setUserProductId(productInfo.getProductId());
+//					userGiftDto.setUserColorId(productInfo.getColorId());
+//					//根据商品id和会员等级查询礼品信息
+//					userGiftDto = productInfoService.selectUserGift(userGiftDto);
+//					if (userGiftDto != null) {
+//						productInfo.setProductDiscount(userGiftDto.getUserDiscount());
+//					}
+//				}
+//			}
+//		}
+//
+//		int orderNum = cartService.selectOrderCount(shopSalesOrderDto);
+//		//如果购买过订单，则滤芯的价格可按折扣价购买
+//		if (orderNum > 0) {
+//			if (productList != null && productList.size() >= 1) {
+//				for (Product productInfo : productList) {
+//					if (productInfo.getProductType().getTypeId().intValue() == 2) {
+//						UserGiftDto userGiftDto = new UserGiftDto();
+//						userGiftDto.setUserLevel(3);
+//						userGiftDto.setUserProductId(productInfo.getProductId());
+//						userGiftDto.setUserColorId(productInfo.getColorId());
+//						//根据商品id和会员等级查询礼品信息
+//						userGiftDto = productInfoService.selectUserGift(userGiftDto);
+//						if (userGiftDto != null) {
+//							productInfo.setProductDiscount(userGiftDto.getUserDiscount());
+//						}
+//					}
+//				}
+//			}
+//		}
 		int num = this.productInfoService.selectProductCount(product);
 		int count = num % pageSize == 0? num/pageSize:(num/pageSize)+1;
 		Map<String, Object> map = new HashMap<String, Object>();
@@ -174,15 +174,24 @@ public class ProductInfoHandler {
 	@RequestMapping(value = "/productIndexSellWell",method = RequestMethod.POST)
 	public ResultMsg productIndexSellWell(HttpServletRequest request) throws Exception {
 		ResultMsg remsg= new ResultMsg();
+		Member member =  WechatUtils.getUserBySession(request);
 
-		IndexProduct indexProduct = new IndexProduct();
-		indexProduct.setIndeProdStatus(1);
-		List<IndexProduct> indexProductList = indexProductService.getIndexProductList(indexProduct);
+		IndexProduct firColuProduct = new IndexProduct();
+		firColuProduct.setIndeProdType(1);
+		List<IndexProduct> firColuProductList = indexProductService.getIndexProductList(firColuProduct);
 
+		IndexProduct SecColuProduct = new IndexProduct();
+		SecColuProduct.setIndeProdType(2);
+		List<IndexProduct> SecColuProductList = indexProductService.getIndexProductList(SecColuProduct);
+
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("firColuProductList", firColuProductList);
+		map.put("SecColuProductList", SecColuProductList);
 		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 		remsg.setResultCode(ResultInfo.SUCCESSCODE);
 		remsg.setStatus(true);
-		remsg.setData(indexProductList);
+		remsg.setData(map);
 		return remsg;
 	}
 	
@@ -225,52 +234,51 @@ public class ProductInfoHandler {
 		if (StaticInfo.pattern.matcher(productId).find()) {
 			Product product = this.productInfoService.getProductByProductId(Integer.parseInt(productId),colorId);
 			
-			//判断是否为金牌会员下线，如果是，则以优惠价显示，如果不是则按原价显示
-			//查询金牌会员模板id
-			int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
-			//查询用户信息
-			Member user= memberService.getMemberByUserOpenId(member.getUserOpenid());
-			if (user == null) {
-				remsg.setMessage(ResultInfo.loginOutError);
-				remsg.setStatus(false);
-				remsg.setMessage(ResultInfo.loginOutError);
-				return remsg;
-			}
+//			//判断是否为金牌会员下线，如果是，则以优惠价显示，如果不是则按原价显示
+//			//查询金牌会员模板id
+//			int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
+//			//查询用户信息
+//			Member user= memberService.getMemberByUserOpenId(member.getUserOpenid());
+//			if (user == null) {
+//				remsg.setMessage(ResultInfo.loginOutError);
+//				remsg.setStatus(false);
+//				remsg.setMessage(ResultInfo.loginOutError);
+//				return remsg;
+//			}
 			//如果模板id等于金牌会模板id，则该用户为金牌会员下线
-			if (user.getUserDealers() != null && user.getTemplateId() != null 
-					&& templateId == user.getTemplateId().intValue() && user.getUserResType().intValue() == 3) {
-						//若果是金牌会员下线，产品的价格就以优惠价显示
-						UserGiftDto userGiftDto = new UserGiftDto();
-						userGiftDto.setUserLevel(2);
-						userGiftDto.setUserProductId(product.getProductId());
-						userGiftDto.setUserColorId(product.getColorId());
-						//根据商品id和会员等级查询礼品信息
-						userGiftDto = productInfoService.selectUserGift(userGiftDto);
-						if (userGiftDto != null) {
-							product.setProductDiscount(userGiftDto.getUserDiscount());
-						}
-				
-			}
+//			if (user.getUserDealers() != null && user.getTemplateId() != null
+//					&& templateId == user.getTemplateId().intValue() && user.getUserResType().intValue() == 3) {
+//						//若果是金牌会员下线，产品的价格就以优惠价显示
+//						UserGiftDto userGiftDto = new UserGiftDto();
+//						userGiftDto.setUserLevel(2);
+//						userGiftDto.setUserProductId(product.getProductId());
+//						userGiftDto.setUserColorId(product.getColorId());
+//						//根据商品id和会员等级查询礼品信息
+//						userGiftDto = productInfoService.selectUserGift(userGiftDto);
+//						if (userGiftDto != null) {
+//							product.setProductDiscount(userGiftDto.getUserDiscount());
+//						}
+//			}
 			
 			//根据openid查询该用户是否购买过订单
 			ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
 			shopSalesOrderDto.setSalesOpenid(member.getUserOpenid());
 			shopSalesOrderDto.setSalesStatus("2");
 			//如果购买过订单，则滤芯的价格可按折扣价购买
-			if (product != null) {
-				if (product.getProductType().getTypeId().intValue() == 2) {
-					//若果是金牌会员下线，产品的价格就以优惠价显示
-					UserGiftDto userGiftDto = new UserGiftDto();
-					userGiftDto.setUserLevel(3);
-					userGiftDto.setUserProductId(product.getProductId());
-					userGiftDto.setUserColorId(product.getColorId());
-					//根据商品id和会员等级查询礼品信息
-					userGiftDto = productInfoService.selectUserGift(userGiftDto);
-					if (userGiftDto != null) {
-						product.setProductDiscount(userGiftDto.getUserDiscount());
-					}
-				}
-			}
+//			if (product != null) {
+//				if (product.getProductType().getTypeId().intValue() == 2) {
+//					//若果是金牌会员下线，产品的价格就以优惠价显示
+//					UserGiftDto userGiftDto = new UserGiftDto();
+//					userGiftDto.setUserLevel(3);
+//					userGiftDto.setUserProductId(product.getProductId());
+//					userGiftDto.setUserColorId(product.getColorId());
+//					//根据商品id和会员等级查询礼品信息
+//					userGiftDto = productInfoService.selectUserGift(userGiftDto);
+//					if (userGiftDto != null) {
+//						product.setProductDiscount(userGiftDto.getUserDiscount());
+//					}
+//				}
+//			}
 			List<ProductPicture> pictureList = productPictureService.getProductPictureByproductId(Integer.parseInt(productId));
 			product.setPictureList(pictureList);
 
@@ -283,9 +291,9 @@ public class ProductInfoHandler {
 			 * 组装数据
 			 */
 			map = new HashMap<String, Object>();
-			map.put("isShow", ResultInfo.ISSHOW);
-			map.put("cartDesc", ResultInfo.CARTDESC);
-			map.put("cart_url", ResultInfo.CART_URL);
+//			map.put("isShow", ResultInfo.ISSHOW);
+//			map.put("cartDesc", ResultInfo.CARTDESC);
+//			map.put("cart_url", ResultInfo.CART_URL);
 			map.put("product", product);
 			map.put("shareOpenid", member.getUserOpenid());
 			map.put("colorList", colorList);
@@ -305,9 +313,9 @@ public class ProductInfoHandler {
 			 * 组装数据
 			 */
 			map = new HashMap<String, Object>();
-			map.put("isShow", ResultInfo.ISSHOW);
-			map.put("cartDesc", ResultInfo.CARTDESC);
-			map.put("cart_url", ResultInfo.CART_URL);
+//			map.put("isShow", ResultInfo.ISSHOW);
+//			map.put("cartDesc", ResultInfo.CARTDESC);
+//			map.put("cart_url", ResultInfo.CART_URL);
 			map.put("product", product);
 			map.put("shareOpenid", member.getUserOpenid());
 			remsg.setData(map);