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

weiliwhereareyou@163.com
2 parents 66bd3112 207329b4
Showing 38 changed files with 1457 additions and 885 deletions
.gitignore
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Order.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/OrderItem.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetFundsReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetFundsResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetfundTradeRecordReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetfundTradeRecordResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/BuyerCancelOrderReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/BuyerCancelOrderResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/BuyerConfirmReceiptReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/BuyerConfirmReceiptResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/PayOrderReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/PayOrderResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/SubmitOrderReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/SubmitOrderResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/SearchOrderListReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/model/SellerOrder.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/takeOrderReq.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/ShopBuyerRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/ShopRPC.java
+#target/
+target/
+
+# IDEA #
+.idea/
+*.iml
+
+# Eclipse #
+.settings/
+.classpath
+.project
+
+# Log #
+logs/
+*.log%     
+
+#mac 
+.DS_Store
+
+#svn
+.svn
 \ No newline at end of file
 package com.diligrp.mobsite.getway.domain.protocol;
  
-import io.swagger.annotations.ApiModelProperty;
-
 import java.io.Serializable;
-import java.util.List;
+import java.util.Date;
+
+import com.b2c.orders.enums.DeliveryType;
+import com.b2c.orders.enums.OrderStatus;
+import com.b2c.orders.enums.PayStatus;
+import com.b2c.orders.enums.PayType;
+import com.fasterxml.jackson.annotation.JsonFormat;
  
 /**
  * <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月1日 下午3:17:28
  * @author zhangshirui
  */
