Merge remote-tracking branch 'origin/dev' into dev

alexyang
2 parents 7fe1d191 0b1c6a6f
Showing 13 changed files with 1666 additions and 1482 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/ProductSku.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/cart/ConfirmCartReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/cart/ConfirmCartResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/cart/model/CartProductSku.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetDeliveryAddressReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetDeliveryAddressResp.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/ShoppingCartRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/ShoppingCartRPCImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/settle/impl/CartServiceImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/UserService.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/order/OrderController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/UserController.java
@@ -3,214 +3,223 @@ package com.diligrp.mobsite.getway.domain.protocol;
 import java.util.List;
 import java.util.Map;
  
+import io.swagger.annotations.ApiModelProperty;
  
 /**
  * <B>Description</B> 商品属性 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
+ * 
  * @createTime 2014年9月17日 下午6:19:19
  * @author zhangshirui
  */
 public class ProductSku {
-	
-	/**
-     * 商品状态：1-库存为零，销售完毕,2-商品状态：已下架或删除,3-在售并且正常
-	 * 1-库存为零，销售完毕
-	 */
-    public static final int STATE_SOLD_OUT = 1;
-    /**
-     * 2-已下架或删除
-     */
-    public static final int STATE_DOWN_DEL=2;
-    /**
-     * 3-在售并且正常
-     */
-    public static final int STATE_ON_SALE = 3;
-    
-    /**
-     * 购物车项sk
-     */
-    private String sku;
-    
-    /**
-     * 属性map
-     */
-    private Map<String,String> attributeMap;
-    
-    /**
-     * 价格类型
-     */
-    private Integer priceType;
-    
-    /**
-     * 最新价格
-     */
-    private Long price;
-    
-    /**
-     * 之前的价格
-     */
-    private Long oldPrice;
-    
-    /**
-     * 购买数量
-     */
-    private Integer buyNum;
-    
-    /**
-     * sku商品的状态
-     */
-    private Integer state;
-    
-    /**
-     * 选择的服务
-     */
-    private List<Service> serviceList;
-
-    
-    /**
-     * get value of ProductAttribute.sku
-     * @return the sku
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public String getSku() {
-        return sku;
-    }
-
-    
-    /**
-     * set value of ProductAttribute.sku
-     * @param sku the sku to set
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
-    
-    /**
-     * get value of ProductAttribute.attributeMap
-     * @return the attributeMap
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public Map<String, String> getAttributeMap() {
-        return attributeMap;
-    }
-
-    
-    /**
-     * set value of ProductAttribute.attributeMap
-     * @param attributeMap the attributeMap to set
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public void setAttributeMap(Map<String, String> attributeMap) {
-        this.attributeMap = attributeMap;
-    }
-
-    
-    /**
-     * get value of ProductAttribute.priceType
-     * @return the priceType
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public Integer getPriceType() {
-        return priceType;
-    }
-
-    
-    /**
-     * set value of ProductAttribute.priceType
-     * @param priceType the priceType to set
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public void setPriceType(Integer priceType) {
-        this.priceType = priceType;
-    }
-
-    
-    /**
-     * get value of ProductAttribute.price
-     * @return the price
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public Long getPrice() {
-        return price;
-    }
-
-    
-    /**
-     * set value of ProductAttribute.price
-     * @param price the price to set
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public void setPrice(Long price) {
-        this.price = price;
-    }
-
-    
-    /**
-     * get value of ProductAttribute.buyNum
-     * @return the buyNum
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public Integer getBuyNum() {
-        return buyNum;
-    }
-
-    
-    /**
-     * set value of ProductAttribute.buyNum
-     * @param buyNum the buyNum to set
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public void setBuyNum(Integer buyNum) {
-        this.buyNum = buyNum;
-    }
-
-    
-    /**
-     * get value of ProductAttribute.serviceList
-     * @return the serviceList
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public List<Service> getServiceList() {
-        return serviceList;
-    }
-
-    
-    /**
-     * set value of ProductAttribute.serviceList
-     * @param serviceList the serviceList to set
-     * @createTime 2014年9月17日 下午6:27:08
-     * @author zhangshirui
-     */
-    public void setServiceList(List<Service> serviceList) {
-        this.serviceList = serviceList;
-    }
  
+	/**
+	 * 商品状态：1-库存为零，销售完毕,2-商品状态：已下架或删除,3-在售并且正常 1-库存为零，销售完毕
+	 */
+	public static final int STATE_SOLD_OUT = 1;
+	/**
+	 * 2-已下架或删除
+	 */
+	public static final int STATE_DOWN_DEL = 2;
+	/**
+	 * 3-在售并且正常
+	 */
+	public static final int STATE_ON_SALE = 3;
+
+	/**
+	 * 购物车项sk
+	 */
+	private String sku;
+
+	/**
+	 * 属性map
+	 */
+	private Map<String, String> attributeMap;
+
+	/**
+	 * 价格类型
+	 */
+	private Integer priceType;
+
+	/**
+	 * 最新价格
+	 */
+	private Long price;
+
+	/**
+	 * 之前的价格
+	 */
+	private Long oldPrice;
+
+	/**
+	 * 购买数量
+	 */
+	private Integer buyNum;
+
+	/**
+	 * sku商品的状态
+	 */
+	private Integer state;
+
+	/**
+	 * 选择的服务
+	 */
+	private List<Service> serviceList;
+	@ApiModelProperty("商品id")
+	private Long productId;
+	@ApiModelProperty("商品名称")
+	private String productName;
+
+	/**
+	 * get value of ProductAttribute.sku
+	 * 
+	 * @return the sku
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public String getSku() {
+		return sku;
+	}
+
+	/**
+	 * set value of ProductAttribute.sku
+	 * 
+	 * @param sku
+	 *            the sku to set
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
+
+	/**
+	 * get value of ProductAttribute.attributeMap
+	 * 
+	 * @return the attributeMap
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public Map<String, String> getAttributeMap() {
+		return attributeMap;
+	}
+
+	/**
+	 * set value of ProductAttribute.attributeMap
+	 * 
+	 * @param attributeMap
+	 *            the attributeMap to set
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public void setAttributeMap(Map<String, String> attributeMap) {
+		this.attributeMap = attributeMap;
+	}
+
+	/**
+	 * get value of ProductAttribute.priceType
+	 * 
+	 * @return the priceType
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public Integer getPriceType() {
+		return priceType;
+	}
+
+	/**
+	 * set value of ProductAttribute.priceType
+	 * 
+	 * @param priceType
+	 *            the priceType to set
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public void setPriceType(Integer priceType) {
+		this.priceType = priceType;
+	}
+
+	/**
+	 * get value of ProductAttribute.price
+	 * 
+	 * @return the price
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public Long getPrice() {
+		return price;
+	}
+
+	/**
+	 * set value of ProductAttribute.price
+	 * 
+	 * @param price
+	 *            the price to set
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public void setPrice(Long price) {
+		this.price = price;
+	}
+
+	/**
+	 * get value of ProductAttribute.buyNum
+	 * 
+	 * @return the buyNum
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public Integer getBuyNum() {
+		return buyNum;
+	}
+
+	/**
+	 * set value of ProductAttribute.buyNum
+	 * 
+	 * @param buyNum
+	 *            the buyNum to set
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public void setBuyNum(Integer buyNum) {
+		this.buyNum = buyNum;
+	}
+
+	/**
+	 * get value of ProductAttribute.serviceList
+	 * 
+	 * @return the serviceList
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public List<Service> getServiceList() {
+		return serviceList;
+	}
+
+	/**
+	 * set value of ProductAttribute.serviceList
+	 * 
+	 * @param serviceList
+	 *            the serviceList to set
+	 * @createTime 2014年9月17日 下午6:27:08
+	 * @author zhangshirui
+	 */
+	public void setServiceList(List<Service> serviceList) {
+		this.serviceList = serviceList;
+	}
  
 	public Integer getState() {
 		return state;
 	}
  
-
 	public void setState(Integer state) {
 		this.state = state;
 	}
  
-
 	/**
 	 * @return the oldPrice
 	 */
@@ -218,11 +227,27 @@ public class ProductSku {
 		return oldPrice;
 	}
  
-
 	/**
-	 * @param oldPrice the oldPrice to set
+	 * @param oldPrice
+	 *            the oldPrice to set
 	 */
 	public void setOldPrice(Long oldPrice) {
 		this.oldPrice = oldPrice;
 	}
+
+	public Long getProductId() {
+		return productId;
+	}
+
+	public void setProductId(Long productId) {
+		this.productId = productId;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
 }
 package com.diligrp.mobsite.getway.domain.protocol.cart;
  
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
 import java.util.List;
  
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+
+import io.swagger.annotations.ApiModelProperty;
  
 /**
  * <B>Description</B> 进货单确认请求 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
+ * 
  * @createTime 2014年9月17日 上午11:54:10
  * @author zhangshirui
  */
 @SuppressWarnings("serial")
-public class ConfirmCartReq extends BaseReq{
-    
-	/**
-	 * 商品sku进货单id
-	 */
+public class ConfirmCartReq extends BaseReq {
+
+	@ApiModelProperty("买家id")
+	private Long shopBuyerId;
+	@ApiModelProperty("选择的sku")
 	private List<String> skus;
  
-    public List<String> getSkus() {
-        return skus;
-    }
+	public Long getShopBuyerId() {
+		return shopBuyerId;
+	}
+
+	public void setShopBuyerId(Long shopBuyerId) {
+		this.shopBuyerId = shopBuyerId;
+	}
+
+	public List<String> getSkus() {
+		return skus;
+	}
+
+	public void setSkus(List<String> skus) {
+		this.skus = skus;
+	}
  
-    public void setSkus(List<String> skus) {
-        this.skus = skus;
-    }
 }
@@ -3,118 +3,33 @@ package com.diligrp.mobsite.getway.domain.protocol.cart;
 import java.util.List;
  
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
-import com.diligrp.mobsite.getway.domain.protocol.cart.model.ConfirmCartShopInfo;
-
+import com.diligrp.mobsite.getway.domain.protocol.cart.model.CartProductSku;
  
 /**
  * <B>Description</B> 确认订单 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
+ * 
  * @createTime 2014年9月17日 上午11:55:09
- * @author zhangshirui
+ * @author jiang
  */
-@SuppressWarnings("serial")
 public class ConfirmCartResp extends BaseResp {
-	
-    /**
-     * 提货人信息
-     */
-    private PickInfo pickInfo;
-    
-    /**
-     * 购物单店铺信息
-     */
-    private List<ConfirmCartShopInfo> cartShops;
-    
-    /**
-     * 总价
-     */
-    private Long totalPrice;
-    
-    /**
-     * 信用额度
-     */
-    private Long creditAmount;
-    /**
-     * 进货单类型
-     * 1.普通支付
-     * 2.赊账支付
-     */
-    private Integer cartType;
-
-    /**
-     * @return the pickInfo
-     */
-    public PickInfo getPickInfo() {
-        return pickInfo;
-    }
-
-    /**
-     * @param pickInfo the pickInfo to set
-     */
-    public void setPickInfo(PickInfo pickInfo) {
-        this.pickInfo = pickInfo;
-    }
-
-    /**
-     * @return the totalPrice
-     */
-    public Long getTotalPrice() {
-        return totalPrice;
-    }
-
-    /**
-     * @param totalPrice the totalPrice to set
-     */
-    public void setTotalPrice(Long totalPrice) {
-        this.totalPrice = totalPrice;
-    }
-
-    /**
-     * @return the cartShops
-     */
-    public List<ConfirmCartShopInfo> getCartShops() {
-        return cartShops;
-    }
-
-    /**
-     * @param cartShops the cartShops to set
-     */
-    public void setCartShops(List<ConfirmCartShopInfo> cartShops) {
-        this.cartShops = cartShops;
-    }
  
-    /**
-     * get value of ConfirmCartResp.creditAmount
-     * @return the creditAmount
-     * @createTime 2014年11月5日 上午11:51:01
-     * @author zhangshirui
-     */
-    public Long getCreditAmount() {
-        return creditAmount;
-    }
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5717619810514850072L;
  
-    
-    /**
-     * set value of ConfirmCartResp.creditAmount
-     * @param creditAmount the creditAmount to set
-     * @createTime 2014年11月5日 上午11:51:01
-     * @author zhangshirui
-     */
-    public void setCreditAmount(Long creditAmount) {
-        this.creditAmount = creditAmount;
-    }
+	private List<CartProductSku> skus;
  
-    
-    public Integer getCartType() {
-        return cartType;
-    }
+	public List<CartProductSku> getSkus() {
+		return skus;
+	}
  
-    
-    public void setCartType(Integer cartType) {
-        this.cartType = cartType;
-    }
+	public void setSkus(List<CartProductSku> skus) {
+		this.skus = skus;
+	}
  
 }
@@ -2,204 +2,99 @@ package com.diligrp.mobsite.getway.domain.protocol.cart.model;
  
 import com.diligrp.mobsite.getway.domain.protocol.ProductSku;
  
-
 /**
  * <B>Description</B> 购物单商品属性 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
+ * 
  * @createTime 2014年9月11日 下午5:51:30
  * @author zhangshirui
  */
-public class CartProductSku extends ProductSku{
-	
+public class CartProductSku extends ProductSku {
+
 	/**
-	 * 价格变化
-	 * 1-价格变化
+	 * 价格变化 1-价格变化
 	 */
 	public static final int PRICE_CHANGE = 1;
 	/**
 	 * 2-价格未变化
 	 */
 	public static final int PRICE_NO_CHANGE = 2;
-	
+
 	/**
-     * 购买数量变化
-     * 1-购买数量变化
-     */
-    public static final int BUY_NUM_CHANGE = 1;
-    /**
-     * 2-购买数量未变化
-     */
-    public static final int BUY_NUM_NO_CHANGE = 2;
-	
+	 * 购买数量变化 1-购买数量变化
+	 */
+	public static final int BUY_NUM_CHANGE = 1;
 	/**
-     * 商品sku进货单id
-     */
-    private Long skuCartId;
-	
-    /**
-     * 起批量-最少购买量
-     */
-    private Integer minWholesale;
-    
-    /**
-     * 库存
-     */
-    private Integer stockNum;
-    
-    /**
-     * 添加到进货单的时间
-     */
-    private String addToCartTime;
-    
-    /**
-     * 单位
-     */
-    private String unit;
-
-
-
-    /** 是否允许市场外交割: 1-允许 ,2- 不允许 **/
-    private int isAllowDelivery;
-
-
-    public int getIsAllowDelivery() {
-        return isAllowDelivery;
-    }
-
-    public void setIsAllowDelivery(int isAllowDelivery) {
-        this.isAllowDelivery = isAllowDelivery;
-    }
-
-
-    /**
-     * 购买数量是否变化
-     * 默认2，没变化
-     */
-    private Integer isBuyNumChange = BUY_NUM_NO_CHANGE;
-    
-    /**
-     * 价格是否变化
-     * 默认2，没变化
-     */
-    private Integer isPriceChange = PRICE_NO_CHANGE;
-    
-    /**
-     * get value of CartProductAttribute.minWholesale
-     * @return the minWholesale
-     * @createTime 2014年9月17日 下午6:14:30
-     * @author zhangshirui
-     */
-    public Integer getMinWholesale() {
-        return minWholesale;
-    }
-
-    
-    /**
-     * set value of CartProductAttribute.minWholesale
-     * @param minWholesale the minWholesale to set
-     * @createTime 2014年9月17日 下午6:14:30
-     * @author zhangshirui
-     */
-    public void setMinWholesale(Integer minWholesale) {
-        this.minWholesale = minWholesale;
-    }
-
-    /**
-     * get value of CartProductAttribute.stockNum
-     * @return the stockNum
-     * @createTime 2014年9月17日 下午6:27:40
-     * @author zhangshirui
-     */
-    public Integer getStockNum() {
-        return stockNum;
-    }
-
-
-    
-    /**
-     * set value of CartProductAttribute.stockNum
-     * @param stockNum the stockNum to set
-     * @createTime 2014年9月17日 下午6:27:40
-     * @author zhangshirui
-     */
-    public void setStockNum(Integer stockNum) {
-        this.stockNum = stockNum;
-    }
-
+	 * 2-购买数量未变化
+	 */
+	public static final int BUY_NUM_NO_CHANGE = 2;
  
 	/**
-	 * @return the addToCartTime
+	 * 库存
 	 */
-	public String getAddToCartTime() {
-		return addToCartTime;
-	}
-
+	private Integer stockNum;
  
 	/**
-	 * @param addToCartTime the addToCartTime to set
+	 * 添加到进货单的时间
 	 */
-	public void setAddToCartTime(String addToCartTime) {
-		this.addToCartTime = addToCartTime;
-	}
+	private String addToCartTime;
  
+	/**
+	 * 单位
+	 */
+	private String unit;
  
-    
-    /**
-     * get value of CartProductSku.unit
-     * @return the unit
-     * @createTime 2014年10月13日 下午4:12:23
-     * @author zhangshirui
-     */
-    public String getUnit() {
-        return unit;
-    }
-
+	/**
+	 * 购买数量是否变化 默认2，没变化
+	 */
+	private Integer isBuyNumChange = BUY_NUM_NO_CHANGE;
  
-    
-    /**
-     * set value of CartProductSku.unit
-     * @param unit the unit to set
-     * @createTime 2014年10月13日 下午4:12:23
-     * @author zhangshirui
-     */
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-    
-    public Long getSkuCartId() {
-        return skuCartId;
-    }
+	/**
+	 * 价格是否变化 默认2，没变化
+	 */
+	private Integer isPriceChange = PRICE_NO_CHANGE;
  
+	public Integer getStockNum() {
+		return stockNum;
+	}
  
-    
-    public void setSkuCartId(Long skuCartId) {
-        this.skuCartId = skuCartId;
-    }
+	public void setStockNum(Integer stockNum) {
+		this.stockNum = stockNum;
+	}
  
+	public String getAddToCartTime() {
+		return addToCartTime;
+	}
  
-    
-    public Integer getIsBuyNumChange() {
-        return isBuyNumChange;
-    }
+	public void setAddToCartTime(String addToCartTime) {
+		this.addToCartTime = addToCartTime;
+	}
  
+	public String getUnit() {
+		return unit;
+	}
  
-    
-    public void setIsBuyNumChange(Integer isBuyNumChange) {
-        this.isBuyNumChange = isBuyNumChange;
-    }
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
  
+	public Integer getIsBuyNumChange() {
+		return isBuyNumChange;
+	}
  
-    
-    public Integer getIsPriceChange() {
-        return isPriceChange;
-    }
+	public void setIsBuyNumChange(Integer isBuyNumChange) {
+		this.isBuyNumChange = isBuyNumChange;
+	}
  
+	public Integer getIsPriceChange() {
+		return isPriceChange;
+	}
  
-    
-    public void setIsPriceChange(Integer isPriceChange) {
-        this.isPriceChange = isPriceChange;
-    }
+	public void setIsPriceChange(Integer isPriceChange) {
+		this.isPriceChange = isPriceChange;
+	}
  
 }
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class GetDeliveryAddressReq extends BaseReq {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3406556869427158247L;
+
+	@ApiModelProperty("买家id")
+	private Long shopBuyerId;
+
+	public Long getShopBuyerId() {
+		return shopBuyerId;
+	}
+
+	public void setShopBuyerId(Long shopBuyerId) {
+		this.shopBuyerId = shopBuyerId;
+	}
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class GetDeliveryAddressResp extends BaseResp {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 322459069347665875L;
+
+	@ApiModelProperty("送货地址")
+	private PickInfo pickInfo;
+
+	public PickInfo getPickInfo() {
+		return pickInfo;
+	}
+
+	public void setPickInfo(PickInfo pickInfo) {
+		this.pickInfo = pickInfo;
+	}
+
+}
+package com.diligrp.mobsite.getway.rpc;
+
+import com.diligrp.mobsite.getway.domain.protocol.cart.AddCartProductReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.AddCartProductResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ConfirmCartReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ConfirmCartResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.DelCartsReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.DelCartsResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetCartByUserReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetCartByUserResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountResp;
+
+public interface ShoppingCartRPC {
+
+	GetCartByUserResp getCart(GetCartByUserReq req);
+
+	AddCartProductResp addCartProduct(AddCartProductReq req);
+
+	DelCartsResp delCartByIds(DelCartsReq req);
+
+	ModifyAmountResp modifyAmount(ModifyAmountReq req);
+
+	ConfirmCartResp confirmCartInfo(ConfirmCartReq req);
+
+}
+package com.diligrp.mobsite.getway.rpc.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.util.CollectionUtils;
+
+import com.b2c.myapp.common.api.shoppingCart.input.ShoppingCartListInput;
+import com.b2c.myapp.common.api.shoppingCart.input.ShoppingCartSaveInput;
+import com.b2c.myapp.common.api.shoppingCart.input.ShoppingCartUpdateInput;
+import com.b2c.myapp.common.api.shoppingCart.output.ShoppingCartOutput;
+import com.b2c.myapp.common.utils.BaseOutput;
+import com.b2c.myapp.sdk.service.ShoppingCartService;
+import com.diligrp.mobsite.getway.domain.common.ResultCode;
+import com.diligrp.mobsite.getway.domain.except.ServiceException;
+import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct;
+import com.diligrp.mobsite.getway.domain.protocol.cart.AddCartProductReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.AddCartProductResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ConfirmCartReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ConfirmCartResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.DelCartsReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.DelCartsResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetCartByUserReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetCartByUserResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.model.CartProduct;
+import com.diligrp.mobsite.getway.domain.protocol.cart.model.CartProductSku;
+import com.diligrp.mobsite.getway.domain.protocol.cart.model.ConfirmCartShopInfo;
+import com.diligrp.mobsite.getway.rpc.ShoppingCartRPC;
+
+public class ShoppingCartRPCImpl implements ShoppingCartRPC {
+
+	@Resource
+	private ShoppingCartService cartService;
+
+	@Override
+	public GetCartByUserResp getCart(GetCartByUserReq req) {
+		GetCartByUserResp resp = new GetCartByUserResp();
+		ShoppingCartListInput input = new ShoppingCartListInput();
+		input.setShopBuyerId(req.getUserId());
+		BaseOutput<List<ShoppingCartOutput>> response = this.cartService.getCarts(input);
+		if (response == null) {
+			throw new ServiceException(ResultCode.NETWORK_FAILED, "获取购物车失败");
+		}
+		if (response.getCode() != com.b2c.myapp.common.utils.ResultCode.OK) {
+			throw new ServiceException(ResultCode.BUSINESS_FAILED, response.getResult());
+		}
+		if (CollectionUtils.isEmpty(response.getData())) {
+			List<CartProduct> cartGoods = new ArrayList<>(response.getData().size());
+			for (ShoppingCartOutput output : response.getData()) {
+				CartProduct cartProduct = new CartProduct();
+				cartProduct.setCid(output.getCid());
+				cartProduct.setPid(Long.valueOf(output.getPid()));
+				List<CartProductSku> skus = new ArrayList<>(1);
+				CartProductSku sku = new CartProductSku();
+				sku.setPrice(output.getCurrentPrice());
+				skus.add(sku);
+				cartProduct.setCartGoodsSkus(skus);
+				cartProduct.setName(output.getProductName());
+				cartProduct.setQuantity(output.getQuantity().intValue());
+				cartProduct.setUnit(output.getSaleUnit());
+				cartGoods.add(cartProduct);
+			}
+			resp.setCartGoods(cartGoods);
+		}
+		return resp;
+	}
+
+	@Override
+	public AddCartProductResp addCartProduct(AddCartProductReq req) {
+		ShoppingCartSaveInput input = new ShoppingCartSaveInput();
+		AddCartProduct reqProduct = req.getCartProduct();
+		input.setPid(reqProduct.getPid().toString());
+		input.setPrice(reqProduct.getPrice());
+		input.setShopBuyerId(req.getUserId());
+		input.setSku(reqProduct.getSku());
+		BaseOutput<ShoppingCartOutput> response = this.cartService.addCart(input);
+		if (response == null) {
+			throw new ServiceException(ResultCode.NETWORK_FAILED, "获取购物车失败");
+		}
+		if (response.getCode() != com.b2c.myapp.common.utils.ResultCode.OK) {
+			throw new ServiceException(ResultCode.BUSINESS_FAILED, response.getResult());
+		}
+		AddCartProductResp resp = new AddCartProductResp();
+		return resp;
+	}
+
+	@Override
+	public DelCartsResp delCartByIds(DelCartsReq req) {
+		String[] skus = req.getSkus().toArray(new String[req.getSkus().size()]);
+		BaseOutput<Boolean> response = this.cartService.delCarts(req.getUserId(), skus);
+		if (response == null) {
+			throw new ServiceException(ResultCode.NETWORK_FAILED, "获取购物车失败");
+		}
+		if (response.getCode() != com.b2c.myapp.common.utils.ResultCode.OK) {
+			throw new ServiceException(ResultCode.BUSINESS_FAILED, response.getResult());
+		}
+		if (!response.getData()) {
+			throw new ServiceException(ResultCode.BUSINESS_FAILED, response.getResult());
+		}
+		DelCartsResp resp = new DelCartsResp();
+		return resp;
+	}
+
+	@Override
+	public ModifyAmountResp modifyAmount(ModifyAmountReq req) {
+		ShoppingCartUpdateInput input = new ShoppingCartUpdateInput();
+		input.setQuantity(req.getAmount().longValue());
+		input.setShopBuyerId(req.getUserId());
+		input.setSku(req.getSku());
+		BaseOutput<Boolean> response = this.cartService.modifyCart(input);
+		if (response == null) {
+			throw new ServiceException(ResultCode.NETWORK_FAILED, "获取购物车失败");
+		}
+		if (response.getCode() != com.b2c.myapp.common.utils.ResultCode.OK) {
+			throw new ServiceException(ResultCode.BUSINESS_FAILED, response.getResult());
+		}
+		if (!response.getData()) {
+			throw new ServiceException(ResultCode.BUSINESS_FAILED, response.getResult());
+		}
+		ModifyAmountResp resp = new ModifyAmountResp();
+		return resp;
+	}
+
+	@Override
+	public ConfirmCartResp confirmCartInfo(ConfirmCartReq req) {
+		GetCartByUserReq cartReq = new GetCartByUserReq();
+		ShoppingCartListInput input = new ShoppingCartListInput();
+		input.setShopBuyerId(req.getShopBuyerId());
+		input.setSkus(req.getSkus().toArray(new String[req.getSkus().size()]));
+		BaseOutput<List<ShoppingCartOutput>> response = this.cartService.getCarts(input);
+		if (response == null) {
+			throw new ServiceException(ResultCode.NETWORK_FAILED, "获取购物车失败");
+		}
+		if (response.getCode() != com.b2c.myapp.common.utils.ResultCode.OK) {
+			throw new ServiceException(ResultCode.BUSINESS_FAILED, response.getResult());
+		}
+		ConfirmCartResp resp = new ConfirmCartResp();
+		List<CartProductSku> skus = new ArrayList<>(response.getData().size());
+		for (ShoppingCartOutput output : response.getData()) {
+			CartProductSku sku = new CartProductSku();
+			sku.setPrice(output.getCurrentPrice());
+			sku.setOldPrice(output.getPrice());
+			sku.setProductId(Long.valueOf(output.getPid()));
+			sku.setProductName(output.getProductName());
+			sku.setSku(output.getSku());
+			sku.setBuyNum(output.getQuantity().intValue());
+			sku.setUnit(output.getSaleUnit());
+			skus.add(sku);
+		}
+		resp.setSkus(skus);
+		return resp;
+	}
+
+}
 package com.diligrp.mobsite.getway.service.buyer.settle.impl;
  
-import com.diligrp.mobsite.getway.domain.protocol.cart.*;
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.b2c.myapp.sdk.service.ShoppingCartService;
+import com.diligrp.mobsite.getway.domain.protocol.cart.AddCartImmediatelyReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.AddCartImmediatelyResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.AddCartProductReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.AddCartProductResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ConfirmCartReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ConfirmCartResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.DelCartsReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.DelCartsResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetCartByUserReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetCartByUserResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetCartNumResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetProductSaleInfoReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetProductSaleInfoResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetSpotSaleInfoReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.GetSpotSaleInfoResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.MargeCartReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.MargeCartResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountResp;
+import com.diligrp.mobsite.getway.domain.protocol.cart.MoveToFavoriteReq;
+import com.diligrp.mobsite.getway.domain.protocol.cart.MoveToFavoriteResp;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetServiceByPickupReq;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetServiceByPickupResp;
+import com.diligrp.mobsite.getway.rpc.ShoppingCartRPC;
 import com.diligrp.mobsite.getway.service.buyer.settle.CartService;
-import org.springframework.stereotype.Service;
  
 /**
  * <B>Description</B> 进货单业务层 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
  *
@@ -18,69 +44,74 @@ import org.springframework.stereotype.Service;
 @Service
 public class CartServiceImpl implements CartService {
  
-
-    @Override
-    public GetCartByUserResp getCart(GetCartByUserReq req) {
-        return null;
-    }
-
-    @Override
-    public AddCartProductResp addCartProduct(AddCartProductReq req) {
-        return null;
-    }
-
-    @Override
-    public GetProductSaleInfoResp getProductSaleInfo(GetProductSaleInfoReq req) {
-        return null;
-    }
-
-    @Override
-    public MargeCartResp margeCart(MargeCartReq req) {
-        return null;
-    }
-
-    @Override
-    public ModifyAmountResp modifyAmount(ModifyAmountReq req) {
-        return null;
-    }
-
-    @Override
-    public GetServiceByPickupResp getServiceByPickup(Long pickupId) {
-        return null;
-    }
-
-    @Override
-    public GetServiceByPickupResp getOrderServiceByPickup(GetServiceByPickupReq req) {
-        return null;
-    }
-
-    @Override
-    public ConfirmCartResp confirmCartInfo(ConfirmCartReq req) {
-        return null;
-    }
-
-    @Override
-    public DelCartsResp delCartByIds(DelCartsReq req) {
-        return null;
-    }
-
-    @Override
-    public GetCartNumResp getCartNum(Long userId) {
-        return null;
-    }
-
-    @Override
-    public AddCartImmediatelyResp addCartImmediately(AddCartImmediatelyReq req) {
-        return null;
-    }
-
-    @Override
-    public GetSpotSaleInfoResp getSpotSaleInfo(GetSpotSaleInfoReq req) {
-        return null;
-    }
-
-    @Override
-    public MoveToFavoriteResp moveToFavorite(MoveToFavoriteReq req) {
-        return null;
-    }
+	// private MyAppClient mac;
+	// @Resource
+	// private ShoppingCartService cartService;
+	@Resource
+	private ShoppingCartRPC cartRPC;
+
+	@Override
+	public GetCartByUserResp getCart(GetCartByUserReq req) {
+		return this.cartRPC.getCart(req);
+	}
+
+	@Override
+	public AddCartProductResp addCartProduct(AddCartProductReq req) {
+		return this.cartRPC.addCartProduct(req);
+	}
+
+	@Override
+	public GetProductSaleInfoResp getProductSaleInfo(GetProductSaleInfoReq req) {
+		return null;
+	}
+
+	@Override
+	public MargeCartResp margeCart(MargeCartReq req) {
+		return null;
+	}
+
+	@Override
+	public ModifyAmountResp modifyAmount(ModifyAmountReq req) {
+		return  this.cartRPC.modifyAmount(req);
+	}
+
+	@Override
+	public GetServiceByPickupResp getServiceByPickup(Long pickupId) {
+		return null;
+	}
+
+	@Override
+	public GetServiceByPickupResp getOrderServiceByPickup(GetServiceByPickupReq req) {
+		return null;
+	}
+
+	@Override
+	public ConfirmCartResp confirmCartInfo(ConfirmCartReq req) {
+		return this.cartRPC.confirmCartInfo(req);
+	}
+
+	@Override
+	public DelCartsResp delCartByIds(DelCartsReq req) {
+		return this.cartRPC.delCartByIds(req);
+	}
+
+	@Override
+	public GetCartNumResp getCartNum(Long userId) {
+		return null;
+	}
+
+	@Override
+	public AddCartImmediatelyResp addCartImmediately(AddCartImmediatelyReq req) {
+		return null;
+	}
+
+	@Override
+	public GetSpotSaleInfoResp getSpotSaleInfo(GetSpotSaleInfoReq req) {
+		return null;
+	}
+
+	@Override
+	public MoveToFavoriteResp moveToFavorite(MoveToFavoriteReq req) {
+		return null;
+	}
 }
@@ -5,100 +5,109 @@ import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.user.*;
  
-
 /**
  * <B>Description</B> userservice <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
+ * 
  * @createTime 2014年8月26日 下午5:34:42
  * @author zhangshirui
  */
 public interface UserService {
  
-    /**
-     * 用户登录
-     * @param req
-     * @return
-     * @createTime 2014年8月26日 下午5:37:05
-     * @author zhangshirui
-     */
-    LoginResp buyerlogin(LoginReq req);
-    
-
-    /**
-     * 验证手机收到的验证码
-     * @param req
-     * @return
-     * @createTime 2014年8月27日 下午4:25:11
-     * @author zhangshirui
-     */
-    CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req);
-
-    /**
-     * 发送手机验证码
-     * @createTime 2014年8月27日 下午4:50:38
-     * @author zhangshirui
-     */
-    SendVeriCodeResp sendVeriCode(SendVeriCodeReq req);
-
-    /**
-     * 修改用户信息
-     * @param req
-     * @return
-     * @createTime 2014年8月28日 下午3:15:53
-     * @author zhangshirui
-     */
-    UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req);
-
-
-    /**
-     *用户注册 
-     * @param req
-     * @return
-     * @createTime 2014年8月28日 下午4:37:08
-     * @author zhangshirui
-     */
-    UserRegisterResp userRegister(UserRegisterReq req);
-
-    GetUserInfoResp getUserIntroduction(GetUserInfoReq req);
+	/**
+	 * 用户登录
+	 * 
+	 * @param req
+	 * @return
+	 * @createTime 2014年8月26日 下午5:37:05
+	 * @author zhangshirui
+	 */
+	LoginResp buyerlogin(LoginReq req);
  
+	/**
+	 * 验证手机收到的验证码
+	 * 
+	 * @param req
+	 * @return
+	 * @createTime 2014年8月27日 下午4:25:11
+	 * @author zhangshirui
+	 */
+	CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req);
+
+	/**
+	 * 发送手机验证码
+	 * 
+	 * @createTime 2014年8月27日 下午4:50:38
+	 * @author zhangshirui
+	 */
+	SendVeriCodeResp sendVeriCode(SendVeriCodeReq req);
+
+	/**
+	 * 修改用户信息
+	 * 
+	 * @param req
+	 * @return
+	 * @createTime 2014年8月28日 下午3:15:53
+	 * @author zhangshirui
+	 */
+	UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req);
+
+	/**
+	 * 用户注册
+	 * 
+	 * @param req
+	 * @return
+	 * @createTime 2014年8月28日 下午4:37:08
+	 * @author zhangshirui
+	 */
+	UserRegisterResp userRegister(UserRegisterReq req);
+
+	GetUserInfoResp getUserIntroduction(GetUserInfoReq req);
  
 	LogoutResp logout(LogoutReq req);
  
 	/**
 	 * 修改密码
+	 * 
 	 * @param req
 	 * @return
 	 * @createTime 2015年1月24日 下午4:29:26
 	 * @author zhangshirui
 	 */
-    ModifyPwdResp modifyPwd(ModifyPwdReq req);
-
+	ModifyPwdResp modifyPwd(ModifyPwdReq req);
  
 	/**
-     * 查询用户极光号
-     * @param req
-     * @return
-     * @createTime 2015-11-10 19:43:18
-     */
+	 * 查询用户极光号
+	 * 
+	 * @param req
+	 * @return
+	 * @createTime 2015-11-10 19:43:18
+	 */
 	GetRegisterNoResp getRegisterNo(GetRegisterNoReq req);
-	
+
 	/**
-     * 批量查询用户极光号
-     * @param req
-     * @return
-     * @createTime 2015-11-10 19:43:18
-     */
+	 * 批量查询用户极光号
+	 * 
+	 * @param req
+	 * @return
+	 * @createTime 2015-11-10 19:43:18
+	 */
 	GetRegisterNobyUidsResp getRegisterNobyUids(GetRegisterNobyUidsReq req);
  
-
-
 	GetDepositCardAmountResp getDepositCardAmount(GetDepositCardAmountReq req);
  
-
-
 	SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req);
  
 	LoginResp authlogin(AuthLoginReq req);
