资金和收货地址

jiangchengyong
1 parent 1ec2af62
Showing 29 changed files with 394 additions and 372 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/cart/DelConsigneeResp.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/pickinfo/DelPickInfoResp.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/PickInfoRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/UserRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/PickInfoRPCImpl.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/UserRPCImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/pickinfo/PickInfoService.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/pickinfo/impl/PickInfoServiceImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/settle/ConsigneeService.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/settle/impl/ConsigneeServiceImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/OrderServiceImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/FundServiceImpl.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/fund/FundController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/order/SellerOrderController.java
-package com.diligrp.mobsite.getway.domain.protocol.cart;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Description</B> 删除关注品类resp <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author wujianjun
- * @createTime 2014/8/28 10:37
- */
-@SuppressWarnings("serial")
-public class DelConsigneeResp extends BaseResp {
-}
@@ -11,6 +11,8 @@ public class GetFundsReq extends BaseReq {
     private String keyword;
     @ApiModelProperty(value="店铺ID")
     private Long shopId;
+    @ApiModelProperty(value = "页码")
+    private Integer pageNum;
     public String getKeyword() {
         return keyword;
@@ -27,4 +29,12 @@ public class GetFundsReq extends BaseReq {
     public void setShopId(Long shopId) {
         this.shopId = shopId;
     }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
 }
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
@@ -13,7 +13,7 @@ import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  * @createTime 2014/8/28 10:23
  */
 @SuppressWarnings("serial")
-public class AddConsigneeReq extends BaseReq {
+public class AddPickInfoReq extends BaseReq {
     private ConsigneeInfo consigneeInfo;
     public ConsigneeInfo getConsigneeInfo() {
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
@@ -12,7 +12,7 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  * @createTime 2014/8/28 10:32
  */
 @SuppressWarnings("serial")
-public class AddConsigneeResp extends BaseResp{
+public class AddPickInfoResp extends BaseResp{
     private Long id;
     public Long getId() {
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,16 +13,9 @@ import io.swagger.annotations.ApiModelProperty;
  * @createTime 2014/8/28 10:36
  */
 @SuppressWarnings("serial")
-public class DelConsigneeReq extends BaseReq {
-	/**
-     * 提货人ID
-     */
-    @ApiModelProperty(value = "收货人id",required = true)
+public class DelPickInfoReq extends BaseReq {
+    @ApiModelProperty(value = "收货信息id",required = true)
     private Long id;
-    /**
-     * 是否是默认
-     */
-    private Integer isDefault;
     public Long getId() {
         return id;
@@ -31,12 +24,4 @@ public class DelConsigneeReq extends BaseReq {
     public void setId(Long id) {
         this.id = id;
     }
-    
-    public Integer getIsDefault() {
-		return isDefault;
-	}
-
-	public void setIsDefault(Integer isDefault) {
-		this.isDefault = isDefault;
-	}
 }
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * Created by jiangchengyong on 2017/1/12.
+ */
+public class DelPickInfoResp extends BaseResp {
+}
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
@@ -12,5 +12,5 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  * @createTime 2014/8/28 10:38
  */
 @SuppressWarnings("serial")
-public class GetDefaultConsigneeReq extends BaseReq{
+public class GetDefaultPickInfoReq extends BaseReq{
 }
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
+import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
 /**
  * <B>Description</B> 获取默认提货人 <br />
@@ -13,17 +13,17 @@ import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  * @createTime 2014/8/28 10:39
  */
 @SuppressWarnings("serial")
-public class GetDefaultConsigneeResp extends BaseResp{
+public class GetDefaultPickInfoResp extends BaseResp{
     /**
      * 提货人信息
      */
-    private ConsigneeInfo consigneeInfo;
+    private PickingInfoOutput pickingInfoOutput;
-    public ConsigneeInfo getConsigneeInfo() {
-        return consigneeInfo;
+    public PickingInfoOutput getPickingInfoOutput() {
+        return pickingInfoOutput;
     }
-    public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
-        this.consigneeInfo = consigneeInfo;
+    public void setPickingInfoOutput(PickingInfoOutput pickingInfoOutput) {
+        this.pickingInfoOutput = pickingInfoOutput;
     }
 }
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
@@ -12,5 +12,5 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  * @createTime 2014/8/28 10:38
  */
 @SuppressWarnings("serial")
-public class GetConsigneeListReq extends BaseReq {
+public class GetPickInfoListReq extends BaseReq {
 }
-package com.diligrp.mobsite.getway.domain.protocol.cart;
-
-import java.util.List;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
+import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
+
+import java.util.List;
 /**
  * <B>Description</B> 获取提货人列表响应 <br />
@@ -15,17 +15,10 @@ import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  * @createTime 2014/8/28 10:38
  */
 @SuppressWarnings("serial")
-public class GetConsigneeListResp extends BaseResp {
+public class GetPickInfoListResp extends BaseResp {
     /**
      * 提货人信息列表
      */
-    private List<ConsigneeInfo> consigneeInfos;
-
-    public List<ConsigneeInfo> getConsigneeInfos() {
-        return consigneeInfos;
-    }
+    private List<PickingInfoOutput> pickInfos;
-    public void setConsigneeInfos(List<ConsigneeInfo> consigneeInfos) {
-        this.consigneeInfos = consigneeInfos;
-    }
 }
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,11 +13,8 @@ import io.swagger.annotations.ApiModelProperty;
  * @createTime 2014/8/28 10:36
  */
 @SuppressWarnings("serial")
-public class GetConsigneeReq extends BaseReq {
-    /**
-     * 提货人ID
-     */
-    @ApiModelProperty(value = "收货人id",required = true)
+public class GetPickInfoReq extends BaseReq {
+    @ApiModelProperty(value = "收货人信息id",required = true)
     private Long id;
     public Long getId() {
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
+import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
 /**
  * <B>Description</B> 获取单个提货人响应 <br />
@@ -13,17 +13,17 @@ import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  * @createTime 2014/8/28 10:36
  */
 @SuppressWarnings("serial")
-public class GetConsigneeResp extends BaseResp {
+public class GetPickInfoResp extends BaseResp {
     /**
      * 提货人信息
      */
-    private ConsigneeInfo consigneeInfo;
+    private PickingInfoOutput pickingInfo;
-    public ConsigneeInfo getConsigneeInfo() {
-        return consigneeInfo;
+    public PickingInfoOutput getPickingInfo() {
+        return pickingInfo;
     }
-    public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
-        this.consigneeInfo = consigneeInfo;
+    public void setPickingInfo(PickingInfoOutput pickingInfo) {
+        this.pickingInfo = pickingInfo;
     }
 }
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @createTime 2014/8/28 16:23
  */
 @SuppressWarnings("serial")
-public class SetDefaultConsigneeReq extends BaseReq {
+public class SetDefaultPickInfoReq extends BaseReq {
     /**
      * 提货人信息Id
      */
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
@@ -12,5 +12,5 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  * @createTime 2014/8/28 16:23
  */
 @SuppressWarnings("serial")
-public class SetDefaultConsigneeResp extends BaseResp {
+public class SetDefaultPickInfoResp extends BaseResp {
 }
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
@@ -13,7 +13,7 @@ import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  * @createTime 2014/8/28 10:35
  */
 @SuppressWarnings("serial")
-public class UpdateConsigneeReq extends BaseReq{
+public class UpdatePickInfoReq extends BaseReq{
     /**
      * 提货人信息
      */
-package com.diligrp.mobsite.getway.domain.protocol.cart;
+package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
@@ -12,5 +12,5 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  * @createTime 2014/8/28 10:35
  */
 @SuppressWarnings("serial")
-public class UpdateConsigneeResp extends BaseResp {
+public class UpdatePickInfoResp extends BaseResp {
 }
+package com.diligrp.mobsite.getway.rpc;
+
+import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoSaveInput;
+import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoUpdateInput;
+import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
+
+import java.util.List;
+
+/**
+ * Created by jiangchengyong on 2017/1/12.
+ */
+public interface PickInfoRPC {
+    /**
+     * 新增收货人
+     * @param pickingInfoSaveInput
+     * @return
+     */
+    Integer addPickingInfo(PickingInfoSaveInput pickingInfoSaveInput);
+
+
+    /**
+     * 修改收货人信息
+     * @param pickingInfoUpdateInput
+     * @return
+     */
+    Boolean modify(PickingInfoUpdateInput pickingInfoUpdateInput);
+
+    /**
+     * 按买家ID查询收货人
+     * @param buyerId
+     * @return
+     */
+    List<PickingInfoOutput> queryPickingInfosByBuyerId(Long buyerId);
+    /**
+     * @comment 根据买家id获取默认收货地址
+     * @param buyerId
+     * @return PickingInfoOutput
+     * @author kelan
+     * @time 2016/12/15 10:38
+     */
+    PickingInfoOutput getDefaultPickingInfoByBuyerId(Long buyerId);
+    /**
+     * @comment 删除收货地址（需要判断是否是默认地址）
+     * @param id 收货地址id
+     * @return Boolean
+     * @author kelan
+     * @time 2016/12/16 17:58
+     */
+    public Boolean delPickingInfoById(Long id);
+}
@@ -19,33 +19,6 @@ import java.util.List;
  */
 public interface UserRPC {
-    /**
-     * 
-     * @param id
-     * @param userId
-     * @param type :1-收藏商品,2-店铺收藏
-     * @return
-     * @createTime 2015年6月9日 下午2:21:16
-     * @author zhangshirui
-     */
-    boolean checkFavorites(Long id, Long userId, Integer type);
-
-    /**
-     * 收藏商品和店铺
-     * @param userId
-     * @param type
-     * @param id
-     * @param type:1-收藏商品,2-店铺收藏
-     * @return
-     * @createTime 2014年10月13日 上午11:45:22
-     * @author zhangshirui
-     */
-    boolean addFavorite(Long userId, Long id, Integer type);
-
-    boolean delFavorite(Long userId, Long id, Integer type);
-
-
-
     boolean addShoppingCart(List<AddCartProduct> cartProducts, Long userId);
     /**
@@ -102,21 +75,6 @@ public interface UserRPC {
      */
     boolean modifyPwd(String accountName, String newPassword);
-    Long addConsignee(ConsigneeInfo consigneeInfo, Long userId);
-
-    boolean updateConsignee(ConsigneeInfo consigneeInfo, Long userId);
-
-    ConsigneeInfo getConsignee(Long id);
-
-    boolean delConsignee(Long id);
-
-    List<ConsigneeInfo> getConsigneeByUserId(Long userId);
-
-    ConsigneeInfo getDefaultConsignee(Long userId);
-
-    boolean setDefaultConsignee(Long id, Long userId);
-
-
     /**
      * 密码加密
      * @param pwd
+package com.diligrp.mobsite.getway.rpc.impl;
+
+import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoSaveInput;
+import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoUpdateInput;
+import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
+import com.diligrp.mobsite.getway.rpc.PickInfoRPC;
+
+import java.util.List;
+
+/**
+ * Created by jiangchengyong on 2017/1/12.
+ */
+public class PickInfoRPCImpl implements PickInfoRPC{
+
+
+    /**
+     * 新增收货人
+     *
+     * @param pickingInfoSaveInput
+     * @return
+     */
+    @Override
+    public Integer addPickingInfo(PickingInfoSaveInput pickingInfoSaveInput) {
+        return null;
+    }
+
+    /**
+     * 修改收货人信息
+     *
+     * @param pickingInfoUpdateInput
+     * @return
+     */
+    @Override
+    public Boolean modify(PickingInfoUpdateInput pickingInfoUpdateInput) {
+        return null;
+    }
+
+    /**
+     * 按买家ID查询收货人
+     *
+     * @param buyerId
+     * @return
+     */
+    @Override
+    public List<PickingInfoOutput> queryPickingInfosByBuyerId(Long buyerId) {
+        return null;
+    }
+
+    /**
+     * @param buyerId
+     * @return PickingInfoOutput
+     * @comment 根据买家id获取默认收货地址
+     * @author kelan
+     * @time 2016/12/15 10:38
+     */
+    @Override
+    public PickingInfoOutput getDefaultPickingInfoByBuyerId(Long buyerId) {
+        return null;
+    }
+
+    /**
+     * @param id 收货地址id
+     * @return Boolean
+     * @comment 删除收货地址（需要判断是否是默认地址）
+     * @author kelan
+     * @time 2016/12/16 17:58
+     */
+    @Override
+    public Boolean delPickingInfoById(Long id) {
+        return null;
+    }
+}
@@ -38,7 +38,7 @@ public class UserRPCImpl implements UserRPC {
     @Resource
     private RedisUtil redisUtil;
     @Resource
-    private MyAppClient userClient;
+    private MyAppClient myAppClient;
     @Resource
     private WebsiteClient websiteClient;
     @Resource
@@ -48,21 +48,6 @@ public class UserRPCImpl implements UserRPC {
     private static final Logger logger = LoggerFactory.getLogger(UserRPCImpl.class);
     @Override
-    public boolean checkFavorites(Long id, Long userId, Integer type) {
-        return false;
-    }
-
-    @Override
-    public boolean addFavorite(Long userId, Long id, Integer type) {
-        return false;
-    }
-
-    @Override
-    public boolean delFavorite(Long userId, Long id, Integer type) {
-        return false;
-    }
-
-    @Override
     public boolean addShoppingCart(List<AddCartProduct> cartProducts, Long userId) {
         return false;
     }
@@ -82,7 +67,7 @@ public class UserRPCImpl implements UserRPC {
         BaseOutput<BuyerInfoOutput> output = null;
         boolean flag = false;
         try {
-            output = userClient.getBuyerInfoService().getBuyerInfoByMobilePhone(mobile);
+            output = myAppClient.getBuyerInfoService().getBuyerInfoByMobilePhone(mobile);
         } catch (Exception e) {
             logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
             throw new ServiceException();
@@ -112,41 +97,6 @@ public class UserRPCImpl implements UserRPC {
     }
     @Override
-    public Long addConsignee(ConsigneeInfo consigneeInfo, Long userId) {
-        return null;
-    }
-
-    @Override
-    public boolean updateConsignee(ConsigneeInfo consigneeInfo, Long userId) {
-        return false;
-    }
-
-    @Override
-    public ConsigneeInfo getConsignee(Long id) {
-        return null;
-    }
-
-    @Override
-    public boolean delConsignee(Long id) {
-        return false;
-    }
-
-    @Override
-    public List<ConsigneeInfo> getConsigneeByUserId(Long userId) {
-        return null;
-    }
-
-    @Override
-    public ConsigneeInfo getDefaultConsignee(Long userId) {
-        return null;
-    }
-
-    @Override
-    public boolean setDefaultConsignee(Long id, Long userId) {
-        return false;
-    }
-
-    @Override
     public String getEncryptPwd(String pwd) {
         return null;
     }
@@ -161,7 +111,7 @@ public class UserRPCImpl implements UserRPC {
         BaseOutput<BuyerInfoOutput> output = null;
         boolean flag = false;
         try {
-            output = userClient.getBuyerInfoService().getBuyerInfoByMobilePhone(accountName);
+            output = myAppClient.getBuyerInfoService().getBuyerInfoByMobilePhone(accountName);
         } catch (Exception e) {
             logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
             throw new ServiceException();
+package com.diligrp.mobsite.getway.service.buyer.pickinfo;
+
+import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoSaveInput;
+import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoUpdateInput;
+import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
+import com.diligrp.mobsite.getway.domain.protocol.cart.*;
+import com.diligrp.mobsite.getway.domain.protocol.pickinfo.*;
+
+import java.util.List;
+
+/**
+ * Created by jiangchengyong on 2017/1/12.
+ */
+public interface PickInfoService {
+    /**
+     * 新增收货人
+     * @param req
+     * @return
+     */
+    AddPickInfoResp addPickInfo(AddPickInfoReq req);
+
+    /**
+     * 修改收货人信息
+     * @param req
+     * @return
+     */
+    UpdatePickInfoResp updatePickInfo(UpdatePickInfoReq req);
+
+    /**
+     * 获取单个收货人信息
+     * @param req
+     * @return
+     */
+    GetPickInfoResp getPickInfo(GetPickInfoReq req);
+
+
+    /**
+     * 按收货人信息ID删除收货人
+     * @param req
+     * @return
+     */
+    DelPickInfoResp delPickInfo(DelPickInfoReq req);
+
+    /**
+     * 按买家ID查询收货列表
+     * @param req
+     * @return
+     */
+    GetPickInfoListResp getPickInfoList(GetPickInfoListReq req);
+
+    /**
+     * @comment 根据买家id获取默认收货地址
+     * @param req
+     * @return PickingInfoOutput
+     * @author kelan
+     * @time 2016/12/15 10:38
+     */
+    GetDefaultPickInfoResp getDefaultPickInfo(GetDefaultPickInfoReq req);
+
+    /**
+     * 设置默认
+     * @param consigneeId
+     * @param userId
+     * @return
+     */
+    SetDefaultPickInfoResp setDefault(Long consigneeId,Long userId);
+}
+package com.diligrp.mobsite.getway.service.buyer.pickinfo.impl;
+
+import com.diligrp.mobsite.getway.domain.protocol.pickinfo.*;
+import com.diligrp.mobsite.getway.service.buyer.pickinfo.PickInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by jiangchengyong on 2017/1/12.
+ */
+@Service
+public class PickInfoServiceImpl implements PickInfoService{
+    /**
+     * 新增收货人
+     *
+     * @param req@return
+     */
+    @Override
+    public AddPickInfoResp addPickInfo(AddPickInfoReq req) {
+        return null;
+    }
+
+    /**
+     * 修改收货人信息
+     *
+     * @param req
+     * @return
+     */
+    @Override
+    public UpdatePickInfoResp updatePickInfo(UpdatePickInfoReq req) {
+        return null;
+    }
+
+    /**
+     * 获取单个收货人信息
+     *
+     * @param req
+     * @return
+     */
+    @Override
+    public GetPickInfoResp getPickInfo(GetPickInfoReq req) {
+        return null;
+    }
+
+    /**
+     * 按收货人信息ID删除收货人
+     *
+     * @param req
+     * @return
+     */
+    @Override
+    public DelPickInfoResp delPickInfo(DelPickInfoReq req) {
+        return null;
+    }
+
+    /**
+     * 按买家ID查询收货列表
+     *
+     * @param req
+     * @return
+     */
+    @Override
+    public GetPickInfoListResp getPickInfoList(GetPickInfoListReq req) {
+        return null;
+    }
+
+    /**
+     * @param req
+     * @return PickingInfoOutput
+     * @comment 根据买家id获取默认收货地址
+     * @author kelan
+     * @time 2016/12/15 10:38
+     */
+    @Override
+    public GetDefaultPickInfoResp getDefaultPickInfo(GetDefaultPickInfoReq req) {
+        return null;
+    }
+
+    /**
+     * 设置默认
+     *
+     * @param consigneeId
+     * @param userId
+     * @return
+     */
+    @Override
+    public SetDefaultPickInfoResp setDefault(Long consigneeId, Long userId) {
+        return null;
+    }
+}
-package com.diligrp.mobsite.getway.service.buyer.settle;
-
-import com.diligrp.mobsite.getway.domain.protocol.cart.AddConsigneeReq;
-import com.diligrp.mobsite.getway.domain.protocol.cart.AddConsigneeResp;
-import com.diligrp.mobsite.getway.domain.protocol.cart.DelConsigneeReq;
-import com.diligrp.mobsite.getway.domain.protocol.cart.DelConsigneeResp;
-import com.diligrp.mobsite.getway.domain.protocol.cart.GetConsigneeListReq;
-import com.diligrp.mobsite.getway.domain.protocol.cart.GetConsigneeListResp;
-import com.diligrp.mobsite.getway.domain.protocol.cart.GetConsigneeReq;
-import com.diligrp.mobsite.getway.domain.protocol.cart.GetConsigneeResp;
-import com.diligrp.mobsite.getway.domain.protocol.cart.GetDefaultConsigneeReq;
-import com.diligrp.mobsite.getway.domain.protocol.cart.GetDefaultConsigneeResp;
-import com.diligrp.mobsite.getway.domain.protocol.cart.SetDefaultConsigneeResp;
-import com.diligrp.mobsite.getway.domain.protocol.cart.UpdateConsigneeReq;
-import com.diligrp.mobsite.getway.domain.protocol.cart.UpdateConsigneeResp;
-
-/**
- * <B>Description</B> 提货人接口 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author wujianjun
- * @createTime 2014/8/28 10:34
- */
-public interface ConsigneeService {
-    AddConsigneeResp addConsignee(AddConsigneeReq req);
-
-    UpdateConsigneeResp updateConsignee(UpdateConsigneeReq req);
-
-    GetConsigneeResp getConsignee(GetConsigneeReq req);
-
-    DelConsigneeResp delConsignee(DelConsigneeReq req);
-
-    GetConsigneeListResp getConsigneeList(GetConsigneeListReq req);
- 
-    GetDefaultConsigneeResp getDefaultConsignee(GetDefaultConsigneeReq req);
-
-    SetDefaultConsigneeResp setDefault(Long consigneeId,Long userId);
-}
-package com.diligrp.mobsite.getway.service.buyer.settle.impl;
-
-import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
-import com.diligrp.mobsite.getway.domain.common.ResultCode;
-import com.diligrp.mobsite.getway.domain.except.ServiceException;
-import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
-import com.diligrp.mobsite.getway.domain.protocol.cart.*;
-import com.diligrp.mobsite.getway.rpc.UserRPC;
-import com.diligrp.mobsite.getway.service.buyer.settle.ConsigneeService;
-import com.diligrp.website.util.security.Validator;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <B>Description</B> 提货人业务实现 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author wujianjun
- * @createTime 2014/8/28 14:33
- */
-@Service
-public class ConsigneeServiceImpl implements ConsigneeService {
-
-    @Resource
-    private UserRPC userRPC;
-
-    @Override
-    public AddConsigneeResp addConsignee(AddConsigneeReq req) {
-        Long id =  userRPC.addConsignee(req.getConsigneeInfo(), req.getUserId());
-        if(Validator.isNull(id)){
-        	throw new RuntimeException("添加提货人信息失败");
-        }
-        if (!Validator.isNull(req.getConsigneeInfo().getIsDefault()) && 
-                ConsigneeInfo.ISDEFAULT_YES == req.getConsigneeInfo().getIsDefault()) {
-        	setDefault(id,req.getUserId());
-        }
-        AddConsigneeResp resp = new AddConsigneeResp();
-        resp.setId(id);
-        return resp;
-    }
-
-    @Override
-    public UpdateConsigneeResp updateConsignee(UpdateConsigneeReq req) {
-        boolean result = userRPC.updateConsignee(req.getConsigneeInfo(), req.getUserId());
-        if(!result) {
-            throw new RuntimeException("修改提货人信息失败!");
-        }
-        return new UpdateConsigneeResp();
-    }
-
-    @Override
-    public GetConsigneeResp getConsignee(GetConsigneeReq req) {
-        ConsigneeInfo info = userRPC.getConsignee(req.getId());
-        GetConsigneeResp resp = new GetConsigneeResp();
-        resp.setConsigneeInfo(info);
-        return resp;
-    }
-
-    @Override
-    public DelConsigneeResp delConsignee(DelConsigneeReq req) {
-        boolean result = userRPC.delConsignee(req.getId());
-        if(!result) {
-            throw new RuntimeException("删除提货人信息失败!");
-        }
-        return new DelConsigneeResp();
-    }
-
-    @Override
-    public GetConsigneeListResp getConsigneeList(GetConsigneeListReq req) {
-        List<ConsigneeInfo> consigneeInfos =
-                userRPC.getConsigneeByUserId(req.getUserId());
-        GetConsigneeListResp resp = new GetConsigneeListResp();
-        resp.setConsigneeInfos(consigneeInfos);
-        return resp;
-    }
-
-    @Override
-    public GetDefaultConsigneeResp getDefaultConsignee(GetDefaultConsigneeReq req) {
-    	GetDefaultConsigneeResp resp = new GetDefaultConsigneeResp();
-        ConsigneeInfo info = userRPC.getDefaultConsignee(req.getUserId());
-        if (Validator.isNull(info)) {
-        	List<ConsigneeInfo> infoList = userRPC.getConsigneeByUserId(req.getUserId());
-        	if (!Validator.isEmpty(infoList)) {
-        		info = infoList.get(0);
-    		}
-		}
-        resp.setConsigneeInfo(info);
-        return resp;
-    }
-
-    @Override
-    public SetDefaultConsigneeResp setDefault(Long consigneeId,Long userId) {
-        boolean result = userRPC.setDefaultConsignee(consigneeId, userId);
-        if(!result) {
-            throw new ServiceException(ResultCode.USER_CONSIGNEE_SET_DEFAULT_FAILED,ErrorMessage.USER_CONSIGNEE_SET_DEFAULT_FAILED);
-        }
-        return new SetDefaultConsigneeResp();
-    }
-}
@@ -9,6 +9,7 @@ import com.diligrp.website.web.interfaces.WebsiteClient;
 import com.yqyw.filter.client.KeyWordsClient;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -22,7 +23,7 @@ import javax.annotation.Resource;
  * @author zhangshirui
  * @createTime 2014年9月1日 下午5:34:45
  */
-@org.springframework.stereotype.Service("orderService")
+@Service
 public class OrderServiceImpl implements OrderService {
 	@Resource
@@ -26,6 +26,7 @@ public class FundServiceImpl implements FundService{
         ShopBuyerDetail shopBuyerDetail = new ShopBuyerDetail();
         shopBuyerDetail.setShopId(fundsReq.getShopId());
         shopBuyerDetail.setBuyerMobilePhone(fundsReq.getKeyword());
+        shopBuyerDetail.setCurrentPage(fundsReq.getPageNum());
         Page<ShopBuyerDetailOutput> shopBuyerDetailOutputPage = shopBuyerRPC.queryShopAllBuyerList(shopBuyerDetail);
         ShopOutput shopOutput = shopRPC.getShopByShopId(fundsReq.getShopId());
 package com.diligrp.mobsite.getway.web.api.buyer.home;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
-import com.diligrp.mobsite.getway.domain.protocol.cart.*;
-import com.diligrp.mobsite.getway.service.buyer.settle.ConsigneeService;
+import com.diligrp.mobsite.getway.domain.protocol.pickinfo.*;
+import com.diligrp.mobsite.getway.service.buyer.pickinfo.PickInfoService;
 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,24 +27,24 @@ import javax.annotation.Resource;
  * @createTime 2014/8/28 10:24
  */
 @Controller
-@RequestMapping("/mobsiteApp/consignee")
-@Api(value = "/mobsiteApp-consignee", description = "收货人接口")
-public class ConsigneeController extends BaseApiController {
+@RequestMapping("/mobsiteApp/pickInfo")
+@Api(value = "/mobsiteApp-pickInfo", description = "收货人接口")
+public class PickInfoController extends BaseApiController {
-    @Resource
-    private ConsigneeService consigneeService;
+    @Autowired
+    private PickInfoService pickInfoService;
     private Logger log = LoggerFactory.getLogger(getClass());
     /**
      * 获取默认提货人信息
      */
-    @ApiOperation(value = "获取默认提货人信息", httpMethod = "POST",response = GetDefaultConsigneeResp.class)
-    @RequestMapping(value = "/getDefaultConsignee",method = RequestMethod.POST)
+    @ApiOperation(value = "获取默认提货人信息", httpMethod = "POST",response = GetDefaultPickInfoResp.class)
+    @RequestMapping(value = "/getDefaultPickInfo",method = RequestMethod.POST)
     @ResponseBody
-    public void getDefaultConsignee() {
-        GetDefaultConsigneeReq req = getRequest(GetDefaultConsigneeReq.class);
+    public void getDefaultPickInfo(@RequestBody GetDefaultPickInfoReq temp) {
+        GetDefaultPickInfoReq req = getRequest(GetDefaultPickInfoReq.class);
         try {
-            GetDefaultConsigneeResp resp = consigneeService.getDefaultConsignee(req);
+            GetDefaultPickInfoResp resp = pickInfoService.getDefaultPickInfo(req);
             sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()), e);
@@ -57,13 +58,13 @@ public class ConsigneeController extends BaseApiController {
     /**
      * 获取提货人信息列表
      */
-    @ApiOperation(value = "获取提货人信息列表", httpMethod = "POST",response = GetConsigneeListResp.class)
-    @RequestMapping(value = "/getConsigneeList",method = RequestMethod.POST)
+    @ApiOperation(value = "获取提货人信息列表", httpMethod = "POST",response = GetPickInfoListResp.class)
+    @RequestMapping(value = "/getPickInfoList",method = RequestMethod.POST)
     @ResponseBody
-    public void getConsigneeList() {
-        GetConsigneeListReq req = getRequest(GetConsigneeListReq.class);
+    public void getPickInfoList(@RequestBody GetPickInfoListReq temp) {
+        GetPickInfoListReq req = getRequest(GetPickInfoListReq.class);
         try {
-            GetConsigneeListResp resp = consigneeService.getConsigneeList(req);
+            GetPickInfoListResp resp = pickInfoService.getPickInfoList(req);
             sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()), e);
@@ -77,13 +78,13 @@ public class ConsigneeController extends BaseApiController {
     /**
      * 删除提货人信息
      */
-    @ApiOperation(value = "删除收货人", httpMethod = "POST",response = DelConsigneeResp.class)
-    @RequestMapping(value = "/delConsignee",method = RequestMethod.POST)
+    @ApiOperation(value = "删除收货人", httpMethod = "POST",response = DelPickInfoResp.class)
+    @RequestMapping(value = "/delPickInfo",method = RequestMethod.POST)
     @ResponseBody
-    public void delConsignee(@RequestBody DelConsigneeReq temp) {
-        DelConsigneeReq req = getRequest(DelConsigneeReq.class);
+    public void delPickInfo(@RequestBody DelPickInfoReq temp) {
+        DelPickInfoReq req = getRequest(DelPickInfoReq.class);
         try {
-            DelConsigneeResp resp = consigneeService.delConsignee(req);
+            DelPickInfoResp resp = pickInfoService.delPickInfo(req);
             sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()), e);
@@ -97,13 +98,13 @@ public class ConsigneeController extends BaseApiController {
     /**
      * 通过ID获取提货人详情
      */
-    @ApiOperation(value = "修改收货人", httpMethod = "POST",response = GetConsigneeResp.class)
-    @RequestMapping(value = "/getConsignee",method = RequestMethod.POST)
+    @ApiOperation(value = "修改收货人", httpMethod = "POST",response = GetPickInfoResp.class)
+    @RequestMapping(value = "/getPickInfo",method = RequestMethod.POST)
     @ResponseBody
-    public void getConsignee(@RequestBody  GetConsigneeReq temp) {
-        GetConsigneeReq req = getRequest(GetConsigneeReq.class);
+    public void getPickInfo(@RequestBody GetPickInfoReq temp) {
+        GetPickInfoReq req = getRequest(GetPickInfoReq.class);
         try {
-            GetConsigneeResp resp = consigneeService.getConsignee(req);
+            GetPickInfoResp resp = pickInfoService.getPickInfo(req);
             sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()), e);
@@ -117,13 +118,13 @@ public class ConsigneeController extends BaseApiController {
     /**
      * 修改提货人信息
      */
-    @ApiOperation(value = "修改收货人", httpMethod = "POST",response = UpdateConsigneeResp.class)
-    @RequestMapping(value = "/updateConsignee",method = RequestMethod.POST)
+    @ApiOperation(value = "修改收货人", httpMethod = "POST",response = UpdatePickInfoResp.class)
+    @RequestMapping(value = "/updatePickInfo",method = RequestMethod.POST)
     @ResponseBody
-    public void updateConsignee(@RequestBody  UpdateConsigneeReq temp) {
-        UpdateConsigneeReq req = getRequest(UpdateConsigneeReq.class);
+    public void updatePickInfo(@RequestBody UpdatePickInfoReq temp) {
+        UpdatePickInfoReq req = getRequest(UpdatePickInfoReq.class);
         try {
-            UpdateConsigneeResp resp = consigneeService.updateConsignee(req);
+            UpdatePickInfoResp resp = pickInfoService.updatePickInfo(req);
             sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()), e);
@@ -137,13 +138,13 @@ public class ConsigneeController extends BaseApiController {
     /**
      * 新增提货人
      */
-    @ApiOperation(value = "新增收货人", httpMethod = "POST",response = AddConsigneeResp.class)
-    @RequestMapping(value = "/addConsignee",method = RequestMethod.POST)
+    @ApiOperation(value = "新增收货人", httpMethod = "POST",response = AddPickInfoResp.class)
+    @RequestMapping(value = "/addPickInfo",method = RequestMethod.POST)
     @ResponseBody
-    public void addConsignee(@RequestBody  AddConsigneeReq temp) {
-        AddConsigneeReq req = getRequest(AddConsigneeReq.class);
+    public void addPickInfo(@RequestBody AddPickInfoReq temp) {
+        AddPickInfoReq req = getRequest(AddPickInfoReq.class);
         try {
-            AddConsigneeResp resp = consigneeService.addConsignee(req);
+            AddPickInfoResp resp = pickInfoService.addPickInfo(req);
             sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()), e);
@@ -157,13 +158,13 @@ public class ConsigneeController extends BaseApiController {
     /**
      * 设置默认提货人
      */
-    @ApiOperation(value = "设置默认收货人", httpMethod = "POST",response = SetDefaultConsigneeReq.class)
+    @ApiOperation(value = "设置默认收货人", httpMethod = "POST",response = SetDefaultPickInfoReq.class)
     @RequestMapping(value = "/setDefault",method = RequestMethod.POST)
     @ResponseBody
-    public void setDefault(@RequestBody  SetDefaultConsigneeReq temp) {
-        SetDefaultConsigneeReq req = getRequest(SetDefaultConsigneeReq.class);
+    public void setDefault(@RequestBody SetDefaultPickInfoReq temp) {
+        SetDefaultPickInfoReq req = getRequest(SetDefaultPickInfoReq.class);
         try {
-            SetDefaultConsigneeResp resp = consigneeService.setDefault(req.getId(),req.getUserId());
+            SetDefaultPickInfoResp resp = pickInfoService.setDefault(req.getId(),req.getUserId());
             sendSuccessResp(resp);
         } catch (Exception e) {
             log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
@@ -41,9 +41,10 @@ public class FundController extends BaseApiController{
     @ApiOperation(value = "获取储值列表", httpMethod = "POST",response = GetFundsResp.class)
     @RequestMapping(value = "/getFunds",method = RequestMethod.POST)
     @ResponseBody
-    public void getFunds(@ModelAttribute GetFundsReq fundsReq) {
+    public void getFunds(@RequestBody GetFundsReq temp) {
+        GetFundsReq req = super.getRequest(GetFundsReq.class);
         try {
-            GetFundsResp resp = fundService.getFunds(fundsReq);
+            GetFundsResp resp = fundService.getFunds(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e) {
             log.error("获取储值列表出现业务异常", e);
@@ -66,14 +67,12 @@ public class FundController extends BaseApiController{
      * @author weili
      */
     @ApiOperation(value = "储值卡操作", httpMethod = "POST",response = FundTradeResp.class)
-    @ApiImplicitParam(paramType = "query",name = "price",dataType = "Long", required = true, value = "储值金额")
     @RequestMapping(value = "/storeValue",method = RequestMethod.POST)
     @ResponseBody
-    public void storeValue(Long price) {
-
+    public void storeValue(@RequestBody FundTradeReq temp) {
         FundTradeReq req = super.getRequest(FundTradeReq.class);
         try {
-            FundTradeResp resp = fundService.storeValue(price);
+            FundTradeResp resp = fundService.storeValue(req.getTradePrice());
             super.sendSuccessResp(resp);
         } catch (ServiceException e) {
             log.error("获取储值列表出现业务异常", e);
@@ -30,7 +30,6 @@ import javax.annotation.Resource;
 @RequestMapping("/mobsiteApp/seller/order")
 @Api(value = "/mobsiteApp-order-seller", description = "订单接口-卖家")
 public class SellerOrderController extends BaseApiController {
-
     @Resource
     private SellerOrderService sellerOrderService;