-public class Order  implements Serializable{
-
-	/**
-	 * 是否已评论,1是,0否
-	 */
-	public static final int IS_COMMENTED_YES = 1;
-	/**
-	 * 否：0
-	 */
-	public static final int IS_COMMENTED_NO = 0;
-
+public class Order implements Serializable {
  
 	/**
-	 * id,订单编号
+	 * 
 	 */
-	@ApiModelProperty(value = "订单id")
-	private Long orderId;
+	private static final long serialVersionUID = 552215083930422779L;
  
+	private Long id;
 	/**
-	 * 订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成)
+	 * 店铺id
 	 */
-	@ApiModelProperty(value = "订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成) ")
-	private Integer orderState;
-
+	private Long shopId;
 	/**
-	 * 订单状态名称
+	 * 商家id
 	 */
-	@ApiModelProperty(value = "订单状态名称")
-	private String stateName;
-
+	private Long sellerId;
 	/**
-	 * 支付方式
+	 * 用户id
 	 */
-	@ApiModelProperty(value = "支付方式：10-在线支付,20-线下支付")
-	private Integer payType;
-	/**
-     * 总金额
-     */
-	@ApiModelProperty(value = "商品总金额")
-	private Long totalAmount;
+	private Long buyerId;
+	/** 配送类型 */
+	private Integer deliveryType;
+	/** 订单状态 */
+	private Integer orderStatus;
+	/** 支付状态 */
+	private Integer payStatus;
+	/** 买家备注说明 */
+	private String buyerMemo;
+	/** 支付时间 */
+	private String payTime;
 	/**
-	 * 应付金额
+	 * 送货时间
 	 */
-	@ApiModelProperty(value = "实际支付金额")
-	private Long realPayAmount;
-	/**
-	 * 优惠金额
-	 */
-	@ApiModelProperty(value = "优惠金额")
-	private Long discountAmount;
-	/**
-	 * 邮费
-	 */
-	@ApiModelProperty(value = "运费")
-	private Long postage;
-
-	/**
-	 * 订单提交日期
-	 */
-	@ApiModelProperty(value = "订单提交时间")
+	private String deliveryTime;
+	/** 提货时间 */
+	private String reservationTime;
+	/** 买家确认收货时间 */
+	private String buyerConfirmTime;
+	/** 订单提交时间 */
 	private String submitTime;
-
-
-	@ApiModelProperty(value = "送达时间")
-	private String arriveTime;
-
-	/**
-	 * 订单详情页最上面
-	 */
-	@ApiModelProperty(value = "订单详情状态描述")
-	private String orderDesc;
-	/**
-	 * 是否评论
-	 */
-	@ApiModelProperty(value = "是否评论")
-	private Integer isCommented;
-
-
-	/**
-	 * 卖家姓名
-	 */
-	@ApiModelProperty(value = "卖家姓名")
-	private String sellerName;
-	/**
-	 * 卖家电话
-	 */
-	@ApiModelProperty(value = "卖家电话")
-	private String sellerMobile;
-
-	/**
-	 * 店铺名称
-	 */
-	@ApiModelProperty(value = "店铺名")
-	private String shopName;
-
-	/**
-	 * 订单商品列表
-	 */
-	@ApiModelProperty(value = "商品列表")
-	private List<OrderProduct> orderProducts;
-	/**
-	 * 提货留言
-	 */
-	@ApiModelProperty(value = "提货备注留言")
-	private String pickUserMsg;
-
-	/**
-	 * 提货时间
-	 *
-	 */
-	@ApiModelProperty(value = "提货时间")
-	private String pickDate;
-
-	/**
-	 * 提货地点
-	 */
-	@ApiModelProperty(value = "提货地点")
-	private String pickAddress;
-
-
-	/**
-	 * 提货方式名称
-	 */
-	@ApiModelProperty(value = "配送方式")
-	private String deliveryName;
-
-
-
+	/** 支付类型 */
+	private Integer payType;
+	/** 总金额 */
+	private Long totalPrice;
 	/**
-	 * 店铺地址
+	 * 接单后修改的价格
 	 */
-	@ApiModelProperty(value = "店铺地址")
-	private String shopAddr;
-
-
-	public Long getOrderId() {
-		return orderId;
-	}
-
-	public void setOrderId(Long orderId) {
-		this.orderId = orderId;
-	}
-
-	public Integer getOrderState() {
-		return orderState;
-	}
-
-	public void setOrderState(Integer orderState) {
-		this.orderState = orderState;
-	}
-
-	public String getStateName() {
-		return stateName;
-	}
-
-	public void setStateName(String stateName) {
-		this.stateName = stateName;
-	}
-
-	public Integer getPayType() {
-		return payType;
-	}
-
-	public void setPayType(Integer payType) {
-		this.payType = payType;
-	}
+	private Long realTotalPrice;
  
-	public Long getTotalAmount() {
-		return totalAmount;
+	public Long getId() {
+		return id;
 	}
  
-	public void setTotalAmount(Long totalAmount) {
-		this.totalAmount = totalAmount;
+	public void setId(Long id) {
+		this.id = id;
 	}
  
-	public Long getRealPayAmount() {
-		return realPayAmount;
+	public Long getShopId() {
+		return shopId;
 	}
  
-	public void setRealPayAmount(Long realPayAmount) {
-		this.realPayAmount = realPayAmount;
+	public void setShopId(Long shopId) {
+		this.shopId = shopId;
 	}
  
-	public Long getDiscountAmount() {
-		return discountAmount;
+	public Long getSellerId() {
+		return sellerId;
 	}
  
-	public void setDiscountAmount(Long discountAmount) {
-		this.discountAmount = discountAmount;
+	public void setSellerId(Long sellerId) {
+		this.sellerId = sellerId;
 	}
  
-	public Long getPostage() {
-		return postage;
+	public Long getBuyerId() {
+		return buyerId;
 	}
  
-	public void setPostage(Long postage) {
-		this.postage = postage;
+	public void setBuyerId(Long buyerId) {
+		this.buyerId = buyerId;
 	}
  
-	public String getSubmitTime() {
-		return submitTime;
-	}
-
-	public void setSubmitTime(String submitTime) {
-		this.submitTime = submitTime;
+	public Integer getDeliveryType() {
+		return deliveryType;
 	}
  
-	public String getArriveTime() {
-		return arriveTime;
+	public void setDeliveryType(Integer deliveryType) {
+		this.deliveryType = deliveryType;
 	}
  
-	public void setArriveTime(String arriveTime) {
-		this.arriveTime = arriveTime;
+	public Integer getOrderStatus() {
+		return orderStatus;
 	}
  
-	public String getOrderDesc() {
-		return orderDesc;
+	public void setOrderStatus(Integer orderStatus) {
+		this.orderStatus = orderStatus;
 	}
  
-	public void setOrderDesc(String orderDesc) {
-		this.orderDesc = orderDesc;
+	public Integer getPayStatus() {
+		return payStatus;
 	}
  
-	public Integer getIsCommented() {
-		return isCommented;
+	public void setPayStatus(Integer payStatus) {
+		this.payStatus = payStatus;
 	}
  
-	public void setIsCommented(Integer isCommented) {
-		this.isCommented = isCommented;
+	public String getBuyerMemo() {
+		return buyerMemo;
 	}
  
-	public String getSellerName() {
-		return sellerName;
+	public void setBuyerMemo(String buyerMemo) {
+		this.buyerMemo = buyerMemo;
 	}
  
-	public void setSellerName(String sellerName) {
-		this.sellerName = sellerName;
+	public String getPayTime() {
+		return payTime;
 	}
  
-	public String getSellerMobile() {
-		return sellerMobile;
+	public void setPayTime(String payTime) {
+		this.payTime = payTime;
 	}
  
-	public void setSellerMobile(String sellerMobile) {
-		this.sellerMobile = sellerMobile;
+	public String getDeliveryTime() {
+		return deliveryTime;
 	}
  
-	public String getShopName() {
-		return shopName;
+	public void setDeliveryTime(String deliveryTime) {
+		this.deliveryTime = deliveryTime;
 	}
  
-	public void setShopName(String shopName) {
-		this.shopName = shopName;
+	public String getReservationTime() {
+		return reservationTime;
 	}
  
-	public List<OrderProduct> getOrderProducts() {
-		return orderProducts;
+	public void setReservationTime(String reservationTime) {
+		this.reservationTime = reservationTime;
 	}
  
-	public void setOrderProducts(List<OrderProduct> orderProducts) {
-		this.orderProducts = orderProducts;
+	public String getBuyerConfirmTime() {
+		return buyerConfirmTime;
 	}
  
-	public String getPickUserMsg() {
-		return pickUserMsg;
+	public void setBuyerConfirmTime(String buyerConfirmTime) {
+		this.buyerConfirmTime = buyerConfirmTime;
 	}
  
-	public void setPickUserMsg(String pickUserMsg) {
-		this.pickUserMsg = pickUserMsg;
+	public String getSubmitTime() {
+		return submitTime;
 	}
  
-
-
-	public String getPickDate() {
-		return pickDate;
+	public void setSubmitTime(String submitTime) {
+		this.submitTime = submitTime;
 	}
  
-	public void setPickDate(String pickDate) {
-		this.pickDate = pickDate;
+	public Integer getPayType() {
+		return payType;
 	}
  
-	public String getPickAddress() {
-		return pickAddress;
+	public void setPayType(Integer payType) {
+		this.payType = payType;
 	}
  
-	public void setPickAddress(String pickAddress) {
-		this.pickAddress = pickAddress;
+	public Long getTotalPrice() {
+		return totalPrice;
 	}
  
-	public String getDeliveryName() {
-		return deliveryName;
+	public void setTotalPrice(Long totalPrice) {
+		this.totalPrice = totalPrice;
 	}
  
-	public void setDeliveryName(String deliveryName) {
-		this.deliveryName = deliveryName;
+	public Long getRealTotalPrice() {
+		return realTotalPrice;
 	}
  
-	public String getShopAddr() {
-		return shopAddr;
+	public void setRealTotalPrice(Long realTotalPrice) {
+		this.realTotalPrice = realTotalPrice;
 	}
  
-	public void setShopAddr(String shopAddr) {
-		this.shopAddr = shopAddr;
-	}
 }
 package com.diligrp.mobsite.getway.domain.protocol;
  
+import javax.validation.constraints.NotNull;
  
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
  
 /**
  * <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月19日 上午11:55:57
- * @author zhangshirui
+ * @author Chris
  */
 public class OrderItem {
-    
-    ///**
-    // * 进货单id
-    // */
-    //@ApiModelProperty(value = "购物车id")
-    //private Long cartId;
-    /**
-     * 购买数量
-     */
-    @ApiModelProperty(value = "购买数量",required = true)
-    private Integer amount;
-    /**
-     * 价格-单位：分
-     */
-    @ApiModelProperty(value = "价格-单位:分",required = true)
-    private Long price;
  
-    /**
-     * 商品sku
-     */
-    @ApiModelProperty(value = "sku",required = true)
-    private String sku;
+	@ApiParam("sku编号")
+	@NotNull(message = "sku编号不能为空")
+	private String sku;
+	@ApiParam("购买数量")
+	@NotNull(message = "购买数量不能为空")
+	private Integer amount;
  
-	/**
-	 * 商品id
-	 * */
-    @ApiModelProperty(value = "商品id",required = true)
-	private Long productId;
+	public String getSku() {
+		return sku;
+	}
  
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
  
-    public Integer getAmount() {
-        return amount;
-    }
+	public Integer getAmount() {
+		return amount;
+	}
  
-    public void setAmount(Integer amount) {
-        this.amount = amount;
-    }
-
-    public Long getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Long productId) {
-        this.productId = productId;
-    }
-
-    public String getSku() {
-        return sku;
-    }
-
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
-    public Long getPrice() {
-        return price;
-    }
-
-    public void setPrice(Long price) {
-        this.price = price;
-    }
+	public void setAmount(Integer amount) {
+		this.amount = amount;
+	}
 }
 package com.diligrp.mobsite.getway.domain.protocol.fund;
  
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
  
 /**
  * Created by xxxzzz on 2017/1/3.
  */
 public class GetFundsReq extends BaseReq {
+    @ApiModelProperty(value = "搜索关键词")
+    private String keyword;
+    @ApiModelProperty(value="店铺ID")
+    private Long shopId;
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public Long getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Long shopId) {
+        this.shopId = shopId;
+    }
 }
 package com.diligrp.mobsite.getway.domain.protocol.fund;
  
+import com.b2c.myapp.common.api.shop.output.ShopOutput;
+import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
 import com.diligrp.mobsite.getway.domain.base.BaseListResp;
 import io.swagger.annotations.ApiModelProperty;
  
+import java.util.List;
+
 /**
  * Created by xxxzzz on 2017/1/3.
  */
 public class GetFundsResp extends BaseListResp {
-
-
-    @ApiModelProperty(value = "储值总金额")
+    /**
+     * 店铺储值总金额
+     */
+    @ApiModelProperty(value = "店铺储值总金额")
     private Long storedTotalPrice;
-
-    @ApiModelProperty(value = "可用余额")
+    /**
+     * 店铺可用余额
+     */
+    @ApiModelProperty(value = "店铺可用余额")
     private Long residueTotalPrice;
-
-    @ApiModelProperty(value = "冻结总金额")
+    /**
+     * 店铺冻结总金额
+     */
+    @ApiModelProperty(value = "店铺冻结总金额")
     private Long freezeTotalPrice;
  
-    @ApiModelProperty(value = "用户名称")
-    private String userName ;
-
-    @ApiModelProperty(value = "用户头像")
-    private String headImg ;
-
-    public String getHeadImg() {
-        return headImg;
+    private List<ShopBuyerDetailOutput> shopBuyers;
+    public List<ShopBuyerDetailOutput> getShopBuyers() {
+        return shopBuyers;
     }
  
-    public void setHeadImg(String headImg) {
-        this.headImg = headImg;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
+    public void setShopBuyers(List<ShopBuyerDetailOutput> shopBuyers) {
+        this.shopBuyers = shopBuyers;
     }
  
     public Long getStoredTotalPrice() {
@@ -63,6 +59,4 @@ public class GetFundsResp extends BaseListResp {
     public void setFreezeTotalPrice(Long freezeTotalPrice) {
         this.freezeTotalPrice = freezeTotalPrice;
     }
-
-
 }
@@ -11,6 +11,8 @@ public class GetfundTradeRecordReq extends BaseListReq {
  
     @ApiModelProperty(value = "查询类型（1：充值 2：冻结4：消费）" ,required = true)
     private Long tradeType;
+    @ApiModelProperty(value = "店铺用户ID，绑定的唯一标识")
+    private Long shopBuyerId;
  
     public Long getTradeType() {
         return tradeType;
@@ -19,4 +21,12 @@ public class GetfundTradeRecordReq extends BaseListReq {
     public void setTradeType(Long tradeType) {
         this.tradeType = tradeType;
     }
+
+    public Long getShopBuyerId() {
+        return shopBuyerId;
+    }
+
+    public void setShopBuyerId(Long shopBuyerId) {
+        this.shopBuyerId = shopBuyerId;
+    }
 }
@@ -16,6 +16,9 @@ public class GetfundTradeRecordResp extends BaseListResp {
     @ApiModelProperty(value = "储值时间/消费时间")
     private String tradeTime;
  
+    @ApiModelProperty(value = "交易类型")
+    private Long tradeType;
+
     //@ApiModelProperty(value = "储值余额/消费时间")
     //private Long residueTotalPrice;
  
@@ -35,4 +38,12 @@ public class GetfundTradeRecordResp extends BaseListResp {
     public void setTradeTime(String tradeTime) {
         this.tradeTime = tradeTime;
     }
+
+    public Long getTradeType() {
+        return tradeType;
+    }
+
+    public void setTradeType(Long tradeType) {
+        this.tradeType = tradeType;
+    }
 }
+package com.diligrp.mobsite.getway.domain.protocol.order;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class BuyerCancelOrderReq extends BaseReq {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1108479005816375698L;
+
+	@ApiModelProperty("订单id")
+	private Long orderId;
+	@ApiModelProperty("买家id")
+	private Long shopBuyerId;
+
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
+	public Long getShopBuyerId() {
+		return shopBuyerId;
+	}
+
+	public void setShopBuyerId(Long shopBuyerId) {
+		this.shopBuyerId = shopBuyerId;
+	}
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.order;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+public class BuyerCancelOrderResp extends BaseResp {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3717184844982266363L;
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.order;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class BuyerConfirmReceiptReq extends BaseReq {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7578114562110271763L;
+
+	@ApiModelProperty("订单id")
+	private Long orderId;
+	@ApiModelProperty("买家id")
+	private Long buyerId;
+
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
+	public Long getBuyerId() {
+		return buyerId;
+	}
+
+	public void setBuyerId(Long buyerId) {
+		this.buyerId = buyerId;
+	}
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.order;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+public class BuyerConfirmReceiptResp extends BaseResp {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2818352073956139966L;
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.order;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class PayOrderReq extends BaseReq {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4349767161975527606L;
+
+	@ApiModelProperty("订单id")
+	private Long orderId;
+	@ApiModelProperty("支付类型，10线上支付，20线下支付")
+	private Integer payType;
+
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
+	public Integer getPayType() {
+		return payType;
+	}
+
+	public void setPayType(Integer payType) {
+		this.payType = payType;
+	}
+
+}
+package com.diligrp.mobsite.getway.domain.protocol.order;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+public class PayOrderResp extends BaseResp {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1075044637572228252L;
+
+}
 package com.diligrp.mobsite.getway.domain.protocol.order;
  
+import java.util.List;
+
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
-import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderShopInfo;
-import io.swagger.annotations.ApiModelProperty;
+import com.diligrp.mobsite.getway.domain.protocol.OrderItem;
  
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
+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月1日 下午5:47:53
  * @author zhangshirui
  */
-@SuppressWarnings("serial")
 public class SubmitOrderReq extends BaseReq {
-    
-    /**
-     * 提货人信息
-     */
-    @Valid @NotNull(message = "联系人不能为空")
-    @ApiModelProperty(value = "收货人信息",required = true)
-	private ConsigneeInfo consigneeInfo;
-
  
 	/**
-     * 支付方式:10线上付款,20线下付款
-     */
-    @NotNull(message = "支付方式不能为空")
-    @ApiModelProperty(value = "支付方式:10线上付款,20线下付款",required = true)
-    private Integer payType;
-    /**
-     * 送货方式:10:自提,20:送货上门
-     */
-    @NotNull(message = "送货方式不能为空")
-    @ApiModelProperty(value = "送货方式:10自提、20送货上门",required = true)
-    private Integer deliveryType;
-
-    @ApiModelProperty(value = "送达时间" )
-    private String arriveTime;
-
-    @ApiModelProperty(value = "提货时间" )
-    private String reservationTime;
-
-    @ApiModelProperty(value = "市场id" )
-    private Long marketId;
-
-    /**
-     * 买家留言
-     */
-    @ApiModelProperty(value = "买家留言")
-    private String remark;
-
-    /**
-     * 邮费
-     */
-    @ApiModelProperty(value = "邮费")
-    private Long postage = 0L;
-
-    /**
-     * 店铺商品信息
-     */
-    @Valid @NotNull(message = "商品不能为空")
-    @ApiModelProperty(value = "商品列表")
-    private List<OrderShopInfo> orderShopInfos;
-
-
-    public ConsigneeInfo getConsigneeInfo() {
-        return consigneeInfo;
-    }
-
-    public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
-        this.consigneeInfo = consigneeInfo;
-    }
-
-    public Integer getPayType() {
-        return payType;
-    }
-
-    public void setPayType(Integer payType) {
-        this.payType = payType;
-    }
-
-    public Integer getDeliveryType() {
-        return deliveryType;
-    }
-
-    public void setDeliveryType(Integer deliveryType) {
-        this.deliveryType = deliveryType;
-    }
-
-    public String getArriveTime() {
-        return arriveTime;
-    }
-
-    public void setArriveTime(String arriveTime) {
-        this.arriveTime = arriveTime;
-    }
-
-    public String getReservationTime() {
-        return reservationTime;
-    }
-
-    public void setReservationTime(String reservationTime) {
-        this.reservationTime = reservationTime;
-    }
-
-    public Long getMarketId() {
-        return marketId;
-    }
-
-    public void setMarketId(Long marketId) {
-        this.marketId = marketId;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Long getPostage() {
-        return postage;
-    }
-
-    public void setPostage(Long postage) {
-        this.postage = postage;
-    }
-
-    public List<OrderShopInfo> getOrderShopInfos() {
-        return orderShopInfos;
-    }
-
-    public void setOrderShopInfos(List<OrderShopInfo> orderShopInfos) {
-        this.orderShopInfos = orderShopInfos;
-    }
+	 * 
+	 */
+	private static final long serialVersionUID = 7543262727665130065L;
+
+	@ApiModelProperty(value = "买家绑定店铺的id")
+	private Long shopBuyerId;
+	@ApiModelProperty(value = "市场id", required = true)
+	private Long marketId;
+	@ApiModelProperty(value = "配送类型", required = true)
+	private Integer deliveryType;
+	@ApiModelProperty(value = "买家备注说明", required = true)
+	private String buyerMemo;
+	@ApiModelProperty(value = "送货时间")
+	private String deliveryTime;
+	@ApiModelProperty("收货人姓名")
+	private String receiverName;
+	@ApiModelProperty("送货地址")
+	private String deliveryAddress;
+	@ApiModelProperty("收货人电话")
+	private String receiverPhoneNumber;
+	@ApiModelProperty(value = "提货时间")
+	private String reservationTime;
+	@ApiModelProperty(value = "订单项", required = true)
+	private List<OrderItem> orderItems;
+
+	public Long getShopBuyerId() {
+		return shopBuyerId;
+	}
+
+	public void setShopBuyerId(Long shopBuyerId) {
+		this.shopBuyerId = shopBuyerId;
+	}
+
+	public Long getMarketId() {
+		return marketId;
+	}
+
+	public void setMarketId(Long marketId) {
+		this.marketId = marketId;
+	}
+
+	public Integer getDeliveryType() {
+		return deliveryType;
+	}
+
+	public void setDeliveryType(Integer deliveryType) {
+		this.deliveryType = deliveryType;
+	}
+
+	public String getBuyerMemo() {
+		return buyerMemo;
+	}
+
+	public void setBuyerMemo(String buyerMemo) {
+		this.buyerMemo = buyerMemo;
+	}
+
+	public String getDeliveryTime() {
+		return deliveryTime;
+	}
+
+	public void setDeliveryTime(String deliveryTime) {
+		this.deliveryTime = deliveryTime;
+	}
+
+	public String getReceiverName() {
+		return receiverName;
+	}
+
+	public void setReceiverName(String receiverName) {
+		this.receiverName = receiverName;
+	}
+
+	public String getDeliveryAddress() {
+		return deliveryAddress;
+	}
+
+	public void setDeliveryAddress(String deliveryAddress) {
+		this.deliveryAddress = deliveryAddress;
+	}
+
+	public String getReceiverPhoneNumber() {
+		return receiverPhoneNumber;
+	}
+
+	public void setReceiverPhoneNumber(String receiverPhoneNumber) {
+		this.receiverPhoneNumber = receiverPhoneNumber;
+	}
+
+	public String getReservationTime() {
+		return reservationTime;
+	}
+
+	public void setReservationTime(String reservationTime) {
+		this.reservationTime = reservationTime;
+	}
+
+	public List<OrderItem> getOrderItems() {
+		return orderItems;
+	}
+
+	public void setOrderItems(List<OrderItem> orderItems) {
+		this.orderItems = orderItems;
+	}
 }
@@ -6,70 +6,31 @@ import io.swagger.annotations.ApiModelProperty;
  
 import java.util.List;
  
-
 /**
  * <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月1日 下午5:48:14
  * @author zhangshirui
  */
-@SuppressWarnings("serial")
 public class SubmitOrderResp extends BaseResp {
-    
-    /**
-     * 订单号
-     */
-    @ApiModelProperty(value = "订单信息")
-    private List<OrderSumInfo> orderInfos;
-
-    /**
-     * 提交成功描述
-     */
-    @ApiModelProperty(value = "提交结果描述")
-    private String description;
-    /**
-     * 总金额
-     */
-    @ApiModelProperty(value = "总金额")
-    private Long totalPrice;
-
-
-
-
-
-	public List<OrderSumInfo> getOrderInfos() {
-        return orderInfos;
-    }
-
-    
-    public void setOrderInfos(List<OrderSumInfo> orderInfos) {
-        this.orderInfos = orderInfos;
-    }
-
-    
-    public String getDescription() {
-        return description;
-    }
-
-    
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-
-    
-    public Long getTotalPrice() {
-        return totalPrice;
-    }
-
  
-    
-    public void setTotalPrice(Long totalPrice) {
-        this.totalPrice = totalPrice;
-    }
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7702524427180927511L;
+	
+	private Long orderId;
  
+	public Long getOrderId() {
+		return orderId;
+	}
  
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
  
 }
@@ -5,19 +5,18 @@ import io.swagger.annotations.ApiModelProperty;
  
 public class SearchOrderListReq extends BaseListReq {
  
-
 	/**
 	 * 订单状态
 	 */
 	@ApiModelProperty(value = "搜索关键字：订单号等 ")
-	private Integer keyword;
-
+	private String keyword;
  
-	public Integer getKeyword() {
+	public String getKeyword() {
 		return keyword;
 	}
  
-	public void setKeyword(Integer keyword) {
+	public void setKeyword(String keyword) {
 		this.keyword = keyword;
 	}
+
 }
 package com.diligrp.mobsite.getway.domain.protocol.saler.order.model;
  
-import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
 import com.diligrp.mobsite.getway.domain.protocol.Order;
-import io.swagger.annotations.ApiModelProperty;
  
 /**
  * Created by david on 2015/4/16.
  */
 public class SellerOrder extends Order {
  
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4271243184715004188L;
  
 	/**
-	 * 提货人信息
+	 * 收货人姓名
 	 */
-	@ApiModelProperty(value = "收货人信息")
-	private ConsigneeInfo consigneeInfo;
+	private String receiverName;
+	/**
+	 * 收货人电话
+	 */
+	private String receiverPhoneNumber;
  
-	public ConsigneeInfo getConsigneeInfo() {
-		return consigneeInfo;
+	public String getReceiverName() {
+		return receiverName;
 	}
  
-	public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
-		this.consigneeInfo = consigneeInfo;
+	public void setReceiverName(String receiverName) {
+		this.receiverName = receiverName;
 	}
+
+	public String getReceiverPhoneNumber() {
+		return receiverPhoneNumber;
+	}
+
+	public void setReceiverPhoneNumber(String receiverPhoneNumber) {
+		this.receiverPhoneNumber = receiverPhoneNumber;
+	}
+
 }
@@ -4,7 +4,12 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import io.swagger.annotations.ApiModelProperty;
  
 public class takeOrderReq extends BaseReq {
-    /***
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 3768912856291424399L;
+
+	/***
      * 订单id
      * */
     @ApiModelProperty(value = "订单id",required = true)
+package com.diligrp.mobsite.getway.rpc;
+
+import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerDetail;
+import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerListInput;
+import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
+import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerKeyOutput;
+import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerOutput;
+import com.b2c.myapp.common.utils.BaseOutput;
+import com.b2c.myapp.common.utils.base.Page;
+
+import java.util.List;
+
+/**
+ * Created by jiangchengyong on 2017/1/10.
+ */
+public interface ShopBuyerRPC {
+    /**
+     * @comment 查找店铺所有买家列表
+     * @param shopBuyerDetail 店铺买家对象
+     * @return Page<ShopBuyerDetailOutput>
+     * @author kelan
+     * @time 2016/12/1 9:59
+     */
+    public Page<ShopBuyerDetailOutput> queryShopAllBuyerList(ShopBuyerDetail shopBuyerDetail);
+    /**
+     * 绑定并激活（查询买家是否绑定相关店铺，未绑定直接绑定，已绑定直接激活）
+     * @param buyerId
+     * @param promoCode
+     * @return
+     */
+    ShopBuyerOutput bindAndActivate(Long buyerId,Long promoCode);
+
+    /**
+     * 获取店铺用户的相关主键信息（buyId、shopId、sellerId）
+     * @param shopBuyerId
+     * @return
+     */
+    ShopBuyerKeyOutput getShopBuyerKeys(Long shopBuyerId);
+}
 package com.diligrp.mobsite.getway.rpc;
  
+import com.b2c.myapp.common.api.shop.input.ShopListInput;
+import com.b2c.myapp.common.api.shop.input.ShopSaveInput;
+import com.b2c.myapp.common.api.shop.input.ShopUpdateInput;
+import com.b2c.myapp.common.api.shop.output.ShopOutput;
+import com.b2c.myapp.common.utils.BaseOutput;
 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
 import com.diligrp.mobsite.getway.domain.protocol.ShopIntroduction;
 import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
@@ -7,70 +12,55 @@ import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
 import java.util.List;
  
 /**
- * <B>Description</B> <br />
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
+ * <BDescription</B <br /
+ * <BCopyright</B Copyright (c) 2015 www.diligrp.com All rights reserved. <br /
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /
+ * <BCompany</B 地利集团
  * @createTime 2015年6月10日 下午1:40:21
  * @author zhangshirui
  */
 public interface ShopRPC {
  
-	
-	/**
-	 * 查询店铺分类信息
-	 * @param shopId
-	 * @return
-	 * @createTime 2015年6月10日 下午4:35:14
-	 * @author zhangshirui
-	 */
-	List<ProductCategory> getShopCategory(Long shopId);
  
 	/**
-	 * 根据店铺id，查询推荐商品信息
-	 * @param shopId
-	 * @return
-	 * @createTime 2015年6月11日 下午6:09:41
-	 * @author zhangshirui
+	 * @comment 创建店铺
+	 * @param shopSaveInput 店铺基本信息
+	 * @return Integer
+	 * @author kelan
+	 * @time 2016/11/29 19:03
 	 */
-	List<Long> getRecommendProducts(Long shopId);
-
+	public Integer createShopInfo(ShopSaveInput shopSaveInput);
 	/**
-	 * 根据店铺id查询店铺简介
-	 * @param shopId
-	 * @return
-	 * @createTime 2015年6月12日 上午10:37:02
-	 * @author zhangshirui
+	 * @comment 通过卖家id获取店铺信息
+	 * @param sellerId 卖家id
+	 * @return ShopOutput
+	 * @author kelan
+	 * @time 2016/11/29 18:54
 	 */
-	ShopIntroduction getShopIntroductionById(Long shopId);
-
+	public ShopOutput getShopBySellerId(Long sellerId);
 	/**
-	 * 根据用户id查询店铺简介
-	 * @param userId
-	 * @return
-	 * @createTime 2015年6月12日 上午10:38:32
-	 * @author zhangshirui
+	 * @comment 通过店铺id获取店铺信息
+	 * @param shopId 店铺id
+	 * @return ShopOutput
+	 * @author kelan
+	 * @time 2016/12/2 10:15
 	 */
-	ShopIntroduction getShopIntroductionByUserId(Long userId);
-
+	public ShopOutput getShopByShopId(Long shopId);
 	/**
-	 * 根据二级域名查询店铺信息
-	 * @param domain
-	 * @return
-	 * @createTime 2015年6月25日 下午3:42:24
-	 * @author zhangshirui
+	 * @comment 多字段条件查询店铺信息
+	 * @param shopListInput 多字段条件查询
+	 * @return ShopOutput
+	 * @author kelan
+	 * @time 2016/11/30 10:00
 	 */
-	ShopInfo getShopInfoByDomain(String domain);
-
-
-
+	public ShopOutput getShopInfo(ShopListInput shopListInput);
 	/**
-	 * 根据用户信息查询店铺信息
-	 * @param userId
-	 * @return
-	 * @createTime 2015年8月1日 上午10:53:23
-	 * @author zhangshirui
+	 * @comment 修改店铺基本信息
+	 * @param shopUpdateInput
+	 * @return Integer
+	 * @author kelan
+	 * @time 2016/11/30 15:43
 	 */
-	ShopInfo getShopInfoByUser(Long userId);
+	public  Boolean modifyShopBasicInfo(ShopUpdateInput shopUpdateInput);
  
 }
+package com.diligrp.mobsite.getway.rpc.buyer;
+
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
+
+public interface BuyerOrderRPCService {
+
+	SubmitOrderResp submit(SubmitOrderReq req);
+
+	PayOrderResp pay(PayOrderReq req);
+
+	BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req);
+
+	BuyerCancelOrderResp cancel(BuyerCancelOrderReq req);
+
+}
+package com.diligrp.mobsite.getway.rpc.buyer.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.b2c.orders.domain.client.dto.request.BuyerCancelRequestDto;
+import com.b2c.orders.domain.client.dto.request.BuyerConfirmRequestDto;
+import com.b2c.orders.domain.client.dto.request.OrderItemDto;
+import com.b2c.orders.domain.client.dto.request.PayOrderRequestDto;
+import com.b2c.orders.domain.client.dto.request.SubmitOrderRequestDto;
+import com.b2c.orders.domain.client.dto.response.ApiDataResponse;
+import com.b2c.orders.domain.client.dto.response.ApiResponse;
+import com.b2c.orders.domain.client.dto.response.SubmitOrderResponseDto;
+import com.b2c.orders.domain.client.service.OrderService;
+import com.diligrp.mobsite.getway.domain.common.ResultCode;
+import com.diligrp.mobsite.getway.domain.protocol.OrderItem;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
+import com.diligrp.mobsite.getway.rpc.buyer.BuyerOrderRPCService;
+
+@Service
+public class BuyerOrderRPCServiceBean implements BuyerOrderRPCService {
+
+	@Resource
+	private OrderService orderService;
+
+	@Override
+	public SubmitOrderResp submit(SubmitOrderReq req) {
+		SubmitOrderResp resp = new SubmitOrderResp();
+		SubmitOrderRequestDto request = new SubmitOrderRequestDto();
+		request.setBuyerMemo(req.getBuyerMemo());
+		request.setDeliveryAddress(req.getDeliveryAddress());
+		request.setDeliveryTime(req.getDeliveryTime());
+		request.setDeliveryType(req.getDeliveryType());
+		request.setMarketId(req.getMarketId());
+		List<OrderItemDto> orderItems = new ArrayList<>(req.getOrderItems().size());
+		for (OrderItem item : req.getOrderItems()) {
+			OrderItemDto dto = new OrderItemDto();
+			dto.setAmount(item.getAmount());
+			dto.setSku(item.getSku());
+			orderItems.add(dto);
+		}
+		request.setOrderItems(orderItems);
+		request.setReceiverName(req.getReceiverName());
+		request.setReceiverPhoneNumber(req.getReceiverPhoneNumber());
+		request.setReservationTime(req.getReservationTime());
+		request.setShopBuyerId(req.getShopBuyerId());
+		ApiDataResponse<SubmitOrderResponseDto> response = this.orderService.submit(request);
+		if (response == null) {
+			resp.setCode(ResultCode.NETWORK_FAILED);
+			return resp;
+		}
+		if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+			SubmitOrderResponseDto data = response.getData();
+			resp.setOrderId(data.getOrderId());
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		return resp;
+	}
+
+	@Override
+	public PayOrderResp pay(PayOrderReq req) {
+		PayOrderResp resp = new PayOrderResp();
+		PayOrderRequestDto request = new PayOrderRequestDto();
+		request.setOrderId(req.getOrderId());
+		request.setPayType(req.getPayType());
+		ApiResponse response = this.orderService.pay(request);
+		if (response == null) {
+			resp.setCode(ResultCode.NETWORK_FAILED);
+			return resp;
+		}
+		if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		return resp;
+	}
+
+	@Override
+	public BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req) {
+		BuyerConfirmReceiptResp resp = new BuyerConfirmReceiptResp();
+		BuyerConfirmRequestDto request = new BuyerConfirmRequestDto();
+		request.setOrderId(req.getOrderId());
+		ApiResponse response = this.orderService.buyerConfirm(request);
+		if (response == null) {
+			resp.setCode(ResultCode.NETWORK_FAILED);
+			return resp;
+		}
+		if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		return resp;
+	}
+
+	@Override
+	public BuyerCancelOrderResp cancel(BuyerCancelOrderReq req) {
+		BuyerCancelOrderResp resp = new BuyerCancelOrderResp();
+		BuyerCancelRequestDto request = new BuyerCancelRequestDto();
+		request.setOrderId(req.getOrderId());
+		request.setShopBuyerId(req.getShopBuyerId());
+		ApiResponse response = this.orderService.cancel(request);
+		if (response == null) {
+			resp.setCode(ResultCode.NETWORK_FAILED);
+			return resp;
+		}
+		if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		return resp;
+	}
+
+}
+package com.diligrp.mobsite.getway.rpc.impl;
+
+import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerDetail;
+import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerListInput;
+import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
+import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerKeyOutput;
+import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerOutput;
+import com.b2c.myapp.common.utils.BaseOutput;
+import com.b2c.myapp.common.utils.base.Page;
+import com.b2c.myapp.sdk.MyAppClient;
+import com.diligrp.mobsite.getway.domain.except.ServiceException;
+import com.diligrp.mobsite.getway.rpc.ShopBuyerRPC;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * Created by jiangchengyong on 2017/1/10.
+ */
+@Service
+public class ShopBuyerRPCImpl implements ShopBuyerRPC {
+    private final static Logger log = Logger.getLogger(ShopBuyerRPCImpl.class);
+    @Resource
+    private MyAppClient myAppClient;
+    /**
+     * @param shopBuyerDetail 店铺买家对象
+     * @return BaseOutput<List<ShopBuyerOutput>>
+     * @comment 查找店铺所有买家列表
+     * @author kelan
+     * @time 2016/12/1 9:59
+     */
+    @Override
+    public Page<ShopBuyerDetailOutput> queryShopAllBuyerList(ShopBuyerDetail shopBuyerDetail) {
+        BaseOutput<Page<ShopBuyerDetailOutput>> output = null;
+        boolean flag = false;
+        try {
+            output = myAppClient.getShopBuyerService().queryShopAllBuyerList(shopBuyerDetail);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            log.error("查找店铺所有买家列表接口出错：msg={}",e);
+            throw new ServiceException();
+        }
+        return null;
+    }
+
+    /**
+     * 绑定并激活（查询买家是否绑定相关店铺，未绑定直接绑定，已绑定直接激活）
+     *
+     * @param buyerId
+     * @param promoCode
+     * @return
+     */
+    @Override
+    public ShopBuyerOutput bindAndActivate(Long buyerId, Long promoCode) {
+        BaseOutput<ShopBuyerOutput> output = null;
+        boolean flag = false;
+        try {
+            output = myAppClient.getShopBuyerService().bindAndActivate(buyerId,promoCode);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            log.error("绑定并激活接口出错：msg={}",e);
+            throw new ServiceException();
+        }
+
+        return null;
+    }
+
+    /**
+     * 获取店铺用户的相关主键信息（buyId、shopId、sellerId）
+     *
+     * @param shopBuyerId
+     * @return
+     */
+    @Override
+    public ShopBuyerKeyOutput getShopBuyerKeys(Long shopBuyerId) {
+        BaseOutput<ShopBuyerKeyOutput> output = null;
+        boolean flag = false;
+        try {
+            output = myAppClient.getShopBuyerService().getShopBuyerKeys(shopBuyerId);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            log.error("获取店铺用户的相关主键信息接口出错：msg={}",e);
+            throw new ServiceException();
+        }
+
+        return null;
+    }
+}
 package com.diligrp.mobsite.getway.rpc.impl;
  
+import com.b2c.myapp.common.api.shop.input.ShopListInput;
+import com.b2c.myapp.common.api.shop.input.ShopSaveInput;
+import com.b2c.myapp.common.api.shop.input.ShopUpdateInput;
+import com.b2c.myapp.common.api.shop.output.ShopOutput;
+import com.b2c.myapp.common.utils.BaseOutput;
+import com.b2c.myapp.sdk.MyAppClient;
+import com.diligrp.mobsite.getway.domain.common.ResultCode;
+import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
 import com.diligrp.mobsite.getway.domain.protocol.ShopIntroduction;
 import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
@@ -8,6 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
  
+import javax.annotation.Resource;
 import java.util.List;
  
 /**
@@ -15,42 +24,123 @@ import java.util.List;
  * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
- * @createTime 2015年6月10日 下午1:40:41
- * @author zhangshirui
+ * @createTime 2017年1月10日 下午1:40:41
+ * @author jiangchengyong
  */
 @Service
 public class ShopRPCImpl implements ShopRPC {
  
 	private Logger logger = LoggerFactory.getLogger(ShopRPCImpl.class);
  
+	@Resource
+	private MyAppClient myAppClient;
+	/**
+	 * @param shopSaveInput 店铺基本信息
+	 * @return Integer
+	 * @comment 创建店铺
+	 * @author jiangchengyong
+	 * @time 2016/11/29 19:03
+	 */
 	@Override
-	public List<ProductCategory> getShopCategory(Long shopId) {
+	public Integer createShopInfo(ShopSaveInput shopSaveInput) {
+		BaseOutput<Integer> output = null;
+		try{
+			output = myAppClient.getShopInfoService().createShopInfo(shopSaveInput);
+			if(output.getCode().equals(200)){
+				return output.getData();
+			}
+		}catch (Exception e){
+			logger.info("调用创建店铺接口出错：",e);
+			throw new ServiceException(ResultCode.NETWORK_FAILED);
+		}
 		return null;
 	}
  
+	/**
+	 * @param sellerId 卖家id
+	 * @return ShopOutput
+	 * @comment 通过卖家id获取店铺信息
+	 * @author jiangchengyong
+	 * @time 2016/11/29 18:54
+	 */
 	@Override
-	public List<Long> getRecommendProducts(Long shopId) {
+	public ShopOutput getShopBySellerId(Long sellerId) {
+		BaseOutput<ShopOutput> output = null;
+		try{
+			output = myAppClient.getShopInfoService().getShopBySellerId(sellerId);
+			if(output.getCode().equals(200)){
+				return output.getData();
+			}
+		}catch (Exception e){
+			logger.info("调用通过卖家id获取店铺信息接口出错：",e);
+			throw new ServiceException(ResultCode.NETWORK_FAILED);
+		}
 		return null;
 	}
  
+	/**
+	 * @param shopId 店铺id
+	 * @return ShopOutput
+	 * @comment 通过店铺id获取店铺信息
+	 * @author jiangchengyong
+	 * @time 2016/12/2 10:15
+	 */
 	@Override
-	public ShopIntroduction getShopIntroductionById(Long shopId) {
+	public ShopOutput getShopByShopId(Long shopId) {
+		BaseOutput<ShopOutput> output = null;
+		try{
+			output = myAppClient.getShopInfoService().getShopByShopId(shopId);
+			if(output.getCode().equals(200)){
+				return output.getData();
+			}
+		}catch (Exception e){
+			logger.info("调用通过店铺id获取店铺信息接口出错：",e);
+			throw new ServiceException(ResultCode.NETWORK_FAILED);
+		}
 		return null;
 	}
  
+	/**
+	 * @param shopListInput 多字段条件查询
+	 * @return ShopOutput
+	 * @comment 多字段条件查询店铺信息
+	 * @author jiangchengyong
+	 * @time 2016/11/30 10:00
+	 */
 	@Override
-	public ShopIntroduction getShopIntroductionByUserId(Long userId) {
+	public ShopOutput getShopInfo(ShopListInput shopListInput) {
+		BaseOutput<ShopOutput> output = null;
+		try{
+			output = myAppClient.getShopInfoService().getShopInfo(shopListInput);
+			if(output.getCode().equals(200)){
+				return output.getData();
+			}
+		}catch (Exception e){
+			logger.info("调用多字段条件查询店铺信息接口出错：",e);
+			throw new ServiceException(ResultCode.NETWORK_FAILED);
+		}
 		return null;
 	}
  
+	/**
+	 * @param shopUpdateInput
+	 * @return Integer
+	 * @comment 修改店铺基本信息
+	 * @author jiangchengyong
+	 * @time 2016/11/30 15:43
+	 */
 	@Override
-	public ShopInfo getShopInfoByDomain(String domain) {
+	public Boolean modifyShopBasicInfo(ShopUpdateInput shopUpdateInput) {
+		BaseOutput<Boolean> output = null;
+		try{
+			output = myAppClient.getShopInfoService().modifyShopBasicInfo(shopUpdateInput);
+			if(output.getCode().equals(200)){
+				return output.getData();
+			}
+		}catch (Exception e){
+			logger.info("调用修改店铺基本信息接口出错：",e);
+			throw new ServiceException(ResultCode.NETWORK_FAILED);
+		}
 		return null;
 	}
-
-	@Override
-	public ShopInfo getShopInfoByUser(Long userId) {
-		return null;
-	}
-
 }
+package com.diligrp.mobsite.getway.rpc.seller;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.takeOrderReq;
+
+/**
+ * <B>Description</B> 订单 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * 
+ * @createTime 2014年9月1日 下午6:30:54
+ * @author duanyugen
+ */
+public interface SellerOrderRPC {
+
+	GetOrderListResp getOrders(GetOrderListReq req);
+
+	GetOrderDetailResp getOrderById(GetOrderDetailReq req);
+
+	SearchOrderListResp searchOrders(SearchOrderListReq req);
+
+	ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req);
+
+	BaseResp takeOrder(takeOrderReq req);
+
+	RefuseQuoteResp refuseOrder(RefuseQuoteReq req);
+
+}
+package com.diligrp.mobsite.getway.rpc.seller.impl;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import com.b2c.orders.domain.client.dto.request.OrderDetailRequestDto;
+import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;
+import com.b2c.orders.domain.client.dto.request.SellerConfirmRequestDto;
+import com.b2c.orders.domain.client.dto.request.SellerRefuseRequestDto;
+import com.b2c.orders.domain.client.dto.request.TakeOrderRequestDto;
+import com.b2c.orders.domain.client.dto.response.ApiDataResponse;
+import com.b2c.orders.domain.client.dto.response.ApiPageDataResponse;
+import com.b2c.orders.domain.client.dto.response.ApiResponse;
+import com.b2c.orders.domain.client.dto.response.OrderDetailResponseDto;
+import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;
+import com.b2c.orders.domain.client.service.OrderService;
+import com.diligrp.mobsite.getway.domain.common.ResultCode;
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import com.diligrp.mobsite.getway.domain.protocol.Order;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.takeOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.model.SellerOrder;
+import com.diligrp.mobsite.getway.rpc.seller.SellerOrderRPC;
+
+/**
+ * <B>Description</B> 订单rpc <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
+ * <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ *
+ * @author duanyugen
+ * @createTime 2014年9月1日 下午6:31:13
+ */
+@Service("sellerOrderRPC")
+public class SellerOrderRPCImpl implements SellerOrderRPC {
+
+	@Resource
+	private OrderService orderService;
+
+	@Override
+	public GetOrderListResp getOrders(GetOrderListReq req) {
+		OrderListRequestDto request = new OrderListRequestDto();
+		ApiPageDataResponse<OrderListResponseDto> response = this.orderService.list(request);
+		GetOrderListResp resp = new GetOrderListResp();
+		if (response == null) {
+			resp.setCode(ResultCode.NETWORK_FAILED);
+			return resp;
+		}
+		if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+			resp.setMaxPageNum(response.getTotalPage());
+			if (!CollectionUtils.isEmpty(response.getList())) {
+				List<Order> orders = new ArrayList<>(response.getList().size());
+				for (OrderListResponseDto dto : response.getList()) {
+					orders.add(this.convertToOrder(dto));
+				}
+				resp.setOrders(orders);
+			}
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		return resp;
+	}
+
+	private Order convertToOrder(OrderListResponseDto dto) {
+		Order order = new Order();
+		order.setBuyerConfirmTime(dto.getBuyerConfirmTime());
+		order.setBuyerId(dto.getBuyerId());
+		order.setBuyerMemo(dto.getBuyerMemo());
+		order.setDeliveryTime(dto.getDeliveryTime());
+		order.setDeliveryType(dto.getDeliveryType());
+		order.setId(dto.getId());
+		order.setOrderStatus(dto.getOrderStatus());
+		order.setPayStatus(dto.getPayStatus());
+		order.setPayTime(dto.getPayTime());
+		order.setPayType(dto.getPayType());
+		order.setRealTotalPrice(dto.getRealTotalPrice());
+		order.setReservationTime(dto.getReservationTime());
+		order.setSellerId(dto.getSellerId());
+		order.setShopId(dto.getShopId());
+		order.setSubmitTime(dto.getSubmitTime());
+		order.setTotalPrice(dto.getTotalPrice());
+		return order;
+	}
+
+	@Override
+	public GetOrderDetailResp getOrderById(GetOrderDetailReq req) {
+		OrderDetailRequestDto request = new OrderDetailRequestDto();
+		request.setOrderId(req.getOrderId());
+		ApiDataResponse<OrderDetailResponseDto> response = this.orderService.detail(request);
+		GetOrderDetailResp resp = new GetOrderDetailResp();
+		if (response == null) {
+			resp.setCode(ResultCode.NETWORK_FAILED);
+			return resp;
+		}
+		if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+			SellerOrder order = new SellerOrder();
+			DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			OrderDetailResponseDto dto = response.getData();
+			order.setBuyerMemo(dto.getBuyerMemo());
+			if (dto.getDeliveryTime() != null) {
+				order.setDeliveryTime(df.format(dto.getDeliveryTime()));
+			}
+			order.setDeliveryType(dto.getDeliveryType());
+			order.setId(dto.getId());
+			order.setOrderStatus(dto.getOrderStatus());
+			order.setPayStatus(dto.getPayStatus());
+			order.setPayType(dto.getPayType());
+			order.setRealTotalPrice(dto.getRealTotalPrice());
+			order.setReservationTime(dto.getReservationTime());
+			order.setSubmitTime(df.format(dto.getSubmitTime()));
+			order.setTotalPrice(dto.getTotalPrice());
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		return resp;
+	}
+
+	@Override
+	public SearchOrderListResp searchOrders(SearchOrderListReq req) {
+		SearchOrderListResp resp = new SearchOrderListResp();
+		OrderListRequestDto request = new OrderListRequestDto();
+		request.setPage(req.getPageNum());
+		request.setSellerId(req.getUserId());
+		ApiPageDataResponse<OrderListResponseDto> response = this.orderService.list(request);
+		if (response == null) {
+			resp.setCode(ResultCode.NETWORK_FAILED);
+			return resp;
+		}
+		if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+			resp.setMaxPageNum(response.getTotalPage());
+			if (!CollectionUtils.isEmpty(response.getList())) {
+				List<Order> orders = new ArrayList<>(response.getList().size());
+				for (OrderListResponseDto dto : response.getList()) {
+					orders.add(this.convertToOrder(dto));
+				}
+				resp.setOrders(orders);
+			}
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		return resp;
+	}
+
+	@Override
+	public ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req) {
+		ConfirmReceiptMoneyResp resp = new ConfirmReceiptMoneyResp();
+		SellerConfirmRequestDto request = new SellerConfirmRequestDto();
+		request.setOrderId(req.getOrderId());
+		request.setSellerId(req.getUserId());
+		ApiResponse response = this.orderService.sellerConfirm(request);
+		if (response == null) {
+			resp.setCode(ResultCode.NETWORK_FAILED);
+			return resp;
+		}
+		if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		resp.setResp(response.getCode());
+		return resp;
+	}
+
+	@Override
+	public BaseResp takeOrder(takeOrderReq req) {
+		BaseResp resp = new BaseResp();
+		TakeOrderRequestDto request = new TakeOrderRequestDto();
+		request.setOrderId(req.getOrderId());
+		request.setSellerId(req.getUserId());
+		request.setTotalPrice(req.getPricePrivilege());
+		ApiResponse response = this.orderService.take(request);
+		if (response != null && response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		return resp;
+	}
+
+	@Override
+	public RefuseQuoteResp refuseOrder(RefuseQuoteReq req) {
+		RefuseQuoteResp resp = new RefuseQuoteResp();
+		SellerRefuseRequestDto request = new SellerRefuseRequestDto();
+		request.setOrderId(req.getOrderId());
+		request.setRefuseReason(req.getRefuseReason());
+		request.setSellerId(req.getUserId());
+		ApiResponse response = this.orderService.refuse(request);
+		if (response != null && response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
+			resp.setCode(ResultCode.SUCCESS);
+			resp.setResp(response.getCode());
+		} else {
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+		}
+		resp.setMsg(response.getMessage());
+		return resp;
+	}
+
+}
+package com.diligrp.mobsite.getway.service.buyer;
+
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
+
+public interface BuyerOrderService {
+
+	SubmitOrderResp submit(SubmitOrderReq req);
+
+	PayOrderResp pay(PayOrderReq req);
+
+	BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req);
+
+	BuyerCancelOrderResp cancel(BuyerCancelOrderReq req);
+
+}
+package com.diligrp.mobsite.getway.service.buyer.impl;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
+import com.diligrp.mobsite.getway.rpc.buyer.BuyerOrderRPCService;
+import com.diligrp.mobsite.getway.service.buyer.BuyerOrderService;
+
+@Service
+public class BuyerOrderServiceBean implements BuyerOrderService {
+
+	@Resource
+	private BuyerOrderRPCService buyerOrderService;
+
+	@Override
+	public SubmitOrderResp submit(SubmitOrderReq req) {
+		return this.buyerOrderService.submit(req);
+	}
+
+	@Override
+	public PayOrderResp pay(PayOrderReq req) {
+		return this.buyerOrderService.pay(req);
+	}
+
+	@Override
+	public BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req) {
+		return this.buyerOrderService.confirmReceipt(req);
+	}
+
+	@Override
+	public BuyerCancelOrderResp cancel(BuyerCancelOrderReq req) {
+		return this.buyerOrderService.cancel(req);
+	}
+
+}
@@ -26,8 +26,6 @@ import javax.annotation.Resource;
 public class OrderServiceImpl implements OrderService {
  
 	@Resource
-	private OrderRPC orderRPC;
-	@Resource
 	private UserRPC userRPC;
 	@Resource
 	private GoodsRPC goodsRPC;
@@ -9,9 +9,9 @@ import com.diligrp.mobsite.getway.domain.protocol.fund.*;
 public interface FundService {
  
  
-    public GetFundsResp getFunds(GetFundsReq req) ;
+    public GetFundsResp getFunds(GetFundsReq fundsReq) ;
  
-    FundTradeResp fundTrade(FundTradeReq req);
+    FundTradeResp storeValue(Long price);
  
     GetfundTradeRecordResp getfundTradeRecord(GetfundTradeRecordReq req);
 }
 package com.diligrp.mobsite.getway.service.seller.impl;
  
+import com.b2c.myapp.common.api.shop.output.ShopOutput;
+import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerDetail;
+import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerListInput;
+import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
+import com.b2c.myapp.common.utils.base.Page;
 import com.diligrp.mobsite.getway.domain.protocol.fund.*;
+import com.diligrp.mobsite.getway.rpc.ShopBuyerRPC;
+import com.diligrp.mobsite.getway.rpc.ShopRPC;
 import com.diligrp.mobsite.getway.service.seller.FundService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
 /**
@@ -9,13 +17,30 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class FundServiceImpl implements FundService{
+    @Autowired
+    private ShopBuyerRPC shopBuyerRPC;
+    @Autowired
+    private ShopRPC shopRPC;
     @Override
-    public GetFundsResp getFunds(GetFundsReq req) {
-        return null;
+    public GetFundsResp getFunds(GetFundsReq fundsReq) {
+        ShopBuyerDetail shopBuyerDetail = new ShopBuyerDetail();
+        shopBuyerDetail.setShopId(fundsReq.getShopId());
+        shopBuyerDetail.setBuyerMobilePhone(fundsReq.getKeyword());
+        Page<ShopBuyerDetailOutput> shopBuyerDetailOutputPage = shopBuyerRPC.queryShopAllBuyerList(shopBuyerDetail);
+        ShopOutput shopOutput = shopRPC.getShopByShopId(fundsReq.getShopId());
+
+        GetFundsResp fundsResp = new GetFundsResp();
+        fundsResp.setFreezeTotalPrice(shopOutput.getFreezeTotalPrice());
+        fundsResp.setResidueTotalPrice(shopOutput.getResidueTotalPrice());
+        fundsResp.setStoredTotalPrice(shopOutput.getStoredTotalPrice());
+        fundsResp.setShopBuyers(shopBuyerDetailOutputPage.getResult());
+        fundsResp.setMaxPageNum(shopBuyerDetailOutputPage.getPageCount());
+        return fundsResp;
     }
  
     @Override
-    public FundTradeResp fundTrade(FundTradeReq req) {
+    public FundTradeResp storeValue(Long price) {
+
         return null;
     }
  
 package com.diligrp.mobsite.getway.service.seller.impl;
  
+import javax.annotation.Resource;
+
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.saler.order.*;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp;
+import com.diligrp.mobsite.getway.domain.protocol.saler.order.takeOrderReq;
+import com.diligrp.mobsite.getway.rpc.seller.SellerOrderRPC;
 import com.diligrp.mobsite.getway.service.seller.SellerOrderService;
  
-
 /**
  * <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> 地利集团
  *
@@ -17,34 +30,36 @@ import com.diligrp.mobsite.getway.service.seller.SellerOrderService;
 @org.springframework.stereotype.Service("sellerOrderService")
 public class SellerOrderServiceImpl implements SellerOrderService {
  
+	@Resource
+	private SellerOrderRPC sellerOrderRPCService;
  
-  @Override
-  public GetOrderListResp getOrders(GetOrderListReq req) throws Exception {
-    return null;
-  }
+	@Override
+	public GetOrderListResp getOrders(GetOrderListReq req) throws Exception {
+		return this.sellerOrderRPCService.getOrders(req);
+	}
  
-  @Override
-  public GetOrderDetailResp getOrderById(GetOrderDetailReq req) {
-    return null;
-  }
+	@Override
+	public GetOrderDetailResp getOrderById(GetOrderDetailReq req) {
+		return this.sellerOrderRPCService.getOrderById(req);
+	}
  
-  @Override
-  public ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req) {
-    return null;
-  }
+	@Override
+	public ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req) {
+		return this.sellerOrderRPCService.comfirmReceiveMoney(req);
+	}
  
-  @Override
-  public BaseResp takeOrder(takeOrderReq req) {
-    return null;
-  }
+	@Override
+	public BaseResp takeOrder(takeOrderReq req) {
+		return this.sellerOrderRPCService.takeOrder(req);
+	}
  
-  @Override
-  public RefuseQuoteResp refuseOrder(RefuseQuoteReq req) {
-    return null;
-  }
+	@Override
+	public RefuseQuoteResp refuseOrder(RefuseQuoteReq req) {
+		return this.sellerOrderRPCService.refuseOrder(req);
+	}
  
-  @Override
-  public SearchOrderListResp searchOrders(SearchOrderListReq req) {
-    return null;
-  }
+	@Override
+	public SearchOrderListResp searchOrders(SearchOrderListReq req) {
+		return this.sellerOrderRPCService.searchOrders(req);
+	}
 }
@@ -72,7 +72,7 @@
 		<profile>
 			<id>dev</id>
 			<activation>
-				<activeByDefault>false</activeByDefault>
+				<activeByDefault>true</activeByDefault>
 			</activation>
 			<properties>
 				<!-- 显示模板 -->
@@ -214,7 +214,7 @@
 				<website.act.token>token</website.act.token>
  
 				<!-- interface user -->
-				<website.user.baseUrl>http://user.zandeapp.com</website.user.baseUrl>
+				<website.user.baseUrl>http://shopuser.zandeapp.com</website.user.baseUrl>
 				<website.user.token>token</website.user.token>
  
 				<!-- interface order -->
@@ -367,7 +367,7 @@
 				<website.act.token>token</website.act.token>
  
 				<!-- interface user -->
-				<website.user.baseUrl>http://user.zandeapp.com</website.user.baseUrl>
+				<website.user.baseUrl>http://shopuser.zandeapp.com</website.user.baseUrl>
 				<website.user.token>token</website.user.token>
  
 				<!-- interface order -->
@@ -514,7 +514,7 @@
  
  
 				<!-- interface user -->
-				<website.user.baseUrl>http://user.zandeapp.com</website.user.baseUrl>
+				<website.user.baseUrl>http://shopuser.zandeapp.com</website.user.baseUrl>
 				<website.user.token>token</website.user.token>
  
 				<!-- interface order -->
@@ -646,7 +646,7 @@
         <dependency>
             <groupId>com.diligrp</groupId>
             <artifactId>passport-client</artifactId>
-            <version>0.0.3</version>
+            <version>0.0.9-SNAPSHOT</version>
         </dependency>
  
         <!-- 权限拦截器 -->
 package com.diligrp.mobsite.getway.web.api.base;
  
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.codec.binary.Base64;
+import org.nutz.json.Json;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.dili.dataStored.sdk.common.DataStoredService;
 import com.diligrp.mobsite.getway.domain.common.Constant;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 import com.diligrp.mobsite.getway.web.utils.DESUtil;
 import com.diligrp.mobsite.getway.web.utils.WebContent;
 import com.diligrp.website.util.security.Validator;
-import org.apache.commons.codec.binary.Base64;
-import org.nutz.json.Json;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
  
 /**
  * <B>Description</B> 网关controller <br />
@@ -41,9 +41,6 @@ public abstract class BaseApiController {
     @Value("${getway.log.isPrintParam}")
     private boolean isPrintParam;
  
-    @Resource
-    private DataStoredService dataStoredService;
-
     protected void sendError(int code, String message) {
         try {
             BaseResp resp = new BaseResp();
+package com.diligrp.mobsite.getway.web.api.buyer.order;
+
+import javax.annotation.Resource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
+import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
+import com.diligrp.mobsite.getway.service.buyer.BuyerOrderService;
+import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
+
+import io.swagger.annotations.Api;
+
+@RestController
+@RequestMapping(value = "/mobsiteApp/buyer/order", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "/mobsiteApp-order-buyer", description = "订单接口-买家")
+public class BuyerOrderController extends BaseApiController {
+
+	private static final Logger log = LoggerFactory.getLogger(BuyerOrderController.class);
+
+	@Resource
+	private BuyerOrderService buyerOrderService;
+
+	/**
+	 * 提交订单
+	 * 
+	 * @param req
+	 */
+	@RequestMapping(value = "/submit", method = RequestMethod.POST)
+	public void submit(@RequestBody SubmitOrderReq req) {
+		try {
+			SubmitOrderResp resp = buyerOrderService.submit(req);
+			super.sendSuccessResp(resp);
+		} catch (Exception e) {
+			log.error("提交订单失败", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	@RequestMapping(value = "/pay", method = RequestMethod.POST)
+	public void pay(@RequestBody PayOrderReq req) {
+		try {
+			PayOrderResp resp = buyerOrderService.pay(req);
+			super.sendSuccessResp(resp);
+		} catch (Exception e) {
+			log.error("提交订单失败", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	@RequestMapping(value = "/confirmReceipt")
+	public void confirmReceipt(@RequestBody BuyerConfirmReceiptReq req) {
+		try {
+			BuyerConfirmReceiptResp resp = buyerOrderService.confirmReceipt(req);
+			super.sendSuccessResp(resp);
+		} catch (Exception e) {
+			log.error("提交订单失败", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+	@RequestMapping(value = "/cancel", method = RequestMethod.POST)
+	public void cancel(@RequestBody BuyerCancelOrderReq req) {
+		try {
+			BuyerCancelOrderResp resp = buyerOrderService.cancel(req);
+			super.sendSuccessResp(resp);
+		} catch (Exception e) {
+			log.error("提交订单失败", e);
+			super.sendError(e.getMessage());
+		}
+	}
+}
-package com.diligrp.mobsite.getway.web.api.buyer.user;
-
-import com.diligrp.mobsite.getway.domain.except.ServiceException;
-import com.diligrp.mobsite.getway.domain.protocol.order.*;
-import com.diligrp.mobsite.getway.service.buyer.user.OrderService;
-import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
-import com.diligrp.mobsite.getway.web.utils.BeanValidator;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-
-/**
- * <B>Description</B> 订单操作 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年9月1日 下午2:30:41
- * @author weili
- */
-@Controller
-@RequestMapping("/mobsiteApp/order/")
-@Api(value = "mobsiteApp-order", description = "订单接口-买家")
-public class OrderController extends BaseApiController {
-
-    @Resource
-    private OrderService orderService;
-
-    private static Logger log = Logger.getLogger(OrderController.class);
-
-    /**
-     * 获取订单列表
-     *
-     * 请求协议体：SearchOrderReq
-     * 返回协议体：SearchOrderResp
-     *
-     * @createTime 2014年9月1日 下午5:32:02
-     * @author weili
-     * @return
-     */
-    @ApiOperation(value = "获取订单列表", httpMethod = "POST",response = SearchOrderResp.class)
-    @RequestMapping(value = "/getOrders",method = RequestMethod.POST)
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",name = "temp",dataType = "SearchOrderReq")
-    })
-    @ResponseBody
-    public void getOrders(@RequestBody SearchOrderReq temp){
-
-        SearchOrderReq req = super.getRequest(SearchOrderReq.class);
-        try {
-            SearchOrderResp resp = orderService.getOrders(req);
-            super.sendSuccessResp(resp);
-        }catch (ServiceException e) {
-            log.error("获取订单列表出现业务异常", e);
-            super.sendError(e.getCode(), e.getMessage());
-        }catch (Exception e) {
-            log.error("获取订单列表失败", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-    /**
-     * 根据订单id查询订单
-     *
-     * 请求协议体：GetOrderReq
-     * 返回协议体：GetOrderResp
-     *
-     * @createTime 2014年9月1日 下午6:39:10
-     * @author weili
-     */
-    @ApiOperation(value = "根据订单id查询订单", httpMethod = "POST",response = GetOrderResp.class)
-    @RequestMapping(value = "/getOrderById",method = RequestMethod.POST)
-    @ResponseBody
-    public void getOrderById(@RequestBody GetOrderReq temp){
-
-        GetOrderReq req = super.getRequest(GetOrderReq.class);
-        try {
-            GetOrderResp resp = orderService.getOrderById(req);
-            super.sendSuccessResp(resp);
-        }catch (ServiceException e) {
-            log.error("获取订单详情出现业务异常", e);
-            super.sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            log.error("获取订单详情失败", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-
-	/**
-	 * 提交订单
-	 *
-	 * 请求协议体：SubmitOrderReq
-	 * 返回协议体：SubmitOrderResp
-	 *
-	 * @createTime 2014年9月1日 下午6:05:23
-	 * @author weili
-	 */
-    @ApiOperation(value = "提交订单", httpMethod = "POST",response = SubmitOrderResp.class)
-    @RequestMapping(value = "/submitOrder",method = RequestMethod.POST)
-    @ResponseBody
-    public void submitOrder(HttpServletRequest request,@RequestBody SubmitOrderReq temp){
-
-		SubmitOrderReq req = super.getRequest(SubmitOrderReq.class);
-		try {
-            BeanValidator.validator(req);
-			SubmitOrderResp resp = orderService.submitOrderNew(req);
-			//try {
-			//	log.info(String.format("提交订单：[ 设备id<%s>用户id<%s>订单id<%s>]"
-			//			, req.getDeviceId(), req.getUserId(), resp.getOrderInfos().ge getOrderId(),  );
-			//}catch (Exception e) {
-			//	log.error("记录下单日志出错！");
-			//}
-			super.sendSuccessResp(resp);
-		} catch (ServiceException e) {
-			log.error("提交订单出现业务异常", e);
-			super.sendError(e.getCode(), e.getMessage());
-		} catch (Exception e) {
-			log.error("提交订单失败", e);
-			super.sendError(e.getMessage());
-		}
-	}
-
-    /**
-     * 付款
-     *
-     * 请求协议体：paymentreq
-     * 返回协议体：PaymentResp
-     *
-     * @createTime 2014年9月1日 下午6:05:23
-     * @author weili
-     */
-    @ApiOperation(value = "支付", httpMethod = "POST",response = PaymentResp.class)
-    @RequestMapping(value = "/payment",method = RequestMethod.POST)
-    @ResponseBody
-    public void payment(@RequestBody PaymentReq temp){
-        PaymentReq req = super.getRequest(PaymentReq.class);
-        try {
-            BeanValidator.validator(req);
-            PaymentResp resp = orderService.payment(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e) {
-            log.error("录入线下付款信息出现业务异常", e);
-            super.sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            log.error("录入线下付款信息失败", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-
-
-
-    /**
-     * 取消订单
-     *
-     * 请求协议体：CancelOrderReq
-     * 返回协议体：CancelOrderResp
-     *
-     * @createTime 2014年9月1日 下午6:08:06
-     * @author weili
-     */
-    @ApiOperation(value = "取消订单", httpMethod = "POST",response = CancelOrderResp.class)
-    @RequestMapping(value = "/cancelOrder",method = RequestMethod.POST)
-    @ResponseBody
-    public void cancelOrder(@RequestBody CancelOrderReq temp){
-
-        CancelOrderReq req = super.getRequest(CancelOrderReq.class);
-        try {
-            CancelOrderResp resp = orderService.cancelOrder(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e) {
-            log.error("取消订单出现业务异常", e);
-            super.sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            log.error("取消订单失败", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-    /**
-     * 取消订单
-     *
-     * 请求协议体：CancelOrderReq
-     * 返回协议体：CancelOrderResp
-     *
-     * @createTime 2014年9月1日 下午6:08:06
-     * @author weili
-     */
-    @ApiOperation(value = "删除订单", httpMethod = "POST",response = DelOrderResp.class)
-    @RequestMapping(value = "/delOrder",method = RequestMethod.POST)
-    @ResponseBody
-    public void delOrder(@RequestBody DelOrderReq temp){
-
-        DelOrderReq req = super.getRequest(DelOrderReq.class);
-        try {
-            DelOrderResp resp = orderService.delOrder(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e) {
-            log.error("取消订单出现业务异常", e);
-            super.sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            log.error("取消订单失败", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-
-    /**
-     * 确认收货
-     *
-     * 请求协议体：ConfirmPickUpReq
-     * 返回协议体：ConfirmPickUpResp
-     *
-     * @createTime 2014年9月1日 下午6:16:05
-     * @author weili
-     */
-    @ApiOperation(value = "确认收货", httpMethod = "POST",response = ConfirmPickUpResp.class)
-    @RequestMapping(value = "/confirmPickUp",method = RequestMethod.POST)
-    @ResponseBody
-    public void confirmPickUp(@RequestBody ConfirmPickUpReq temp){
-        ConfirmPickUpReq req = super.getRequest(ConfirmPickUpReq.class);
-        try {
-            ConfirmPickUpResp resp = orderService.confirmPickUp(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e) {
-            log.error("确认收货出现业务异常", e);
-            super.sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            log.error("确认收货失败", e);
-            super.sendError(e.getMessage());
-        }
-    }
-
-
-
-
-}
@@ -5,13 +5,11 @@ import com.diligrp.mobsite.getway.domain.protocol.fund.*;
 import com.diligrp.mobsite.getway.service.seller.FundService;
 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
  
@@ -43,11 +41,9 @@ public class FundController extends BaseApiController{
     @ApiOperation(value = "获取储值列表", httpMethod = "POST",response = GetFundsResp.class)
     @RequestMapping(value = "/getFunds",method = RequestMethod.POST)
     @ResponseBody
-    public void getFunds() {
-
-        GetFundsReq req = super.getRequest(GetFundsReq.class);
+    public void getFunds(@ModelAttribute GetFundsReq fundsReq) {
         try {
-            GetFundsResp resp = fundService.getFunds(req);
+            GetFundsResp resp = fundService.getFunds(fundsReq);
             super.sendSuccessResp(resp);
         } catch (ServiceException e) {
             log.error("获取储值列表出现业务异常", e);
@@ -70,13 +66,14 @@ public class FundController extends BaseApiController{
      * @author weili
      */
     @ApiOperation(value = "储值卡操作", httpMethod = "POST",response = FundTradeResp.class)
-    @RequestMapping(value = "/fundTrade",method = RequestMethod.POST)
+    @ApiImplicitParam(paramType = "query",name = "price",dataType = "Long", required = true, value = "储值金额")
+    @RequestMapping(value = "/storeValue",method = RequestMethod.POST)
     @ResponseBody
-    public void fundTrade(@RequestBody FundTradeReq temp) {
+    public void storeValue(Long price) {
  
         FundTradeReq req = super.getRequest(FundTradeReq.class);
         try {
-            FundTradeResp resp = fundService.fundTrade(req);
+            FundTradeResp resp = fundService.storeValue(price);
             super.sendSuccessResp(resp);
         } catch (ServiceException e) {
             log.error("获取储值列表出现业务异常", e);
@@ -244,11 +244,11 @@
  
  
  
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.diligrp.dataStored</groupId>
 			<artifactId>dataStored-sdk</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
+		</dependency> -->
  
 		<!--<dependency>-->
 			<!--<groupId>com.diligrp</groupId>-->