+
+	/**
+	 * 获取买家收货地址信息
+	 * 
+	 * @param req
+	 * @return
+	 */
+	GetDeliveryAddressResp getDeliveryAddresses(GetDeliveryAddressReq req);
 }
 package com.diligrp.mobsite.getway.service.buyer.user.impl;
  
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
+import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerOutput;
 import com.diligrp.mobsite.getway.domain.RegisterNoMapper;
 import com.diligrp.mobsite.getway.domain.common.Constant;
@@ -8,33 +22,48 @@ import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
-import com.diligrp.mobsite.getway.domain.protocol.login.*;
+import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
+import com.diligrp.mobsite.getway.domain.protocol.login.AuthLoginReq;
+import com.diligrp.mobsite.getway.domain.protocol.login.CheckVeriCodeReq;
+import com.diligrp.mobsite.getway.domain.protocol.login.CheckVeriCodeResp;
+import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
+import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
+import com.diligrp.mobsite.getway.domain.protocol.login.LogoutReq;
+import com.diligrp.mobsite.getway.domain.protocol.login.LogoutResp;
+import com.diligrp.mobsite.getway.domain.protocol.login.SendVeriCodeReq;
+import com.diligrp.mobsite.getway.domain.protocol.login.SendVeriCodeResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.*;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetDeliveryAddressReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetDeliveryAddressResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetDepositCardAmountReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetDepositCardAmountResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetRegisterNoReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetRegisterNoResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetRegisterNobyUidsReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetRegisterNobyUidsResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetUserInfoReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetUserInfoResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.SearchUserInfoReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.SearchUserInfoResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.UpdateUserInfoReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.UpdateUserInfoResp;
 import com.diligrp.mobsite.getway.domain.protocol.user.model.RegisterNoPlatform;
 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
 import com.diligrp.mobsite.getway.rpc.PassportRPC;
+import com.diligrp.mobsite.getway.rpc.PickInfoRPC;
 import com.diligrp.mobsite.getway.rpc.UserRPC;
 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.service.buyer.user.UserService;
 import com.diligrp.website.util.redis.impl.RedisUtilImpl;
 import com.diligrp.website.util.security.Validator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
  
 /**
  * <B>Description</B> 用户 服务层 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
  *
@@ -44,379 +73,385 @@ import java.util.Map;
 @Service("userService")
 public class UserServiceImpl implements UserService {
  
-    @Resource
-    private UserRPC userRPC;
-    @Autowired
-    private RedisUtilImpl redisUtil;
-
-    @Resource
-    private RegisterNoMapperManager registerNoMapperManager;
-    @Resource
-    private PassportRPC passportRPC;
-
-
-    /**
-     * 登录超时时间：秒
-     */
-    @Value("${login.timeout.second}")
-    private int loginExpireTime;
-
-
-    private static Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
-
-    @Override
-    public LoginResp buyerlogin(LoginReq req) {
-        BuyerInfoOutput userInfo =  passportRPC.buyerLogin(req);
-
-        //缓存用户登录信息
-        cacheUserInfo(userInfo.getId(),req.getDeviceId());
-
-        if (Validator.isEmpty(req.getRegisterNo())){
-            logger.error("卖家登录激光推送id为空[userId=]",userInfo.getId());
-        }else{
-            //绑定用户激光推送id
-            bindUserRegisterNo(userInfo.getId(),req.getRegisterNo(),req.getDeviceType());
-        }
-        Long currentShopId = userInfo.getCurrentShopId();
-        LoginResp resp = new LoginResp();
-        if (Validator.isNull(currentShopId)){
-            logger.info("用户未绑定店铺[buyerId=]",userInfo.getId());
-            resp.setMsg(ErrorMessage.BUYER_NOT_OPEN_SHOP);
-        }
-        resp.setBuyerId(userInfo.getId());
-        resp.setHeadImg(userInfo.getFace());
-        resp.setMobile(userInfo.getMobilePhone());
-        resp.setAccountName(userInfo.getAccountName());
-        resp.setCurrentShopId(userInfo.getCurrentShopId());
-        return resp;
-    }
-
-    private void bindUserRegisterNo(Long id,String registerNo,Integer deviceType) {
-        // 缓存
-        String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_BUYER+
-                String.valueOf(id));
-
-        GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
-                GetRegisterNoResp.class);
-        // 绑定极光ID
-        RegisterNoMapper mapper = new RegisterNoMapper();
-        mapper.setRegisterNo(registerNo);
-        mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
-        mapper.setUserid(id);
-        mapper.setUserType(Constant.USER_ROLE_BUYER);
-        mapper.setDeviceType(deviceType);
-        try {
-            //清除当前极光号userid缓存
-            cleanOldredis(mapper);
-            //构建缓存信息
-            buildRedisInfo(mappers, mapper);
-            redisUtil.setObjectByExpire(redisKey, mappers,
-                    RedisKey.REGISTERNO_EXPIRE_TIME);
-        } catch (Exception e) {
-            throw new ServiceException(ResultCode.PUSH_MESSAGE_NO,
-                    "绑定极光推送系统注册号失败");
-        }
-    }
-
-    private void cacheUserInfo(Long id, String deviceId) {
-
-        //缓存userId
-        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(id));
-        redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(id), loginExpireTime);
-
-        //缓存设备id,userId作为key
-        if (!Validator.isNull(deviceId)) {
-            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_BUYER+String.valueOf(id));
-            redisUtil.setStringByExpire(onlyOneLoginRedisKey, deviceId, loginExpireTime);
-        }
-
-        //缓存currentShopId
-        //if (!Validator.isNull(resp.getCurrentShopId())){
-        //    String currentShopIdKey = redisUtil.makeKey(RedisKey.USER_BUYER_CURRENTSHOPID, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
-        //    redisUtil.setStringByExpire(currentShopIdKey, String.valueOf(resp.getCurrentShopId()), loginExpireTime);
-        //}
-
-
-        //缓存shopBuyerId
-        //if (!Validator.isNull(resp.getShopBuyerId())){
-        //    String shopUserIdKey = redisUtil.makeKey(RedisKey.USER_BUYER_SHOPUSERID, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
-        //    redisUtil.setStringByExpire(shopUserIdKey, String.valueOf(resp.getShopBuyerId()), loginExpireTime);
-        //}
-    }
-
-
-    /**
-     * 清除当前极光号下userid缓存
-     * @param mapper
-     */
-    private void cleanOldredis(RegisterNoMapper mapper) {
-        RegisterNoMapper oldmapper = registerNoMapperManager
-                .bindRegisterNo(mapper);
-        if (!Validator.isNull(oldmapper)){
-            String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_BUYER+
-                    String.valueOf(oldmapper.getUserid()));
-            redisUtil.deleteByKey(oldKey);
-        }
-    }
-
-    /**
-     * 建立缓存信息
-     * @param mappers
-     * @param mapper
-     */
-    private void buildRedisInfo(GetRegisterNoResp mappers,
-                                RegisterNoMapper mapper) {
-        // 如果缓存没有重新建
-        List<RegisterNoMapper> renolist = new ArrayList<RegisterNoMapper>();
-
-        if (Validator.isNull(mappers)) {
-            mappers = new GetRegisterNoResp();
-        }
-        renolist.add(mapper);
-        mappers.setRegisterNos(renolist);
-    }
-
-
-
-
-    @Override
-    public CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req) {
-        passportRPC.verifyBuyerSmsCode(req.getMobile(),req.getVeriCode());
-
-        return new CheckVeriCodeResp();
-    }
-
-    @Override
-    public SendVeriCodeResp sendVeriCode(SendVeriCodeReq req) {
-        String mobile = req.getMobile();
-        BuyerInfoOutput userinfo = userRPC.checkMobile(mobile);
-        Integer msgType = req.getMsgType();
-        if (msgType== SendVeriCodeReq.MSG_TYPE_LOGIN||msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
-            if (Validator.isNull(userinfo)){
-                if (Validator.isNull(userinfo)){
-                    throw new ServiceException(ErrorMessage.USER_MOBILE_NOT_EXIST);
-                }
-            }
-        }
-        if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
-            if (!Validator.isNull(userinfo)){
-                throw new ServiceException(ErrorMessage.USER_MOBILE_EXIST);
-            }
-        }
-        BaseOutput<String> out = passportRPC.sendVeriCodeOfBuyer(mobile, req.getMsgType());
-        SendVeriCodeResp resp = new SendVeriCodeResp();
-        resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
-        resp.setPassKey(out.getData());
-        return resp;
-    }
-
-    @Override
-    public UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req) {
-        return null;
-    }
-
-
-
-    @Override
-    public UserRegisterResp userRegister(UserRegisterReq req) {
-        //手机号码和账号验证、验证码
-        //if (!checkRegisterInfo(resp, req)) {
-        //   return resp;
-        //}
-        passportRPC.buyerRegister(req);
-        UserRegisterResp resp = new UserRegisterResp();
-        resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
-        return resp;
-    }
-
-
-
-
-
-
-    @Override
-    public GetUserInfoResp getUserIntroduction(GetUserInfoReq req) {
-        return null;
-    }
-
-
-
-    @Override
-    public LogoutResp logout(LogoutReq req) {
-        LogoutResp resp = new LogoutResp();
-
-
-        //解除登录缓存信息
-        //userId
-        String cookieUserIdKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(req.getUserId()));
-        //设备id
-        String cookieDeviceIdKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_BUYER+String.valueOf(req.getUserId()));
-        try {
-            redisUtil.deleteByKey(cookieUserIdKey);
-            redisUtil.deleteByKey(cookieDeviceIdKey);
-        }
-        catch(Exception e) {
-            logger.error("买家退出登录异常:清除登录缓存信息失败",e);
-        }
-        // 解除绑定极光ID
-        if(!Validator.isEmpty(req.getRegisterNo())){
-
-            String userId = req.getUserId().toString();
-            //先清缓存再清数据库
-            String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SIGN_BUYER+userId);
-
-            RegisterNoMapper mapper = new RegisterNoMapper();
-            mapper.setRegisterNo(req.getRegisterNo());
-            mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
-            mapper.setUserid(req.getUserId());
-            mapper.setUserType(Constant.USER_ROLE_BUYER);
-            mapper.setDeviceType(req.getDeviceType());
-            try {
-                redisUtil.deleteByKey(reNOCache);
-                registerNoMapperManager.unBindRegisterNo(mapper);
-            }
-            catch(Exception e) {
-                logger.error("解除极光推送系统绑定的注册号失败",e);
-            }
-        }
-
-        return resp;
-    }
-
-    @Override
-    public ModifyPwdResp modifyPwd(ModifyPwdReq req) {
-        BuyerInfoOutput userInfo = userRPC.getUserByMobile(req.getAccountName());
-        Long userId = userInfo.getId();
-        boolean result = passportRPC.modifyPwdBuyer(req);
-        ModifyPwdResp resp = new ModifyPwdResp();
-        if(!result){
-            //失败
-            resp.setCode(ResultCode.BUSINESS_FAILED);
-            resp.setResultFlag(ModifyPwdResp.RESULT_FLAG_FAILED);
-            return resp;
-        }else {
-            //修改成功，退出所有账号信息
-            String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(userId));
-            redisUtil.deleteByKey(cookieRedisKey);
-        }
-        return resp;
-    }
-
-
-
-    @Override
-    public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
-        GetRegisterNoResp resp = new GetRegisterNoResp();
-        if (Validator.isNull(req.getUserId())||Validator.isNull(req.getUserType())) {
-            resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
-            resp.setMsg("用户ID和用户类型不能为空");
-            return resp;
-        }
-        //先从缓存取
-        String redisKey="";
-        if (req.getUserType()==Constant.USER_ROLE_BUYER){
-            redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(req.getUserId()));
-        }else if (req.getUserType()==Constant.USER_ROLE_SELLER){
-            redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(req.getUserId()));
-        }
-        GetRegisterNoResp recache = redisUtil.getObject(redisKey, GetRegisterNoResp.class);
-        if (!Validator.isNull(recache) && !Validator.isEmpty(recache.getRegisterNos())) {
-            resp.setRegisterNos(recache.getRegisterNos());
-        }else {
-            List<RegisterNoMapper> mapppers = registerNoMapperManager.getRegisterNo(req.getUserType(),req.getUserId());
-            if (!Validator.isEmpty(mapppers)) {
-
-                resp.setRegisterNos(mapppers);
-                redisUtil.setObjectByExpire(redisKey, resp, RedisKey.REGISTERNO_EXPIRE_TIME);
-            }else {
-                resp.setCode(ResultCode.BUSINESS_FAILED);
-                resp.setMsg("该用户没有绑定极光号");
-            }
-        }
-        return resp;
-    }
-
-    @Override
-    public GetRegisterNobyUidsResp getRegisterNobyUids(GetRegisterNobyUidsReq req) {
-        GetRegisterNobyUidsResp resp = new GetRegisterNobyUidsResp();
-        Map<String, Object> param = new HashMap<String, Object>();
-        param.put("userids", req.getUserIds());
-        param.put("userType",req.getUserType());
-        if (!Validator.isNull(req.getPlatform())) {
-            param.put("device_type",req.getPlatform().toString());
-        }
-        List<RegisterNoMapper> mappers = registerNoMapperManager.batchQuery(param);
-
-        List<RegisterNoPlatform> registerNos = new ArrayList<RegisterNoPlatform>();
-        RegisterNoPlatform androidPlatform = new RegisterNoPlatform();
-        androidPlatform.setPlatform("android");
-        List<String> androids = new ArrayList<String>();
-        RegisterNoPlatform iosPlatform = new RegisterNoPlatform();
-        iosPlatform.setPlatform("ios");
-        List<String> iosids = new ArrayList<String>();
-        if (!Validator.isEmpty(mappers)) {
-            for (RegisterNoMapper registerNoMapper : mappers) {
-                if (!Validator.isNull(registerNoMapper.getDeviceType())) {
-                    if (registerNoMapper.getDeviceType().equals(1)) {
-                        androids.add(registerNoMapper.getRegisterNo());
-                    }
-                    if (registerNoMapper.getDeviceType().equals(2)) {
-                        iosids.add(registerNoMapper.getRegisterNo());
-                    }
-                }
-            }
-        }
-        androidPlatform.setIds(androids);
-        iosPlatform.setIds(iosids);
-        registerNos.add(androidPlatform);
-        registerNos.add(iosPlatform);
-        resp.setRegisterNos(registerNos);
-        resp.setCode(ResultCode.SUCCESS);
-        return resp;
-    }
-
-
-
-    @Override
-    public GetDepositCardAmountResp getDepositCardAmount(GetDepositCardAmountReq req) {
-        ShopBuyerOutput shopByuer = userRPC.getDepositCardAmount(req.getShopBuyerId(),req.getUserId());
-        GetDepositCardAmountResp resp = new GetDepositCardAmountResp();
-        resp.setShopId(shopByuer.getShopId());
-        resp.setFreezeTotalPrice(shopByuer.getFreezeTotalPrice());
-        resp.setResidueTotalPrice(shopByuer.getResidueTotalPrice());
-        resp.setStoredTotalPrice(shopByuer.getStoredTotalPrice());
-        return resp;
-    }
-
-
-    @Override
-    public SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req) {
-        return null;
-    }
-
-    @Override
-    public LoginResp authlogin(AuthLoginReq req) {
-        BuyerInfoOutput userInfo =  passportRPC.authlogin(req);
-
-        //缓存用户信息
-        cacheUserInfo(userInfo.getId(),req.getDeviceId());
-        if (Validator.isEmpty(req.getRegisterNo())){
-            logger.error("卖家登录激光推送id为空[userId=]",userInfo.getId());
-        }else{
-            //绑定用户激光推送id
-            bindUserRegisterNo(userInfo.getId(),req.getRegisterNo(),req.getDeviceType());
-        }
-        Long currentShopId = userInfo.getCurrentShopId();
-        LoginResp resp = new LoginResp();
-        if (Validator.isNull(currentShopId)){
-            logger.info("用户未绑定店铺[buyerId=]",userInfo.getId());
-            resp.setMsg(ErrorMessage.BUYER_NOT_OPEN_SHOP);
-        }
-        resp.setBuyerId(userInfo.getId());
-        resp.setHeadImg(userInfo.getFace());
-        resp.setMobile(userInfo.getMobilePhone());
-        resp.setAccountName(userInfo.getAccountName());
-        resp.setCurrentShopId(userInfo.getCurrentShopId());
-        return resp;
-    }
+	@Resource
+	private UserRPC userRPC;
+	@Autowired
+	private RedisUtilImpl redisUtil;
+
+	@Resource
+	private RegisterNoMapperManager registerNoMapperManager;
+	@Resource
+	private PassportRPC passportRPC;
+	@Resource
+	private PickInfoRPC pickInfoRPC;
+
+	/**
+	 * 登录超时时间：秒
+	 */
+	@Value("${login.timeout.second}")
+	private int loginExpireTime;
+
+	private static Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+
+	@Override
+	public LoginResp buyerlogin(LoginReq req) {
+		BuyerInfoOutput userInfo = passportRPC.buyerLogin(req);
+
+		// 缓存用户登录信息
+		cacheUserInfo(userInfo.getId(), req.getDeviceId());
+
+		if (Validator.isEmpty(req.getRegisterNo())) {
+			logger.error("卖家登录激光推送id为空[userId=]", userInfo.getId());
+		} else {
+			// 绑定用户激光推送id
+			bindUserRegisterNo(userInfo.getId(), req.getRegisterNo(), req.getDeviceType());
+		}
+		Long currentShopId = userInfo.getCurrentShopId();
+		LoginResp resp = new LoginResp();
+		if (Validator.isNull(currentShopId)) {
+			logger.info("用户未绑定店铺[buyerId=]", userInfo.getId());
+			resp.setMsg(ErrorMessage.BUYER_NOT_OPEN_SHOP);
+		}
+		resp.setBuyerId(userInfo.getId());
+		resp.setHeadImg(userInfo.getFace());
+		resp.setMobile(userInfo.getMobilePhone());
+		resp.setAccountName(userInfo.getAccountName());
+		resp.setCurrentShopId(userInfo.getCurrentShopId());
+		return resp;
+	}
+
+	private void bindUserRegisterNo(Long id, String registerNo, Integer deviceType) {
+		// 缓存
+		String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+				Constant.USER_ROLE_SIGN_BUYER + String.valueOf(id));
+
+		GetRegisterNoResp mappers = redisUtil.getObject(redisKey, GetRegisterNoResp.class);
+		// 绑定极光ID
+		RegisterNoMapper mapper = new RegisterNoMapper();
+		mapper.setRegisterNo(registerNo);
+		mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+		mapper.setUserid(id);
+		mapper.setUserType(Constant.USER_ROLE_BUYER);
+		mapper.setDeviceType(deviceType);
+		try {
+			// 清除当前极光号userid缓存
+			cleanOldredis(mapper);
+			// 构建缓存信息
+			buildRedisInfo(mappers, mapper);
+			redisUtil.setObjectByExpire(redisKey, mappers, RedisKey.REGISTERNO_EXPIRE_TIME);
+		} catch (Exception e) {
+			throw new ServiceException(ResultCode.PUSH_MESSAGE_NO, "绑定极光推送系统注册号失败");
+		}
+	}
+
+	private void cacheUserInfo(Long id, String deviceId) {
+
+		// 缓存userId
+		String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO,
+				Constant.USER_ROLE_SIGN_BUYER + String.valueOf(id));
+		redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(id), loginExpireTime);
+
+		// 缓存设备id,userId作为key
+		if (!Validator.isNull(deviceId)) {
+			String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,
+					Constant.USER_ROLE_SIGN_BUYER + String.valueOf(id));
+			redisUtil.setStringByExpire(onlyOneLoginRedisKey, deviceId, loginExpireTime);
+		}
+
+		// 缓存currentShopId
+		// if (!Validator.isNull(resp.getCurrentShopId())){
+		// String currentShopIdKey =
+		// redisUtil.makeKey(RedisKey.USER_BUYER_CURRENTSHOPID,
+		// Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
+		// redisUtil.setStringByExpire(currentShopIdKey,
+		// String.valueOf(resp.getCurrentShopId()), loginExpireTime);
+		// }
+
+		// 缓存shopBuyerId
+		// if (!Validator.isNull(resp.getShopBuyerId())){
+		// String shopUserIdKey =
+		// redisUtil.makeKey(RedisKey.USER_BUYER_SHOPUSERID,
+		// Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
+		// redisUtil.setStringByExpire(shopUserIdKey,
+		// String.valueOf(resp.getShopBuyerId()), loginExpireTime);
+		// }
+	}
+
+	/**
+	 * 清除当前极光号下userid缓存
+	 * 
+	 * @param mapper
+	 */
+	private void cleanOldredis(RegisterNoMapper mapper) {
+		RegisterNoMapper oldmapper = registerNoMapperManager.bindRegisterNo(mapper);
+		if (!Validator.isNull(oldmapper)) {
+			String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+					Constant.USER_ROLE_SIGN_BUYER + String.valueOf(oldmapper.getUserid()));
+			redisUtil.deleteByKey(oldKey);
+		}
+	}
+
+	/**
+	 * 建立缓存信息
+	 * 
+	 * @param mappers
+	 * @param mapper
+	 */
+	private void buildRedisInfo(GetRegisterNoResp mappers, RegisterNoMapper mapper) {
+		// 如果缓存没有重新建
+		List<RegisterNoMapper> renolist = new ArrayList<RegisterNoMapper>();
+
+		if (Validator.isNull(mappers)) {
+			mappers = new GetRegisterNoResp();
+		}
+		renolist.add(mapper);
+		mappers.setRegisterNos(renolist);
+	}
+
+	@Override
+	public CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req) {
+		passportRPC.verifyBuyerSmsCode(req.getMobile(), req.getVeriCode());
+
+		return new CheckVeriCodeResp();
+	}
+
+	@Override
+	public SendVeriCodeResp sendVeriCode(SendVeriCodeReq req) {
+		String mobile = req.getMobile();
+		BuyerInfoOutput userinfo = userRPC.checkMobile(mobile);
+		Integer msgType = req.getMsgType();
+		if (msgType == SendVeriCodeReq.MSG_TYPE_LOGIN || msgType == SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD) {
+			if (Validator.isNull(userinfo)) {
+				if (Validator.isNull(userinfo)) {
+					throw new ServiceException(ErrorMessage.USER_MOBILE_NOT_EXIST);
+				}
+			}
+		}
+		if (msgType == SendVeriCodeReq.MSG_TYPE_REGISTER) {
+			if (!Validator.isNull(userinfo)) {
+				throw new ServiceException(ErrorMessage.USER_MOBILE_EXIST);
+			}
+		}
+		BaseOutput<String> out = passportRPC.sendVeriCodeOfBuyer(mobile, req.getMsgType());
+		SendVeriCodeResp resp = new SendVeriCodeResp();
+		resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
+		resp.setPassKey(out.getData());
+		return resp;
+	}
+
+	@Override
+	public UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req) {
+		return null;
+	}
+
+	@Override
+	public UserRegisterResp userRegister(UserRegisterReq req) {
+		// 手机号码和账号验证、验证码
+		// if (!checkRegisterInfo(resp, req)) {
+		// return resp;
+		// }
+		passportRPC.buyerRegister(req);
+		UserRegisterResp resp = new UserRegisterResp();
+		resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
+		return resp;
+	}
+
+	@Override
+	public GetUserInfoResp getUserIntroduction(GetUserInfoReq req) {
+		return null;
+	}
+
+	@Override
+	public LogoutResp logout(LogoutReq req) {
+		LogoutResp resp = new LogoutResp();
+
+		// 解除登录缓存信息
+		// userId
+		String cookieUserIdKey = redisUtil.makeKey(RedisKey.USER_LOGININFO,
+				Constant.USER_ROLE_SIGN_BUYER + String.valueOf(req.getUserId()));
+		// 设备id
+		String cookieDeviceIdKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,
+				Constant.USER_ROLE_SIGN_BUYER + String.valueOf(req.getUserId()));
+		try {
+			redisUtil.deleteByKey(cookieUserIdKey);
+			redisUtil.deleteByKey(cookieDeviceIdKey);
+		} catch (Exception e) {
+			logger.error("买家退出登录异常:清除登录缓存信息失败", e);
+		}
+		// 解除绑定极光ID
+		if (!Validator.isEmpty(req.getRegisterNo())) {
+
+			String userId = req.getUserId().toString();
+			// 先清缓存再清数据库
+			String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SIGN_BUYER + userId);
+
+			RegisterNoMapper mapper = new RegisterNoMapper();
+			mapper.setRegisterNo(req.getRegisterNo());
+			mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+			mapper.setUserid(req.getUserId());
+			mapper.setUserType(Constant.USER_ROLE_BUYER);
+			mapper.setDeviceType(req.getDeviceType());
+			try {
+				redisUtil.deleteByKey(reNOCache);
+				registerNoMapperManager.unBindRegisterNo(mapper);
+			} catch (Exception e) {
+				logger.error("解除极光推送系统绑定的注册号失败", e);
+			}
+		}
+
+		return resp;
+	}
+
+	@Override
+	public ModifyPwdResp modifyPwd(ModifyPwdReq req) {
+		BuyerInfoOutput userInfo = userRPC.getUserByMobile(req.getAccountName());
+		Long userId = userInfo.getId();
+		boolean result = passportRPC.modifyPwdBuyer(req);
+		ModifyPwdResp resp = new ModifyPwdResp();
+		if (!result) {
+			// 失败
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+			resp.setResultFlag(ModifyPwdResp.RESULT_FLAG_FAILED);
+			return resp;
+		} else {
+			// 修改成功，退出所有账号信息
+			String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO,
+					Constant.USER_ROLE_SIGN_BUYER + String.valueOf(userId));
+			redisUtil.deleteByKey(cookieRedisKey);
+		}
+		return resp;
+	}
+
+	@Override
+	public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
+		GetRegisterNoResp resp = new GetRegisterNoResp();
+		if (Validator.isNull(req.getUserId()) || Validator.isNull(req.getUserType())) {
+			resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
+			resp.setMsg("用户ID和用户类型不能为空");
+			return resp;
+		}
+		// 先从缓存取
+		String redisKey = "";
+		if (req.getUserType() == Constant.USER_ROLE_BUYER) {
+			redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+					Constant.USER_ROLE_SIGN_BUYER + String.valueOf(req.getUserId()));
+		} else if (req.getUserType() == Constant.USER_ROLE_SELLER) {
+			redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+					Constant.USER_ROLE_SIGN_SELLER + String.valueOf(req.getUserId()));
+		}
+		GetRegisterNoResp recache = redisUtil.getObject(redisKey, GetRegisterNoResp.class);
+		if (!Validator.isNull(recache) && !Validator.isEmpty(recache.getRegisterNos())) {
+			resp.setRegisterNos(recache.getRegisterNos());
+		} else {
+			List<RegisterNoMapper> mapppers = registerNoMapperManager.getRegisterNo(req.getUserType(), req.getUserId());
+			if (!Validator.isEmpty(mapppers)) {
+
+				resp.setRegisterNos(mapppers);
+				redisUtil.setObjectByExpire(redisKey, resp, RedisKey.REGISTERNO_EXPIRE_TIME);
+			} else {
+				resp.setCode(ResultCode.BUSINESS_FAILED);
+				resp.setMsg("该用户没有绑定极光号");
+			}
+		}
+		return resp;
+	}
+
+	@Override
+	public GetRegisterNobyUidsResp getRegisterNobyUids(GetRegisterNobyUidsReq req) {
+		GetRegisterNobyUidsResp resp = new GetRegisterNobyUidsResp();
+		Map<String, Object> param = new HashMap<String, Object>();
+		param.put("userids", req.getUserIds());
+		param.put("userType", req.getUserType());
+		if (!Validator.isNull(req.getPlatform())) {
+			param.put("device_type", req.getPlatform().toString());
+		}
+		List<RegisterNoMapper> mappers = registerNoMapperManager.batchQuery(param);
+
+		List<RegisterNoPlatform> registerNos = new ArrayList<RegisterNoPlatform>();
+		RegisterNoPlatform androidPlatform = new RegisterNoPlatform();
+		androidPlatform.setPlatform("android");
+		List<String> androids = new ArrayList<String>();
+		RegisterNoPlatform iosPlatform = new RegisterNoPlatform();
+		iosPlatform.setPlatform("ios");
+		List<String> iosids = new ArrayList<String>();
+		if (!Validator.isEmpty(mappers)) {
+			for (RegisterNoMapper registerNoMapper : mappers) {
+				if (!Validator.isNull(registerNoMapper.getDeviceType())) {
+					if (registerNoMapper.getDeviceType().equals(1)) {
+						androids.add(registerNoMapper.getRegisterNo());
+					}
+					if (registerNoMapper.getDeviceType().equals(2)) {
+						iosids.add(registerNoMapper.getRegisterNo());
+					}
+				}
+			}
+		}
+		androidPlatform.setIds(androids);
+		iosPlatform.setIds(iosids);
+		registerNos.add(androidPlatform);
+		registerNos.add(iosPlatform);
+		resp.setRegisterNos(registerNos);
+		resp.setCode(ResultCode.SUCCESS);
+		return resp;
+	}
+
+	@Override
+	public GetDepositCardAmountResp getDepositCardAmount(GetDepositCardAmountReq req) {
+		ShopBuyerOutput shopByuer = userRPC.getDepositCardAmount(req.getShopBuyerId(), req.getUserId());
+		GetDepositCardAmountResp resp = new GetDepositCardAmountResp();
+		resp.setShopId(shopByuer.getShopId());
+		resp.setFreezeTotalPrice(shopByuer.getFreezeTotalPrice());
+		resp.setResidueTotalPrice(shopByuer.getResidueTotalPrice());
+		resp.setStoredTotalPrice(shopByuer.getStoredTotalPrice());
+		return resp;
+	}
+
+	@Override
+	public SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req) {
+		return null;
+	}
+
+	@Override
+	public LoginResp authlogin(AuthLoginReq req) {
+		BuyerInfoOutput userInfo = passportRPC.authlogin(req);
+
+		// 缓存用户信息
+		cacheUserInfo(userInfo.getId(), req.getDeviceId());
+		if (Validator.isEmpty(req.getRegisterNo())) {
+			logger.error("卖家登录激光推送id为空[userId=]", userInfo.getId());
+		} else {
+			// 绑定用户激光推送id
+			bindUserRegisterNo(userInfo.getId(), req.getRegisterNo(), req.getDeviceType());
+		}
+		Long currentShopId = userInfo.getCurrentShopId();
+		LoginResp resp = new LoginResp();
+		if (Validator.isNull(currentShopId)) {
+			logger.info("用户未绑定店铺[buyerId=]", userInfo.getId());
+			resp.setMsg(ErrorMessage.BUYER_NOT_OPEN_SHOP);
+		}
+		resp.setBuyerId(userInfo.getId());
+		resp.setHeadImg(userInfo.getFace());
+		resp.setMobile(userInfo.getMobilePhone());
+		resp.setAccountName(userInfo.getAccountName());
+		resp.setCurrentShopId(userInfo.getCurrentShopId());
+		return resp;
+	}
+
+	@Override
+	public GetDeliveryAddressResp getDeliveryAddresses(GetDeliveryAddressReq req) {
+		PickingInfoOutput response = this.pickInfoRPC.getDefaultPickingInfoByBuyerId(req.getShopBuyerId());
+		if (response == null) {
+			throw new ServiceException(ResultCode.NETWORK_FAILED, "获取默认收货地址失败");
+		}
+		GetDeliveryAddressResp resp = new GetDeliveryAddressResp();
+		PickInfo pickInfo = new PickInfo();
+		pickInfo.setCityAddress(response.getAddressText());
+		pickInfo.setCityId(response.getAddressId());
+		pickInfo.setIsDefault(response.getDef());
+		pickInfo.setMobile(response.getTelphone());
+		pickInfo.setName(response.getName());
+		pickInfo.setStreetAddress(response.getAddressDetail());
+		resp.setPickInfo(pickInfo);
+		return resp;
+	}
 }
@@ -21,7 +21,6 @@ import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderReq;
 import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderResp;
 import com.diligrp.mobsite.getway.domain.protocol.order.PaymentReq;
 import com.diligrp.mobsite.getway.domain.protocol.order.PaymentResp;
-import com.diligrp.mobsite.getway.domain.protocol.order.SearchOrderReq;
 import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
 import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
 import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq;
@@ -68,7 +67,7 @@ public class OrderController extends BaseApiController {
 	@RequestMapping(value = "/getOrders", method = RequestMethod.POST)
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "body", name = "temp", dataType = "SearchOrderReq") })
 	@ResponseBody
-	public void getOrders(@RequestBody SearchOrderReq temp) {
+	public void getOrders(@RequestBody SearchOrderListReq temp) {
  
 		SearchOrderListReq req = super.getRequest(SearchOrderListReq.class);
 		try {
@@ -21,12 +21,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
  
-
 /**
  * <B>Description</B> 用户Controller <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
+ * 
  * @createTime 2014年8月24日 下午10:53:27
  * @author weili
  */
@@ -34,492 +35,517 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping("/mobsiteApp/user")
 @Api(value = "/mobsiteApp-user", description = "用户接口-买家")
 public class UserController extends BaseApiController {
-    
-    @Resource
-    private UserService userService;
-
-    private final Logger LOGGER = Logger.getLogger(UserController.class);
-
-    /**
-     * 买家登录
-     * @createTime 2014年8月24日 下午10:55:03
-     * @author weili
-     */
-    @ApiOperation(value = "买家登录", httpMethod = "POST",response = LoginResp.class)
-    @RequestMapping(value = "/buyerLogin",method = RequestMethod.POST)
-    @ResponseBody
-     public void buyerLogin(HttpServletRequest request,@RequestBody LoginReq temp ){
-        LoginReq req = super.getRequest(LoginReq.class);
-        try {
-            BeanValidator.validator(req);
-            LoginResp resp = userService.buyerlogin(req);
-            super.sendSuccessResp(resp);
-	        LOGGER.info(String.format("用户登陆：[ 设备id<%s>用户名<%s>用户id<%s>ip<%s> ]"
-			        , req.getDeviceId(), req.getAccountName(), req.getUserId(), request.getRemoteAddr()));
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", 
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            super.sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("用户登录失败：", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-
-    /**
-     * 加密用户登录(加密)
-     * @createTime 2014年8月24日 下午10:55:03
-     * @author weili
-     */
-    @ApiOperation(value = "买家登录", httpMethod = "POST",response = LoginResp.class)
-    @RequestMapping(value = "/buyerLogins",method = RequestMethod.POST)
-    @ResponseBody
-    public void buyerLogins(@RequestBody  LoginReq temp){
-        LoginReq req = super.getRequest(LoginReq.class);
-        try {
-            BeanValidator.validator(req);
-            req.setPassword(decodeStr(req.getPassword()));
-            LoginResp resp = userService.buyerlogin(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            super.sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("用户登录失败：", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-    /**
-     * 验证码登录
-     * @createTime 2014年8月24日 下午10:55:03
-     * @author weili
-     */
-    @ApiOperation(value = "买家验证码登录", httpMethod = "POST" , notes = "买家验证码登录",response = LoginResp.class)
-    @RequestMapping(value = "/loginForAuth",method = RequestMethod.POST)
-    @ResponseBody
-    public void loginForAuth(@RequestBody  AuthLoginReq temp){
-        AuthLoginReq req = super.getRequest(AuthLoginReq.class);
-        try {
-            BeanValidator.validator(req);
-            LoginResp resp = userService.authlogin(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            super.sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("用户登录失败：", e);
-            super.sendError(e.getMessage());
-        }
-    }
-    
-    ///**
-    // * 找回密码：验证用户名是否可用
-    // * @createTime 2014年8月24日 下午10:55:03
-    // * @author weili
-    // */
-    //@ApiOperation(value = "买家登录", httpMethod = "POST" , notes = "买家登录",response = LoginResp.class)
-    //@RequestMapping(value = "/checkUserInvalid",method = RequestMethod.POST)
-    //@ResponseBody
-    //public void checkUserInvalid(){
-    //	CheckUserInvalidReq req= super.getRequest(CheckUserInvalidReq.class);
-    //    try {
-    //        CheckUserInvalidResp resp = userService.checkUserInvalid(req);
-    //        super.sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-    //                e.getCode(), e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        LOGGER.error("验证用户名失败：", e);
-    //        super.sendError(e.getMessage());
-    //    }
-    //}
-    
-    /**
-     * 发送验证码到手机
-     * @createTime 2014年8月24日 下午10:55:03
-     * @author weili
-     */
-    @ApiOperation(value = "发送验证码到手机", httpMethod = "POST" , notes = "发送验证码到手机",response = SendVeriCodeResp.class)
-    @RequestMapping(value = "/sendAuthCode",method = RequestMethod.POST)
-    @ResponseBody
-    public void sendAuthCode(@RequestBody SendVeriCodeReq temp){
-        SendVeriCodeReq req= super.getRequest(SendVeriCodeReq.class);
-        try {
-            BeanValidator.validator(req);
-            SendVeriCodeResp resp = userService.sendVeriCode(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", 
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("发送验证码失败：", e);
-            super.sendError(e.getMessage());
-        }
-    }
-    
-    /**
-     * 忘记密码:验证手机收到的验证码
-     * @createTime 2014年8月24日 下午10:55:03
-     * @author weili
-     */
-    @ApiOperation(value = "忘记密码:验证手机号和验证码", httpMethod = "POST" , notes = "验证手机收到的验证码",response = CheckVeriCodeResp.class)
-    @RequestMapping(value = "/checkAuthCode",method = RequestMethod.POST)
-    @ResponseBody
-    public void checkAuthCode(@RequestBody  CheckVeriCodeReq temp){
-        CheckVeriCodeReq req= super.getRequest(CheckVeriCodeReq.class);
-        try {
-            BeanValidator.validator(req);
-            CheckVeriCodeResp resp = userService.checkVeriCode(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("验证手机收到的验证码：", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-
-    /**
-     * 找回密码-修改用户密码
-     * @createTime 2014年8月24日 下午10:55:03
-     * @author weili
-     */
-    @ApiOperation(value = "找回密码-设置买家新密码", httpMethod = "POST" ,response = SendVeriCodeResp.class)
-    @RequestMapping(value = "/modifyPwd",method = RequestMethod.POST)
-    @ResponseBody
-    public void modifyPwd(@RequestBody  ModifyPwdReq temp){
-        ModifyPwdReq req = super.getRequest(ModifyPwdReq.class);
-        ModifyPwdResp resp = null;
-        try {
-                 BeanValidator.validator(req);
-                resp = userService.modifyPwd(req);
-                super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", 
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("修改密码：", e);
-            super.sendError(e.getMessage());
-        }
-                
-    }
-
-    /**
-     * 买家注册
-     * @createTime 2014年8月28日 下午3:41:02
-     * @author weili
-     */
-    @ApiOperation(value = "买家注册", httpMethod = "POST" ,response = UserRegisterResp.class)
-    @RequestMapping(value = "/buyerRegister",method = RequestMethod.POST)
-    @ResponseBody
-    public void buyerRegister(@RequestBody  UserRegisterReq temp){
-        UserRegisterReq req = super.getRequest(UserRegisterReq.class);
-        try {
-            BeanValidator.validator(req);
-            UserRegisterResp resp = userService.userRegister(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", 
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("用户注册失败：", e);
-            super.sendError(e.getMessage());
-        }
-    }
-    
-    /**
-     * 买家注册(加密)
-     * @createTime 2014年8月28日 下午3:41:02
-     * @author weili
-     */
-    @ApiOperation(value = "买家注册", httpMethod = "POST" ,response = UserRegisterResp.class)
-    @RequestMapping(value = "/buyerRegisters",method = RequestMethod.POST)
-    @ResponseBody
-    public void buyerRegisters(@RequestBody  UserRegisterReq temp){
-        UserRegisterReq req = super.getRequest(UserRegisterReq.class);
-        try {
-            BeanValidator.validator(req);
-            req.setPassword(decodeStr(req.getPassword()));
-            UserRegisterResp resp = userService.userRegister(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", 
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("用户注册失败：", e);
-            super.sendError(e.getMessage());
-        }
-    }
-    
-    /**
-     * 退出操作
-     * 
-     * @createTime 2014年8月29日 上午9:30:10
-     * @author weili
-     */
-    @ApiOperation(value = "退出", httpMethod = "POST"  ,response = LogoutResp.class)
-    @RequestMapping(value = "/logout",method = RequestMethod.POST)
-    @ResponseBody
-    public void logout(@RequestBody  LogoutReq temp){
-        LogoutReq req = super.getRequest(LogoutReq.class);
-        try {
-            if(Validator.isNull(req) || !Validator.isNumber(req.getUserId()+"")) {
-                throw new NullPointerException("参数传递错误");
-            }
-        	LogoutResp resp = userService.logout(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", 
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getCode(), e.getMessage());
-        }
-        catch (Exception e) {
-            LOGGER.error("用户退出失败：", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-    /**
-     * 个人信息维护
-     * @createTime 2016年8月24日 下午10:55:03
-     * @author weili
-     */
-    @ApiOperation(value = "个人信息维护", httpMethod = "POST" ,response = UpdateUserInfoResp.class)
-    @RequestMapping(value = "/updateUserInfo",method = RequestMethod.POST)
-    @ResponseBody
-    public void updateUserInfo(@RequestBody  UpdateUserInfoReq temp){
-        UpdateUserInfoReq req = super.getRequest(UpdateUserInfoReq.class);
-        try {
-            UpdateUserInfoResp resp = userService.updateUserInfo(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("个人信息维护：", e);
-            super.sendError(e.getMessage());
-        }
-
-    }
-
-
-    /**
-     * 查看储值卡余额
-     * @createTime 2016年8月24日 下午10:55:03
-     * @author weili
-     */
-    @ApiOperation(value = "查看储值卡余额", httpMethod = "POST"  ,response = GetDepositCardAmountResp.class)
-    @RequestMapping(value = "/getDepositCardAmount",method = RequestMethod.POST)
-    @ResponseBody
-    public void getDepositCardAmount(){
-        GetDepositCardAmountReq req = super.getRequest(GetDepositCardAmountReq.class);
-        try {
-            GetDepositCardAmountResp resp = userService.getDepositCardAmount(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error("个人信息维护：", e);
-            super.sendError(e.getMessage());
-        }
-
-    }
-
-
-    ///**
-    // *  查询用户信息
-    // * GetUserInfoReq
-    // */
-    //@ApiOperation(value = "查询买家用户信息", httpMethod = "POST"  ,response = GetDepositCardAmountResp.class)
-    //@RequestMapping(value = "/getBuyerInfo",method = RequestMethod.POST)
-    //@ResponseBody
-    //public void getBuyerInfo() {
-    //    GetUserInfoReq req = getRequest(GetUserInfoReq.class);
-    //    try {
-    //        GetUserInfoResp resp = userService.getUserIntroduction(req);
-    //        super.sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-    //                e.getCode(), e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getMessage());
-    //    }
-    //}
-
-
-    ///**
-    // *  搜索买家用户信息
-    // * GetUserInfoReq
-    // */
-    //@ApiOperation(value = "搜索买家用户信息", httpMethod = "POST"  ,response = SearchUserInfoResp.class)
-    //@RequestMapping(value = "/searchBuyerInfo",method = RequestMethod.POST)
-    //@ResponseBody
-    //public void searchBuyerInfo(@RequestBody  SearchUserInfoReq temp) {
-    //    SearchUserInfoReq req = getRequest(SearchUserInfoReq.class);
-    //    try {
-    //        SearchUserInfoResp resp = userService.searchBuyerInfo(req);
-    //        super.sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-    //                e.getCode(), e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getMessage());
-    //    }
-    //}
-
-
-    /**
-     * 查询极光推送号
-     *
-     * getRegisterNo
-     */
-    @ApiOperation(value = "查询极光推送号", httpMethod = "POST"  ,response = GetRegisterNoResp.class)
-    @RequestMapping(value = "/getRegisterNo",method = RequestMethod.POST)
-    @ResponseBody
-    public void getRegisterNo(@RequestBody  GetRegisterNoReq temp) {
-        GetRegisterNoReq req = getRequest(GetRegisterNoReq.class);
-        try {
-            GetRegisterNoResp resp = userService.getRegisterNo(req);
-            sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
-                    e.getCode(), e.getMessage()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
-            sendError(e.getMessage());
-        }
-    }
-
-    /**
-     * 批量查询极光推送号
-     *
-     * getNosByUserids
-     */
-    @ApiOperation(value = "批量查询极光推送号", httpMethod = "POST"  ,response = GetRegisterNobyUidsResp.class)
-    @RequestMapping(value = "/getRegisterNobyUids",method = RequestMethod.POST)
-    @ResponseBody
-    public void getRegisterNobyUids(@RequestBody  GetRegisterNobyUidsReq temp) {
-        GetRegisterNobyUidsReq req = getRequest(GetRegisterNobyUidsReq.class);
-        try {
-            GetRegisterNobyUidsResp resp = userService.getRegisterNobyUids(req);
-            sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
-                    e.getCode(), e.getMessage()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
-            sendError(e.getMessage());
-        }
-    }
-
-
-    ///**
-    // * 查看交易记录
-    // * @createTime 2016年8月24日 下午10:55:03
-    // * @author weili
-    // */
-    //@ApiOperation(value = "查看交易记录", httpMethod = "POST"  ,response = TradeRecordResp.class)
-    //@RequestMapping(value = "/getTradeRecord",method = RequestMethod.POST)
-    //@ResponseBody
-    //public void getTradeRecord(){
-    //    TradeRecordReq req = super.getRequest(TradeRecordReq.class);
-    //    try {
-    //        TradeRecordResp resp = userService.getTradeRecord(req);
-    //        super.sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-    //                e.getCode(), e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        LOGGER.error("查看交易记录：", e);
-    //        super.sendError(e.getMessage());
-    //    }
-    //
-    //}
-
-    ///**
-    // * 验证用户账号是否可用
-    // * @createTime 2014年8月28日 下午3:41:02
-    // * @author weili
-    // */
-    //@RequestMapping("/checkAccountName")
-    //@ResponseBody
-    //public void checkAccountName(){
-    //    CheckAccountNameReq req = super.getRequest(CheckAccountNameReq.class);
-    //    CheckAccountNameResp resp = null;
-    //    try {
-    //        if(!Validator.isNull(req) && !Validator.isNull(req.getAccountName())){
-    //            resp = userService.checkAccountName(req);
-    //        }
-    //        else {
-    //            resp = new CheckAccountNameResp();
-    //        }
-    //        super.sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-    //                e.getCode(), e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        LOGGER.error("验证用户账号失败：", e);
-    //        super.sendError(e.getMessage());
-    //    }
-    //}
-    //
-
-    /**
-     * 验证手机号是否已经被注册
-     * @createTime 2014年8月28日 下午3:41:02
-     * @author weili
-     */
-    //@RequestMapping("/checkMobile")
-    //@ResponseBody
-    //@ApiOperation(value = "", httpMethod = "POST")
-    //public void checkMobile(){
-    //    CheckMobileReq req = super.getRequest(CheckMobileReq.class);
-    //    CheckMobileResp resp = null;
-    //    try {
-    //        if(!Validator.isNull(req) && !Validator.isNull(req.getMobile())){
-    //            resp = userService.checkMobile(req);
-    //        } else {
-    //            resp = new CheckMobileResp();
-    //        }
-    //        super.sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-    //                e.getCode(), e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        LOGGER.error("验证手机失败：", e);
-    //        super.sendError(e.getMessage());
-    //    }
-    //}
-
-
-
-
-
-
  
+	@Resource
+	private UserService userService;
+
+	private final Logger LOGGER = Logger.getLogger(UserController.class);
+
+	/**
+	 * 买家登录
+	 * 
+	 * @createTime 2014年8月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "买家登录", httpMethod = "POST", response = LoginResp.class)
+	@RequestMapping(value = "/buyerLogin", method = RequestMethod.POST)
+	@ResponseBody
+	public void buyerLogin(HttpServletRequest request, @RequestBody LoginReq temp) {
+		LoginReq req = super.getRequest(LoginReq.class);
+		try {
+			BeanValidator.validator(req);
+			LoginResp resp = userService.buyerlogin(req);
+			super.sendSuccessResp(resp);
+			LOGGER.info(String.format("用户登陆：[ 设备id<%s>用户名<%s>用户id<%s>ip<%s> ]", req.getDeviceId(), req.getAccountName(),
+					req.getUserId(), request.getRemoteAddr()));
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			super.sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("用户登录失败：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	/**
+	 * 加密用户登录(加密)
+	 * 
+	 * @createTime 2014年8月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "买家登录", httpMethod = "POST", response = LoginResp.class)
+	@RequestMapping(value = "/buyerLogins", method = RequestMethod.POST)
+	@ResponseBody
+	public void buyerLogins(@RequestBody LoginReq temp) {
+		LoginReq req = super.getRequest(LoginReq.class);
+		try {
+			BeanValidator.validator(req);
+			req.setPassword(decodeStr(req.getPassword()));
+			LoginResp resp = userService.buyerlogin(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			super.sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("用户登录失败：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	/**
+	 * 验证码登录
+	 * 
+	 * @createTime 2014年8月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "买家验证码登录", httpMethod = "POST", notes = "买家验证码登录", response = LoginResp.class)
+	@RequestMapping(value = "/loginForAuth", method = RequestMethod.POST)
+	@ResponseBody
+	public void loginForAuth(@RequestBody AuthLoginReq temp) {
+		AuthLoginReq req = super.getRequest(AuthLoginReq.class);
+		try {
+			BeanValidator.validator(req);
+			LoginResp resp = userService.authlogin(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			super.sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("用户登录失败：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	/// **
+	// * 找回密码：验证用户名是否可用
+	// * @createTime 2014年8月24日 下午10:55:03
+	// * @author weili
+	// */
+	// @ApiOperation(value = "买家登录", httpMethod = "POST" , notes =
+	/// "买家登录",response = LoginResp.class)
+	// @RequestMapping(value = "/checkUserInvalid",method = RequestMethod.POST)
+	// @ResponseBody
+	// public void checkUserInvalid(){
+	// CheckUserInvalidReq req= super.getRequest(CheckUserInvalidReq.class);
+	// try {
+	// CheckUserInvalidResp resp = userService.checkUserInvalid(req);
+	// super.sendSuccessResp(resp);
+	// } catch (ServiceException e){
+	// LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+	// e.getCode(), e.getMessage(), req.getUserId()), e);
+	// sendError(e.getCode(), e.getMessage());
+	// } catch (Exception e) {
+	// LOGGER.error("验证用户名失败：", e);
+	// super.sendError(e.getMessage());
+	// }
+	// }
+
+	/**
+	 * 发送验证码到手机
+	 * 
+	 * @createTime 2014年8月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "发送验证码到手机", httpMethod = "POST", notes = "发送验证码到手机", response = SendVeriCodeResp.class)
+	@RequestMapping(value = "/sendAuthCode", method = RequestMethod.POST)
+	@ResponseBody
+	public void sendAuthCode(@RequestBody SendVeriCodeReq temp) {
+		SendVeriCodeReq req = super.getRequest(SendVeriCodeReq.class);
+		try {
+			BeanValidator.validator(req);
+			SendVeriCodeResp resp = userService.sendVeriCode(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("发送验证码失败：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	/**
+	 * 忘记密码:验证手机收到的验证码
+	 * 
+	 * @createTime 2014年8月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "忘记密码:验证手机号和验证码", httpMethod = "POST", notes = "验证手机收到的验证码", response = CheckVeriCodeResp.class)
+	@RequestMapping(value = "/checkAuthCode", method = RequestMethod.POST)
+	@ResponseBody
+	public void checkAuthCode(@RequestBody CheckVeriCodeReq temp) {
+		CheckVeriCodeReq req = super.getRequest(CheckVeriCodeReq.class);
+		try {
+			BeanValidator.validator(req);
+			CheckVeriCodeResp resp = userService.checkVeriCode(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("验证手机收到的验证码：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	/**
+	 * 找回密码-修改用户密码
+	 * 
+	 * @createTime 2014年8月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "找回密码-设置买家新密码", httpMethod = "POST", response = SendVeriCodeResp.class)
+	@RequestMapping(value = "/modifyPwd", method = RequestMethod.POST)
+	@ResponseBody
+	public void modifyPwd(@RequestBody ModifyPwdReq temp) {
+		ModifyPwdReq req = super.getRequest(ModifyPwdReq.class);
+		ModifyPwdResp resp = null;
+		try {
+			BeanValidator.validator(req);
+			resp = userService.modifyPwd(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("修改密码：", e);
+			super.sendError(e.getMessage());
+		}
+
+	}
+
+	/**
+	 * 买家注册
+	 * 
+	 * @createTime 2014年8月28日 下午3:41:02
+	 * @author weili
+	 */
+	@ApiOperation(value = "买家注册", httpMethod = "POST", response = UserRegisterResp.class)
+	@RequestMapping(value = "/buyerRegister", method = RequestMethod.POST)
+	@ResponseBody
+	public void buyerRegister(@RequestBody UserRegisterReq temp) {
+		UserRegisterReq req = super.getRequest(UserRegisterReq.class);
+		try {
+			BeanValidator.validator(req);
+			UserRegisterResp resp = userService.userRegister(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("用户注册失败：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	/**
+	 * 买家注册(加密)
+	 * 
+	 * @createTime 2014年8月28日 下午3:41:02
+	 * @author weili
+	 */
+	@ApiOperation(value = "买家注册", httpMethod = "POST", response = UserRegisterResp.class)
+	@RequestMapping(value = "/buyerRegisters", method = RequestMethod.POST)
+	@ResponseBody
+	public void buyerRegisters(@RequestBody UserRegisterReq temp) {
+		UserRegisterReq req = super.getRequest(UserRegisterReq.class);
+		try {
+			BeanValidator.validator(req);
+			req.setPassword(decodeStr(req.getPassword()));
+			UserRegisterResp resp = userService.userRegister(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("用户注册失败：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	/**
+	 * 退出操作
+	 * 
+	 * @createTime 2014年8月29日 上午9:30:10
+	 * @author weili
+	 */
+	@ApiOperation(value = "退出", httpMethod = "POST", response = LogoutResp.class)
+	@RequestMapping(value = "/logout", method = RequestMethod.POST)
+	@ResponseBody
+	public void logout(@RequestBody LogoutReq temp) {
+		LogoutReq req = super.getRequest(LogoutReq.class);
+		try {
+			if (Validator.isNull(req) || !Validator.isNumber(req.getUserId() + "")) {
+				throw new NullPointerException("参数传递错误");
+			}
+			LogoutResp resp = userService.logout(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("用户退出失败：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	/**
+	 * 个人信息维护
+	 * 
+	 * @createTime 2016年8月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "个人信息维护", httpMethod = "POST", response = UpdateUserInfoResp.class)
+	@RequestMapping(value = "/updateUserInfo", method = RequestMethod.POST)
+	@ResponseBody
+	public void updateUserInfo(@RequestBody UpdateUserInfoReq temp) {
+		UpdateUserInfoReq req = super.getRequest(UpdateUserInfoReq.class);
+		try {
+			UpdateUserInfoResp resp = userService.updateUserInfo(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("个人信息维护：", e);
+			super.sendError(e.getMessage());
+		}
+
+	}
+
+	/**
+	 * 查看储值卡余额
+	 * 
+	 * @createTime 2016年8月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "查看储值卡余额", httpMethod = "POST", response = GetDepositCardAmountResp.class)
+	@RequestMapping(value = "/getDepositCardAmount", method = RequestMethod.POST)
+	@ResponseBody
+	public void getDepositCardAmount() {
+		GetDepositCardAmountReq req = super.getRequest(GetDepositCardAmountReq.class);
+		try {
+			GetDepositCardAmountResp resp = userService.getDepositCardAmount(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("个人信息维护：", e);
+			super.sendError(e.getMessage());
+		}
+
+	}
+
+	/// **
+	// * 查询用户信息
+	// * GetUserInfoReq
+	// */
+	// @ApiOperation(value = "查询买家用户信息", httpMethod = "POST" ,response =
+	/// GetDepositCardAmountResp.class)
+	// @RequestMapping(value = "/getBuyerInfo",method = RequestMethod.POST)
+	// @ResponseBody
+	// public void getBuyerInfo() {
+	// GetUserInfoReq req = getRequest(GetUserInfoReq.class);
+	// try {
+	// GetUserInfoResp resp = userService.getUserIntroduction(req);
+	// super.sendSuccessResp(resp);
+	// } catch (ServiceException e){
+	// LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+	// e.getCode(), e.getMessage(), req.getUserId()), e);
+	// sendError(e.getCode(), e.getMessage());
+	// } catch (Exception e) {
+	// LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(),
+	/// req.getUserId()), e);
+	// sendError(e.getMessage());
+	// }
+	// }
+
+	/// **
+	// * 搜索买家用户信息
+	// * GetUserInfoReq
+	// */
+	// @ApiOperation(value = "搜索买家用户信息", httpMethod = "POST" ,response =
+	/// SearchUserInfoResp.class)
+	// @RequestMapping(value = "/searchBuyerInfo",method = RequestMethod.POST)
+	// @ResponseBody
+	// public void searchBuyerInfo(@RequestBody SearchUserInfoReq temp) {
+	// SearchUserInfoReq req = getRequest(SearchUserInfoReq.class);
+	// try {
+	// SearchUserInfoResp resp = userService.searchBuyerInfo(req);
+	// super.sendSuccessResp(resp);
+	// } catch (ServiceException e){
+	// LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+	// e.getCode(), e.getMessage(), req.getUserId()), e);
+	// sendError(e.getCode(), e.getMessage());
+	// } catch (Exception e) {
+	// LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(),
+	/// req.getUserId()), e);
+	// sendError(e.getMessage());
+	// }
+	// }
+
+	/**
+	 * 查询极光推送号
+	 *
+	 * getRegisterNo
+	 */
+	@ApiOperation(value = "查询极光推送号", httpMethod = "POST", response = GetRegisterNoResp.class)
+	@RequestMapping(value = "/getRegisterNo", method = RequestMethod.POST)
+	@ResponseBody
+	public void getRegisterNo(@RequestBody GetRegisterNoReq temp) {
+		GetRegisterNoReq req = getRequest(GetRegisterNoReq.class);
+		try {
+			GetRegisterNoResp resp = userService.getRegisterNo(req);
+			sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(String.format("Code=%s,ErrorMessage=%s", e.getCode(), e.getMessage()), e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
+			sendError(e.getMessage());
+		}
+	}
+
+	/**
+	 * 批量查询极光推送号
+	 *
+	 * getNosByUserids
+	 */
+	@ApiOperation(value = "批量查询极光推送号", httpMethod = "POST", response = GetRegisterNobyUidsResp.class)
+	@RequestMapping(value = "/getRegisterNobyUids", method = RequestMethod.POST)
+	@ResponseBody
+	public void getRegisterNobyUids(@RequestBody GetRegisterNobyUidsReq temp) {
+		GetRegisterNobyUidsReq req = getRequest(GetRegisterNobyUidsReq.class);
+		try {
+			GetRegisterNobyUidsResp resp = userService.getRegisterNobyUids(req);
+			sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(String.format("Code=%s,ErrorMessage=%s", e.getCode(), e.getMessage()), e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
+			sendError(e.getMessage());
+		}
+	}
+
+	public void getDeliveryAddress(@RequestBody GetDeliveryAddressReq temp) {
+		GetDeliveryAddressReq req = getRequest(GetDeliveryAddressReq.class);
+		try {
+			GetDeliveryAddressResp resp = userService.getDeliveryAddresses(req);
+			sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(String.format("Code=%s,ErrorMessage=%s", e.getCode(), e.getMessage()), e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
+			sendError(e.getMessage());
+		}
+	}
+
+	/// **
+	// * 查看交易记录
+	// * @createTime 2016年8月24日 下午10:55:03
+	// * @author weili
+	// */
+	// @ApiOperation(value = "查看交易记录", httpMethod = "POST" ,response =
+	/// TradeRecordResp.class)
+	// @RequestMapping(value = "/getTradeRecord",method = RequestMethod.POST)
+	// @ResponseBody
+	// public void getTradeRecord(){
+	// TradeRecordReq req = super.getRequest(TradeRecordReq.class);
+	// try {
+	// TradeRecordResp resp = userService.getTradeRecord(req);
+	// super.sendSuccessResp(resp);
+	// } catch (ServiceException e){
+	// LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+	// e.getCode(), e.getMessage(), req.getUserId()), e);
+	// sendError(e.getCode(), e.getMessage());
+	// } catch (Exception e) {
+	// LOGGER.error("查看交易记录：", e);
+	// super.sendError(e.getMessage());
+	// }
+	//
+	// }
+
+	/// **
+	// * 验证用户账号是否可用
+	// * @createTime 2014年8月28日 下午3:41:02
+	// * @author weili
+	// */
+	// @RequestMapping("/checkAccountName")
+	// @ResponseBody
+	// public void checkAccountName(){
+	// CheckAccountNameReq req = super.getRequest(CheckAccountNameReq.class);
+	// CheckAccountNameResp resp = null;
+	// try {
+	// if(!Validator.isNull(req) && !Validator.isNull(req.getAccountName())){
+	// resp = userService.checkAccountName(req);
+	// }
+	// else {
+	// resp = new CheckAccountNameResp();
+	// }
+	// super.sendSuccessResp(resp);
+	// } catch (ServiceException e){
+	// LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+	// e.getCode(), e.getMessage(), req.getUserId()), e);
+	// sendError(e.getCode(), e.getMessage());
+	// } catch (Exception e) {
+	// LOGGER.error("验证用户账号失败：", e);
+	// super.sendError(e.getMessage());
+	// }
+	// }
+	//
+
+	/**
+	 * 验证手机号是否已经被注册
+	 * 
+	 * @createTime 2014年8月28日 下午3:41:02
+	 * @author weili
+	 */
+	// @RequestMapping("/checkMobile")
+	// @ResponseBody
+	// @ApiOperation(value = "", httpMethod = "POST")
+	// public void checkMobile(){
+	// CheckMobileReq req = super.getRequest(CheckMobileReq.class);
+	// CheckMobileResp resp = null;
+	// try {
+	// if(!Validator.isNull(req) && !Validator.isNull(req.getMobile())){
+	// resp = userService.checkMobile(req);
+	// } else {
+	// resp = new CheckMobileResp();
+	// }
+	// super.sendSuccessResp(resp);
+	// } catch (ServiceException e){
+	// LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+	// e.getCode(), e.getMessage(), req.getUserId()), e);
+	// sendError(e.getCode(), e.getMessage());
+	// } catch (Exception e) {
+	// LOGGER.error("验证手机失败：", e);
+	// super.sendError(e.getMessage());
+	// }
+	// }
  
 }