Merge branch 'dev' of http://git3.nong12.com/b2c/gateway into dev

# Conflicts: # .gitignore # mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/OrderRPC.java # mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/OrderRPCImpl.java # mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/SellerOrderRPC.java # mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/impl/SellerOrderRPCImpl.java

Merge branch 'dev' of http://git3.nong12.com/b2c/gateway into dev
# Conflicts: # .gitignore # mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/OrderRPC.java # mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/OrderRPCImpl.java # mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/SellerOrderRPC.java # mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/impl/SellerOrderRPCImpl.java
Jiang
2 parents 76ab596c f9e50ae3
Showing 75 changed files with 2166 additions and 686 deletions
.gitignore
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/GetShopCategoryResp.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/login/AuthLoginReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/CheckVeriCodeReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/CheckVeriCodeResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/LoginReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/LoginResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/SendVeriCodeReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/SendVeriCodeResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/register/CheckMobileReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/register/SellerRegisterReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/register/SellerRegisterResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/GetShopInfoResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/UpdateShopReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/ModifyPwdReq.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/CmsRPC.java → mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/CmsRPC.java
+#target/
+target/
+
+# IDEA #
+.idea/
 *.iml
-.idea
+
+# Eclipse #
+.settings/
 .classpath
-*/target/
-*/webapp/WEB-INF/classes
-*/webapp/WEB-INF/lib
-*.MF
-**/WEB-INF/classes/
-**/WEB-INF/lib
-**/.settings/
-**/.classpath
-**/.project
 \ No newline at end of file
+.project
+
+# Log #
+logs/
+*.log%     
+
+#mac 
+.DS_Store
+
+#svn
+.svn
 \ No newline at end of file
 package com.diligrp.mobsite.getway.domain.protocol.detail;
-import java.util.List;
-
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 import com.diligrp.mobsite.getway.domain.protocol.ShopCategory;
+import java.util.List;
+
 /**
  * <B>Description</B> 返回店铺自定义分类 <br />
  * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
@@ -19,26 +19,14 @@ public class GetShopCategoryResp extends BaseResp {
     /**
      * 店铺自定义分类信息
      */
-    private List<ShopCategory> categorys;
+    private List<ShopCategory> categories;
-    /**
-     * get value of GetShopCategoryResp.categorys
-     * @return the categorys
-     * @createTime Aug 18, 2014 11:21:43 AM
-     * @author wujianjun
-     */
-    public List<ShopCategory> getCategorys() {
-        return categorys;
-    }
-    /**
-     * set value of GetShopCategoryResp.categorys
-     * @param categorys the categorys to set
-     * @createTime Aug 18, 2014 11:21:43 AM
-     * @author wujianjun
-     */
-    public void setCategorys(List<ShopCategory> categorys) {
-        this.categorys = categorys;
+    public List<ShopCategory> getCategories() {
+        return categories;
     }
+    public void setCategories(List<ShopCategory> categories) {
+        this.categories = categories;
+    }
 }
 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.login;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <B>Description</B> 登录请求 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime Aug 12, 2014 7:57:01 PM
+ * @author wujianjun
+ */
+public class AuthLoginReq extends BaseReq {
+
+    /**
+     * 会员名称
+     */
+    @NotNull(message = "账号不能为空")
+    @ApiModelProperty(value = "登录账号",required = true)
+    private String accountName;
+
+    /**
+     * 验证码
+     */
+    @ApiModelProperty(value = "验证码",required = true)
+    private String authCode;
+
+
+    //极光ID
+    @ApiModelProperty(value = "极光ID")
+    private String registerNo;
+
+
+    public AuthLoginReq() {
+    }
+
+    public String getRegisterNo() {
+        return registerNo;
+    }
+
+    public void setRegisterNo(String registerNo) {
+        this.registerNo = registerNo;
+    }
+
+    /**
+     * get value of LoginReq.accountName
+     * @return the accountName
+     * @createTime Aug 12, 2014 7:58:27 PM
+     * @author wujianjun
+     */
+    public String getAccountName() {
+        return accountName;
+    }
+
+    /**
+     * set value of LoginReq.accountName
+     * @param accountName the accountName to set
+     * @createTime Aug 12, 2014 7:58:27 PM
+     * @author wujianjun
+     */
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+
+}
@@ -19,12 +19,12 @@ public class CheckVeriCodeReq extends BaseReq {
     /**
      * 手机验证码
      */
-    @ApiModelProperty(value = "验证码")
+    @ApiModelProperty(value = "验证码",required = true)
     private String veriCode;
     /**
      * 手机号码
      */
-    @ApiModelProperty(value = "手机号码")
+    @ApiModelProperty(value = "手机号码",required = true)
     private String mobile;
     /**
      * 消息类型
 package com.diligrp.mobsite.getway.domain.protocol.login;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
+import io.swagger.annotations.ApiModelProperty;
 /**
@@ -22,7 +22,7 @@ public class CheckVeriCodeResp extends BaseResp {
     /**
      * 验证结果：1-验证码正确，2验证码错误
      */
-    @Deprecated
+    @ApiModelProperty(value = "验证结果：1-验证码正确，2验证码错误")
     private Integer checkFlag = CHECK_FLAG_RIGHT;
@@ -28,14 +28,15 @@ public class LoginReq extends BaseReq {
     @ApiModelProperty(value = "登录密码",required = true)
     private String password;
-    /**
-     * 密码
-     */
-    @ApiModelProperty(value = "验证码")
-    private String authCode;
+    ///**
+    // * 验证码
+    // */
+    //@ApiModelProperty(value = "验证码")
+    //private String authCode;
     //极光ID
+    @ApiModelProperty(value = "极光ID")
     private String registerNo;
@@ -57,7 +57,7 @@ public class LoginResp extends BaseResp {
     /**
      * 账户ID
      */
-    @ApiModelProperty(value = "账号")
+    @ApiModelProperty(value = "用户id")
     private Long accountId;
     /**
      * 账户名
@@ -69,25 +69,25 @@ public class LoginResp extends BaseResp {
      */
     @ApiModelProperty(value = "手机号码")
     private String mobile;
-    /**
-     * 邮箱地址
-     */
-    @ApiModelProperty(value = "邮箱")
-    private String email;
-    /**
-     * 1:个人用户, 2:企业用户
-     */
-    @ApiModelProperty(value = "用户类型：个人用户,2:企业用户")
-    private Integer userType;
-    /**
-     * 1 登入  -1 登出 （出场验货专用）
-     */
-    private Integer accountState;
-    /**
-     * 真实姓名
-     */
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
+    ///**
+    // * 邮箱地址
+    // */
+    //@ApiModelProperty(value = "邮箱")
+    //private String email;
+    ///**
+    // * 1:个人用户, 2:企业用户
+    // */
+    //@ApiModelProperty(value = "用户类型：个人用户,2:企业用户")
+    //private Integer userType;
+    ///**
+    // * 1 登入  -1 登出 （出场验货专用）
+    // */
+    //private Integer accountState;
+    ///**
+    // * 真实姓名
+    // */
+    //@ApiModelProperty(value = "真实姓名")
+    //private String realName;
     /**
      * 登录之后，passport返回
      * 用于支付鉴权
@@ -165,67 +165,9 @@ public class LoginResp extends BaseResp {
         this.mobile = mobile;
     }
-    /**
-     * get value of LoginResp.email
-     * @return the email
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public String getEmail() {
-        return email;
-    }
-
-    /**
-     * set value of LoginResp.email
-     * @param email the email to set
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public void setEmail(String email) {
-        this.email = email;
-    }
-    /**
-     * get value of LoginResp.userType
-     * @return the userType
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public Integer getUserType() {
-        return userType;
-    }
-    /**
-     * set value of LoginResp.userType
-     * @param userType the userType to set
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public void setUserType(Integer userType) {
-        this.userType = userType;
-    }
-
-    /**
-     * get value of LoginResp.accountState
-     * @return the accountState
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public Integer getAccountState() {
-        return accountState;
-    }
-
-    /**
-     * set value of LoginResp.accountState
-     * @param accountState the accountState to set
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public void setAccountState(Integer accountState) {
-        this.accountState = accountState;
-    }
-
-    public String getToken() {
+     public String getToken() {
         return token;
     }
@@ -234,17 +176,7 @@ public class LoginResp extends BaseResp {
         this.token = token;
     }
-    
-    public String getRealName() {
-        return realName;
-    }
-
-    
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-    
     public String getHeadImg() {
         return headImg;
     }
@@ -36,7 +36,7 @@ public class SendVeriCodeReq extends BaseReq {
     /**
      * 消息类型
      */
-    @ApiModelProperty(value = "消息类型",required = false)
+    @ApiModelProperty(value = "消息类型:1保留，2注册，3找回密码，4修改新电话号码，5验证旧电话号码",required = true)
     private Integer msgType;
@@ -28,11 +28,12 @@ public class SendVeriCodeResp extends BaseResp {
     /**
      * 发送结果
      */
-    @ApiModelProperty(value = "发送结果")
+    @ApiModelProperty(value = "发送结果:1成功")
     private Integer sendCode = SEND_CODE_ERROR;
     /**
      * 万能验证码
      */
+    @ApiModelProperty(value = "万能验证码")
     private String passKey;
     /**
 package com.diligrp.mobsite.getway.domain.protocol.register;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * <B>Description</B> 检测用户手机号码是否合法 <br />
@@ -16,6 +17,7 @@ public class CheckMobileReq extends BaseReq {
     /**
      * 需要检测的手机号码
      */
+    @ApiModelProperty(value="手机号",required = true)
     private String mobile;
     /**
+package com.diligrp.mobsite.getway.domain.protocol.register;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <B>Description</B> 注册个人用户请求 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime Aug 12, 2014 7:48:27 PM
+ * @author wujianjun
+ */
+@ApiModel(value = "请求参数")
+public class SellerRegisterReq extends BaseReq {
+
+	public static final int USER_TYPE_BUSINESS = 1;//市场商户,企业单位,个体经营,个人
+	
+	public static final int USER_TYPE_COMPANY = 2;
+
+    public static final int USER_TYPE_PERSONMANAGE = 3;
+
+    public static final int USER_TYPE_PERSON = 4;
+
+    public static final int APPTYPE_SHEQU = 1;
+
+    public static final int APPTYPE_LIANSUO = 2;
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机号码",required = true)
+    protected String mobile;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码",required = true)
+    protected String password;
+
+    /**
+     * 手机验证码
+     */
+    @ApiModelProperty(value = "手机验证码",required = true)
+    private String veriCode;
+
+    /**
+     * 手机验证码
+     */
+    @ApiModelProperty(value = "app类型（1:社区店版,2:连锁店 ,默认传1）")
+    private Integer appType = APPTYPE_SHEQU;
+
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getVeriCode() {
+        return veriCode;
+    }
+
+    public void setVeriCode(String veriCode) {
+        this.veriCode = veriCode;
+    }
+
+    public Integer getAppType() {
+        return appType;
+    }
+
+    public void setAppType(Integer appType) {
+        this.appType = appType;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.register;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**
+ * <B>Description</B> 注册个人用户请求响应 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime Aug 12, 2014 7:48:58 PM
+ * @author wujianjun
+ */
+@SuppressWarnings("serial")
+public class SellerRegisterResp extends BaseResp {
+    
+    /**
+     * 注册结果
+     * 注册成功-1
+     */
+    public static final int RESULT_FLAG_SUCCESS=1;
+    /**
+     * 注册失败-2
+     */
+    public static final int RESULT_FLAG_FAILED=2;
+    /**
+     * 验证码错误-3
+     */
+    public static final int RESULT_FLAG_VERICODE_WRONG=3;
+    /**
+     * 手机号已经注册-4
+     */
+    public static final int RESULT_FLAG_PHONE_REGISTERED=4;
+    /**
+     * 账号已经被注册-5
+     */
+    public static final Integer RESULT_FLAG_ACCOUNTNAME_REGISTERED=5;
+    
+    
+    /**
+     * 注册结果
+     */
+    @ApiModelProperty(value = "注册结果")
+    private Integer resultFlag = RESULT_FLAG_SUCCESS;
+    
+    /**
+     * get value of RegisterPersonalResp.resultFlag
+     * @return the resultFlag
+     * @createTime 2014年8月28日 下午5:19:41
+     * @author zhangshirui
+     */
+    public Integer getResultFlag() {
+        return resultFlag;
+    }
+    
+    /**
+     * set value of RegisterPersonalResp.resultFlag
+     * @param resultFlag the resultFlag to set
+     * @createTime 2014年8月28日 下午5:19:41
+     * @author zhangshirui
+     */
+    public void setResultFlag(Integer resultFlag) {
+        this.resultFlag = resultFlag;
+    }
+
+}
@@ -13,7 +13,7 @@ import java.util.List;
  * <B>Company</B> 地利集团
  * @author wujiaqiang
  */
-public class CreateOrUpdateShopReq extends BaseReq {
+public class CreateShopReq extends BaseReq {
@@ -30,7 +30,7 @@ public class CreateOrUpdateShopReq extends BaseReq {
 	private String shopLogo;
 	@ApiModelProperty(value = "主营类目")
-	private List<Category> catagorys;
+	private List<Category> categories;
@@ -91,12 +91,12 @@ public class CreateOrUpdateShopReq extends BaseReq {
 	}
-	public List<Category> getCatagorys() {
-		return catagorys;
+	public List<Category> getCategories() {
+		return categories;
 	}
-	public void setCatagorys(List<Category> catagorys) {
-		this.catagorys = catagorys;
+	public void setCategories(List<Category> categories) {
+		this.categories = categories;
 	}
 	public Integer getProductDisplayWay() {
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
  * <B>Company</B> 地利集团
  * @author wujiaqiang
  */
-public class CreateOrUpdateShopResp extends BaseResp {
+public class CreateShopResp extends BaseResp {
     /**
@@ -24,7 +24,7 @@ public class GetShopInfoResp extends BaseResp {
     private String shopLogo;
     @ApiModelProperty(value = "主营类目")
-    private List<Category> catagorys;
+    private List<Category> categories;
@@ -85,12 +85,12 @@ public class GetShopInfoResp extends BaseResp {
     }
-    public List<Category> getCatagorys() {
-        return catagorys;
+    public List<Category> getCategories() {
+        return categories;
     }
-    public void setCatagorys(List<Category> catagorys) {
-        this.catagorys = catagorys;
+    public void setCategories(List<Category> categories) {
+        this.categories = categories;
     }
     public Integer getProductDisplayWay() {
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import com.diligrp.mobsite.getway.domain.protocol.Category;
+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 />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @author wujiaqiang
+ */
+public class UpdateShopReq extends BaseReq {
+
+
+
+	@ApiModelProperty(value = "店铺Id")
+	private Long shopId;
+
+	@ApiModelProperty(value = "城市code")
+	private Long cityCode;
+
+	@ApiModelProperty(value = "城市名称")
+	private String cityName;
+
+	@ApiModelProperty(value = "店铺名称")
+	private String shopName;
+
+	@ApiModelProperty(value = "店铺logo")
+	private String shopLogo;
+
+	@ApiModelProperty(value = "主营类目")
+	private List<Category> categories;
+
+
+
+	@ApiModelProperty(value = "店铺地址")
+	private String shopAddr;
+
+	@ApiModelProperty(value = "客户电话")
+	private String phone;
+
+
+	@ApiModelProperty(value = "商品排列方式（1：两列式 2：列表式）")
+	private Integer productDisplayWay;
+
+	@ApiModelProperty(value = "配送费")
+	private Long postage;
+
+	@ApiModelProperty(value = "订单免配送费金额")
+	private Long freeShippingPrice;
+
+	@ApiModelProperty(value = "店铺公告")
+	private String shopNotices;
+
+	@ApiModelProperty(value = "送货时间段")
+	private List<String> deliveryTime;
+
+
+	public Long getShopId() {
+		return shopId;
+	}
+
+	public void setShopId(Long shopId) {
+		this.shopId = shopId;
+	}
+
+	public Long getCityCode() {
+		return cityCode;
+	}
+
+	public void setCityCode(Long cityCode) {
+		this.cityCode = cityCode;
+	}
+
+	public String getCityName() {
+		return cityName;
+	}
+
+	public void setCityName(String cityName) {
+		this.cityName = cityName;
+	}
+
+	public String getShopName() {
+		return shopName;
+	}
+
+	public void setShopName(String shopName) {
+		this.shopName = shopName;
+	}
+
+	public String getShopLogo() {
+		return shopLogo;
+	}
+
+	public void setShopLogo(String shopLogo) {
+		this.shopLogo = shopLogo;
+	}
+
+
+	public List<Category> getCategories() {
+		return categories;
+	}
+
+	public void setCategories(List<Category> categories) {
+		this.categories = categories;
+	}
+
+	public Integer getProductDisplayWay() {
+		return productDisplayWay;
+	}
+
+	public void setProductDisplayWay(Integer productDisplayWay) {
+		this.productDisplayWay = productDisplayWay;
+	}
+
+	public Long getPostage() {
+		return postage;
+	}
+
+	public void setPostage(Long postage) {
+		this.postage = postage;
+	}
+
+	public Long getFreeShippingPrice() {
+		return freeShippingPrice;
+	}
+
+	public void setFreeShippingPrice(Long freeShippingPrice) {
+		this.freeShippingPrice = freeShippingPrice;
+	}
+
+	public String getShopNotices() {
+		return shopNotices;
+	}
+
+	public void setShopNotices(String shopNotices) {
+		this.shopNotices = shopNotices;
+	}
+
+	public List<String> getDeliveryTime() {
+		return deliveryTime;
+	}
+
+	public void setDeliveryTime(List<String> deliveryTime) {
+		this.deliveryTime = deliveryTime;
+	}
+
+	public String getShopAddr() {
+		return shopAddr;
+	}
+
+	public void setShopAddr(String shopAddr) {
+		this.shopAddr = shopAddr;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+}
-package com.diligrp.mobsite.getway.rpc.seller;
+package com.diligrp.mobsite.getway.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 /**
- * <B>Description</B> 验证rpc <br />
+ * <B>Description</B> 路线管理-获取线路信息   <br />
  * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
- *
- * @author duanyugen
+ * @author wujiaqiang
  */
-public interface SellerProductRPC {
+public class UpdateShopResp extends BaseResp {
-}
+  }
@@ -19,23 +19,25 @@ public class ModifyPwdReq extends BaseReq {
     /**
      * 验证码
      */
-    private String authCode;
+    //@ApiModelProperty(value = "验证码",required = true)
+    //private String authCode;
     /**
      * 新的密码
      */
-    @ApiModelProperty(value = "新密码")
+    @ApiModelProperty(value = "新密码",required = true)
     private String password;
-    /**
-     * 重复新密码
-     */
-    @ApiModelProperty(value = "重复新密码")
-    private String repPassword;
+    ///**
+    // * 重复新密码
+    // */
+    //@ApiModelProperty(value = "重复新密码",required = true)
+    //private String repPassword;
     /**
-     * 用户账号
+     * 手机号
      */
+    @ApiModelProperty(value = "账号(手机号)",required = true)
     private String accountName;
     /**
@@ -81,32 +83,32 @@ public class ModifyPwdReq extends BaseReq {
     }
-    /**
-     * get value of ModifyPwdReq.authCode
-     * @return the authCode
-     * @createTime 2015年1月24日 下午4:50:08
-     * @author zhangshirui
-     */
-    public String getAuthCode() {
-        return authCode;
-    }
+    ///**
+    // * get value of ModifyPwdReq.authCode
+    // * @return the authCode
+    // * @createTime 2015年1月24日 下午4:50:08
+    // * @author zhangshirui
+    // */
+    //public String getAuthCode() {
+    //    return authCode;
+    //}
+    //
+    //
+    ///**
+    // * set value of ModifyPwdReq.authCode
+    // * @param authCode the authCode to set
+    // * @createTime 2015年1月24日 下午4:50:08
+    // * @author zhangshirui
+    // */
+    //public void setAuthCode(String authCode) {
+    //    this.authCode = authCode;
+    //}
-    
-    /**
-     * set value of ModifyPwdReq.authCode
-     * @param authCode the authCode to set
-     * @createTime 2015年1月24日 下午4:50:08
-     * @author zhangshirui
-     */
-    public void setAuthCode(String authCode) {
-        this.authCode = authCode;
-    }
-
-    public String getRepPassword() {
-        return repPassword;
-    }
-
-    public void setRepPassword(String repPassword) {
-        this.repPassword = repPassword;
-    }
+    //public String getRepPassword() {
+    //    return repPassword;
+    //}
+    //
+    //public void setRepPassword(String repPassword) {
+    //    this.repPassword = repPassword;
+    //}
 }
-package com.diligrp.mobsite.getway.rpc.buyer;
+package com.diligrp.mobsite.getway.rpc;
 import com.diligrp.cms.domain.*;
-package com.diligrp.mobsite.getway.rpc.buyer;
+package com.diligrp.mobsite.getway.rpc;
 import com.diligrp.website.web.interfaces.domain.output.*;
@@ -7,7 +7,7 @@
  * @date: 2014年8月14日 上午11:20:17 
  * @version: V1.0  
  */ 
-package com.diligrp.mobsite.getway.rpc.buyer;
+package com.diligrp.mobsite.getway.rpc;
 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
 import com.diligrp.titan.sdk.domain.Attribute;
-package com.diligrp.mobsite.getway.rpc.buyer;
+package com.diligrp.mobsite.getway.rpc;
 import com.diligrp.mobsite.getway.domain.protocol.Market;
 import com.diligrp.mobsite.getway.domain.protocol.market.GetDeliveryByCodeReq;
-package com.diligrp.mobsite.getway.rpc.buyer;
+package com.diligrp.mobsite.getway.rpc;
 /**
  * <B>Description</B> <br />
+package com.diligrp.mobsite.getway.rpc;
+
+import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;
+import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;
+import com.diligrp.mobsite.getway.domain.protocol.ProductAppraise;
+import com.diligrp.titan.sdk.output.PageOutput;
+
+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> 地利集团
+ * @createTime 2014年9月1日 下午6:30:54
+ * @author zhangshirui
+ */
+public interface OrderRPC {
+
+    /**
+     * 获取订单列表
+     * @param input
+     * @param userId
+     * @return
+     * @createTime 2014年9月2日 下午2:36:47
+     * @author zhangshirui
+     */
+    PageOutput<List<OrderListResponseDto>> getOrders(OrderListRequestDto input, Long userId);
+
+    /**
+     * 根据id查询订单详情
+     * @param orderId
+     * @param userId
+     * @createTime 2014年9月3日 上午11:08:03
+     * @author zhangshirui
+     * @return
+     */
+    OrderListResponseDto getOrderById(Long orderId, Long userId);
+
+    /**
+     * 取消订单
+     * @param orderId
+     * @param reason
+     * @param userId
+     * @return
+     * @createTime 2014年9月3日 上午11:27:08
+     * @author zhangshirui
+     */
+    Integer cancelOrder(Long orderId, String reason, Long userId);
+
+
+    /**
+     * 确认提货
+     * @param orderId
+     * @param userId
+     * @return
+     * @createTime 2014年9月3日 下午4:46:26
+     * @author zhangshirui
+     */
+    Integer confirmPickUp(Long orderId, String paytoken, Long userId);
+
+
+
+
+    /**
+     * 发布商品评价
+     * @param productAppraises
+     * @param userId
+     */
+    void addComment(List<ProductAppraise> productAppraises, Long orderId, Long userId);
+
+
+
+
+}
-package com.diligrp.mobsite.getway.rpc.buyer;
+package com.diligrp.mobsite.getway.rpc;
 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
+package com.diligrp.mobsite.getway.rpc;
+
+import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
+import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
+import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
+import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
+
+import java.util.List;
+
+
+/**
+ * <B>Description</B> userrpc <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ *
+ * @author wujianjun
+ * @createTime Aug 19, 2014 2:33:16 PM
+ */
+public interface SellerRPC {
+
+
+
+    /**
+     * 验证电话号码是否存在
+     *
+     *  没有被使用：true
+     *  已经被使用：false
+     *
+     * @param mobile
+     * @return
+     * @createTime 2014年8月27日 下午2:31:07
+     * @author zhangshirui
+     */
+    boolean checkMobile(String mobile);
+
+
+    /**
+     * 修改进货单数量
+     * @param req
+     * @return
+     * @createTime 2015年3月9日 下午2:49:27
+     * @author zhangshirui
+     */
+    boolean modifyAmount(ModifyAmountReq req);
+
+    /**
+     * 修改密码
+     * @param accountName
+     * @param newPassword
+     * @return
+     * @createTime 2014年8月28日 下午3:01:49
+     * @author zhangshirui
+     */
+    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
+     * @return
+     * @createTime 2014年9月19日 上午10:04:35
+     * @author zhangshirui
+     */
+    String getEncryptPwd(String pwd);
+
+
+
+    /**
+     * 验证用户密码
+     * @param userId
+     * @param password
+     * @return
+     * @createTime 2015年6月24日 下午1:45:53
+     * @author zhangshirui
+     */
+	boolean checkPassword(Long userId, String password);
+
+
+    BuyerInfoOutput getUserByMobile(String accountName);
+
+    SellerInfoOutput getSellerByMobile(String accountName);
+}
+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;
+
+import java.util.List;
+
+/**
+ * <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 {
+
+
+	/**
+	 * @comment 创建店铺
+	 * @param shopSaveInput 店铺基本信息
+	 * @return Integer
+	 * @author kelan
+	 * @time 2016/11/29 19:03
+	 */
+	public Integer createShopInfo(ShopSaveInput shopSaveInput);
+	/**
+	 * @comment 通过卖家id获取店铺信息
+	 * @param sellerId 卖家id
+	 * @return ShopOutput
+	 * @author kelan
+	 * @time 2016/11/29 18:54
+	 */
+	public ShopOutput getShopBySellerId(Long sellerId);
+	/**
+	 * @comment 通过店铺id获取店铺信息
+	 * @param shopId 店铺id
+	 * @return ShopOutput
+	 * @author kelan
+	 * @time 2016/12/2 10:15
+	 */
+	public ShopOutput getShopByShopId(Long shopId);
+	/**
+	 * @comment 多字段条件查询店铺信息
+	 * @param shopListInput 多字段条件查询
+	 * @return ShopOutput
+	 * @author kelan
+	 * @time 2016/11/30 10:00
+	 */
+	public ShopOutput getShopInfo(ShopListInput shopListInput);
+	/**
+	 * @comment 修改店铺基本信息
+	 * @param shopUpdateInput
+	 * @return Integer
+	 * @author kelan
+	 * @time 2016/11/30 15:43
+	 */
+	public  Boolean modifyShopBasicInfo(ShopUpdateInput shopUpdateInput);
+
+}
-package com.diligrp.mobsite.getway.rpc.buyer;
+package com.diligrp.mobsite.getway.rpc;
 import com.diligrp.mobsite.getway.domain.protocol.msg.*;
 import com.diligrp.mobsite.getway.rpc.base.BaseService;
-package com.diligrp.mobsite.getway.rpc.buyer;
+package com.diligrp.mobsite.getway.rpc;
 import com.diligrp.mobsite.getway.domain.protocol.common.UploadFileResp;
-package com.diligrp.mobsite.getway.rpc.buyer;
+package com.diligrp.mobsite.getway.rpc;
+import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
 import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct;
 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
@@ -138,4 +139,5 @@ public interface UserRPC {
 	boolean checkPassword(Long userId, String password);
+    BuyerInfoOutput getUserByMobile(String accountName);
 }
-package com.diligrp.mobsite.getway.rpc.buyer;
-
-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;
-
-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> 地利集团
- * @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
-	 */
-	List<Long> getRecommendProducts(Long shopId);
-
-	/**
-	 * 根据店铺id查询店铺简介
-	 * @param shopId
-	 * @return
-	 * @createTime 2015年6月12日 上午10:37:02
-	 * @author zhangshirui
-	 */
-	ShopIntroduction getShopIntroductionById(Long shopId);
-
-	/**
-	 * 根据用户id查询店铺简介
-	 * @param userId
-	 * @return
-	 * @createTime 2015年6月12日 上午10:38:32
-	 * @author zhangshirui
-	 */
-	ShopIntroduction getShopIntroductionByUserId(Long userId);
-
-	/**
-	 * 根据二级域名查询店铺信息
-	 * @param domain
-	 * @return
-	 * @createTime 2015年6月25日 下午3:42:24
-	 * @author zhangshirui
-	 */
-	ShopInfo getShopInfoByDomain(String domain);
-
-
-
-	/**
-	 * 根据用户信息查询店铺信息
-	 * @param userId
-	 * @return
-	 * @createTime 2015年8月1日 上午10:53:23
-	 * @author zhangshirui
-	 */
-	ShopInfo getShopInfoByUser(Long userId);
-
-}
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
+package com.diligrp.mobsite.getway.rpc.impl;
 import com.alibaba.fastjson.JSON;
 import com.diligrp.cms.domain.*;
 import com.diligrp.cms.sdk.CmsClient;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
-import com.diligrp.mobsite.getway.rpc.buyer.CmsRPC;
+import com.diligrp.mobsite.getway.rpc.CmsRPC;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
+package com.diligrp.mobsite.getway.rpc.impl;
 import com.diligrp.mobsite.getway.domain.common.Constant;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
-import com.diligrp.mobsite.getway.rpc.buyer.ConfigRPC;
+import com.diligrp.mobsite.getway.rpc.ConfigRPC;
 import com.diligrp.website.util.redis.RedisUtil;
 import com.diligrp.website.util.security.Validator;
 import com.diligrp.website.web.interfaces.WebsiteClient;
@@ -7,14 +7,14 @@
  * @date: 2014年8月14日 上午11:21:21 
  * @version: V1.0  
  */ 
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
+package com.diligrp.mobsite.getway.rpc.impl;
 import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
-import com.diligrp.mobsite.getway.rpc.buyer.GoodsRPC;
+import com.diligrp.mobsite.getway.rpc.GoodsRPC;
 import com.diligrp.titan.sdk.TitanClient;
 import com.diligrp.titan.sdk.domain.Attribute;
 import com.diligrp.titan.sdk.domain.Category;
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
+package com.diligrp.mobsite.getway.rpc.impl;
 import com.diligrp.mobsite.getway.domain.protocol.Market;
 import com.diligrp.mobsite.getway.domain.protocol.market.GetDeliveryByCodeReq;
 import com.diligrp.mobsite.getway.domain.protocol.order.model.MarketInfo;
-import com.diligrp.mobsite.getway.rpc.buyer.MarketRPC;
+import com.diligrp.mobsite.getway.rpc.MarketRPC;
 import com.diligrp.website.web.interfaces.domain.input.PickupTypeEnum;
 import com.diligrp.website.web.interfaces.domain.output.PickUpPointResp;
 import org.springframework.stereotype.Service;
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
+package com.diligrp.mobsite.getway.rpc.impl;
 import com.diligrp.messageCenter.sdk.MessageProducerClient;
 import com.diligrp.messageCenter.sdk.domain.sms.SMSType;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
-import com.diligrp.mobsite.getway.rpc.buyer.MessageRPC;
+import com.diligrp.mobsite.getway.rpc.MessageRPC;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
+package com.diligrp.mobsite.getway.rpc.impl;
-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;
-import com.diligrp.mobsite.getway.rpc.buyer.ShopRPC;
+import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;
+import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;
+import com.diligrp.mobsite.getway.domain.protocol.ProductAppraise;
+import com.diligrp.mobsite.getway.rpc.OrderRPC;
+import com.diligrp.titan.sdk.output.PageOutput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import java.util.List;
+
 /**
- * <B>Description</B> <br />
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
+ * <B>Description</B> 订单rpc <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
- * @createTime 2015年6月10日 下午1:40:41
+ *
  * @author zhangshirui
+ * @createTime 2014年9月1日 下午6:31:13
  */
-@Service
-public class ShopRPCImpl implements ShopRPC {
-	
-	private Logger logger = LoggerFactory.getLogger(ShopRPCImpl.class);
-
-	@Override
-	public List<ProductCategory> getShopCategory(Long shopId) {
-		return null;
-	}
-
-	@Override
-	public List<Long> getRecommendProducts(Long shopId) {
-		return null;
-	}
-
-	@Override
-	public ShopIntroduction getShopIntroductionById(Long shopId) {
-		return null;
-	}
-
-	@Override
-	public ShopIntroduction getShopIntroductionByUserId(Long userId) {
-		return null;
-	}
-
-	@Override
-	public ShopInfo getShopInfoByDomain(String domain) {
-		return null;
-	}
-
-	@Override
-	public ShopInfo getShopInfoByUser(Long userId) {
-		return null;
-	}
+@Service("orderRPC")
+public class OrderRPCImpl implements OrderRPC {
+
+    public static final long ORDER_USER_TYPE_BUYER = 10L;
+    public static final long ORDER_USER_TYPE_SELLER = 20L;
+
+    private static final Logger logger = LoggerFactory.getLogger(OrderRPCImpl.class);
+
+
+    @Override
+    public PageOutput<List<OrderListResponseDto>> getOrders(OrderListRequestDto input, Long userId) {
+        return null;
+    }
+
+    @Override
+    public OrderListResponseDto getOrderById(Long orderId, Long userId) {
+        return null;
+    }
+
+    @Override
+    public Integer cancelOrder(Long orderId, String reason, Long userId) {
+        return null;
+    }
+
+    @Override
+    public Integer confirmPickUp(Long orderId, String paytoken, Long userId) {
+        return null;
+    }
+
+    @Override
+    public void addComment(List<ProductAppraise> productAppraises, Long orderId, Long userId) {
+    }
 }
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
+package com.diligrp.mobsite.getway.rpc.impl;
 import com.alibaba.fastjson.JSONObject;
-import com.diligrp.mobsite.getway.domain.common.Constant;
-import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
@@ -11,9 +9,9 @@ import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
+import com.diligrp.mobsite.getway.rpc.PassportRPC;
 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.rpc.base.impl.BaseServiceImpl;
-import com.diligrp.mobsite.getway.rpc.buyer.PassportRPC;
 import com.diligrp.website.util.redis.RedisUtil;
 import com.diligrp.website.util.security.Validator;
 import org.slf4j.Logger;
@@ -93,12 +91,8 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         resp.setToken(jsonBody.getString("token"));
         JSONObject jsonUser = jsonBody.getJSONObject("accountInfo");
         resp.setAccountId(jsonUser.getLong("accountId"));
-        resp.setEmail(jsonUser.getString("email"));
         resp.setMobile(jsonUser.getString("mobile"));
-        resp.setAccountState(jsonUser.getInteger("accountState"));
-        resp.setUserType(jsonUser.getInteger("userType"));
         resp.setAccountName(jsonUser.getString("accountName"));
-        resp.setRealName(jsonUser.getString("realName"));
         resp.setMsg(msg);
         resp.setHeadImg(jsonUser.getString("face"));
         if (Validator.isNull(jsonUser.getString("city"))){
@@ -107,23 +101,23 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
             resp.setInfoCompleteFlag(LoginResp.USER_INFOCOMPLETEFLAG_YES);
         }
-        //TODO 提示信息
-        if (Constant.USER_STATE_LOCKED ==  jsonUser.getInteger("accountState")) {
-        	resp.setMsg(ErrorMessage.USER_STATE_LOCKED);
-        	resp.setCode(PASSPORT_LOGIN_CODE_LOCKED);
-		}
+        //if (Constant.USER_STATE_LOCKED ==  jsonUser.getInteger("accountState")) {
+        	//resp.setMsg(ErrorMessage.USER_STATE_LOCKED);
+        	//resp.setCode(PASSPORT_LOGIN_CODE_LOCKED);
+		//}
-        if (Validator.isNull(resp.getAccountState()) 
-                || resp.getAccountState()!= LoginResp.ACCOUNT_STATE_NORMAL) {
-            throw new ServiceException(ResultCode.BUSINESS_FAILED,resp.getMsg());
-        }
+        //if (Validator.isNull(resp.getAccountState())
+        //        || resp.getAccountState()!= LoginResp.ACCOUNT_STATE_NORMAL) {
+        //    throw new ServiceException(ResultCode.BUSINESS_FAILED,resp.getMsg());
+        //}
         //登录redisKey=userId-deviceId
         //String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, resp.getAccountId()+Constant.COMMON_DASH+req.getDeviceId());
         String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(resp.getAccountId()));
         redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getAccountId()), loginExpireTime);
-        //TODO 去掉登录设备排斥验证
+
+        // 去掉登录设备排斥验证
         //if (!Validator.isNull(req.getDeviceId())) {
         //    String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID, String.valueOf(resp.getAccountId()));
         //    redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
+package com.diligrp.mobsite.getway.rpc.impl;
+
+import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
+import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
+import com.b2c.myapp.common.utils.BaseOutput;
+import com.b2c.myapp.sdk.MyAppClient;
+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.ModifyAmountReq;
+import com.diligrp.mobsite.getway.rpc.GoodsRPC;
+import com.diligrp.mobsite.getway.rpc.SellerRPC;
+import com.diligrp.website.util.redis.RedisUtil;
+import com.diligrp.website.util.security.Validator;
+import com.diligrp.website.web.interfaces.WebsiteClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * <B>Description</B> 用户rpc <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ *
+ * @author zhangshirui
+ * @createTime Aug 19, 2014 2:34:13 PM
+ */
+@Service
+public class SellerRPCImpl implements SellerRPC {
+
+
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private MyAppClient userClient;
+    @Resource
+    private WebsiteClient websiteClient;
+    @Resource
+    private GoodsRPC goodsRPC;
+
+
+    private static final Logger logger = LoggerFactory.getLogger(SellerRPCImpl.class);
+
+
+
+    @Override
+    public boolean checkMobile(String mobile) {
+        BaseOutput<SellerInfoOutput> output = null;
+        boolean flag = false;
+        try {
+            output = userClient.getSellerInfoService().getSellerInfoByMobilePhone(mobile);
+        } catch (Exception e) {
+            logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
+            throw new ServiceException();
+        }
+
+        if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
+            logger.error("手机号查询卖家接口失败：[userId={},code={},result={}]",new Object[]{mobile,output.getCode(),output.getResult()});
+            throw new ServiceException();
+        }
+        flag = !Validator.isNull(output.getData());
+        if(flag){
+            logger.info("success：电话号码没有被注册：mobile={}",mobile);
+        }else {
+            logger.info("error:电话号码已经被注册：mobile={}",mobile);
+        }
+        return flag;
+    }
+
+    @Override
+    public boolean modifyAmount(ModifyAmountReq req) {
+        return false;
+    }
+
+    @Override
+    public boolean modifyPwd(String accountName, String newPassword) {
+        return false;
+    }
+
+    @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;
+    }
+
+    @Override
+    public boolean checkPassword(Long userId, String password) {
+        return false;
+    }
+
+    @Override
+    public BuyerInfoOutput getUserByMobile(String accountName) {
+        BaseOutput<BuyerInfoOutput> output = null;
+        boolean flag = false;
+        try {
+            output = userClient.getBuyerInfoService().getBuyerInfoByMobilePhone(accountName);
+        } catch (Exception e) {
+            logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
+            throw new ServiceException();
+        }
+
+        if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
+            logger.error("手机号查询买家接口失败：[userId={},code={},result={}]",new Object[]{accountName,output.getCode(),output.getResult()});
+            throw new ServiceException();
+        }
+
+        if(Validator.isNull(output.getData())){
+            logger.info("查询用户为空：[mobile={}]",new Object[]{accountName});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_NOT_EXIST);
+        }
+        return output.getData();
+    }
+
+    @Override
+    public SellerInfoOutput getSellerByMobile(String accountName) {
+        BaseOutput<SellerInfoOutput> output = null;
+        boolean flag = false;
+        try {
+            output = userClient.getSellerInfoService().getSellerInfoByMobilePhone(accountName);
+        } catch (Exception e) {
+            logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
+            throw new ServiceException();
+        }
+
+        if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
+            logger.error("手机号查询买家接口失败：[userId={},code={},result={}]",new Object[]{accountName,output.getCode(),output.getResult()});
+            throw new ServiceException();
+        }
+
+        if(Validator.isNull(output.getData())){
+            logger.info("查询用户为空：[mobile={}]",new Object[]{accountName});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_NOT_EXIST);
+        }
+        return output.getData();
+    }
+
+}
+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;
+import com.diligrp.mobsite.getway.rpc.ShopRPC;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+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> 地利集团
+ * @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 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 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 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 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 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;
+	}
+}
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
+package com.diligrp.mobsite.getway.rpc.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -10,7 +10,7 @@ import com.diligrp.mobsite.getway.domain.protocol.msg.model.HomeMsgInfo;
 import com.diligrp.mobsite.getway.domain.protocol.msg.model.StationMsg;
 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.rpc.base.impl.BaseServiceImpl;
-import com.diligrp.mobsite.getway.rpc.buyer.StationMsgRPC;
+import com.diligrp.mobsite.getway.rpc.StationMsgRPC;
 import com.diligrp.website.util.security.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
+package com.diligrp.mobsite.getway.rpc.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.common.UploadFileResp;
-import com.diligrp.mobsite.getway.rpc.buyer.StoreRPC;
+import com.diligrp.mobsite.getway.rpc.StoreRPC;
 import com.diligrp.store.api.upload.DiliStoreUpload;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-package com.diligrp.mobsite.getway.rpc.buyer.impl;
-
+package com.diligrp.mobsite.getway.rpc.impl;
+
+import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
+import com.b2c.myapp.common.utils.BaseOutput;
+import com.b2c.myapp.sdk.MyAppClient;
+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.AddCartProduct;
 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
-import com.diligrp.mobsite.getway.rpc.buyer.UserRPC;
+import com.diligrp.mobsite.getway.rpc.GoodsRPC;
+import com.diligrp.mobsite.getway.rpc.UserRPC;
+import com.diligrp.website.util.redis.RedisUtil;
+import com.diligrp.website.util.security.Validator;
+import com.diligrp.website.web.interfaces.WebsiteClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
 import java.util.List;
@@ -22,6 +35,18 @@ import java.util.List;
 public class UserRPCImpl implements UserRPC {
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private MyAppClient userClient;
+    @Resource
+    private WebsiteClient websiteClient;
+    @Resource
+    private GoodsRPC goodsRPC;
+
+
+    private static final Logger logger = LoggerFactory.getLogger(UserRPCImpl.class);
+
     @Override
     public boolean checkFavorites(Long id, Long userId, Integer type) {
         return false;
@@ -54,7 +79,26 @@ public class UserRPCImpl implements UserRPC {
     @Override
     public boolean checkMobile(String mobile) {
-        return false;
+        BaseOutput<BuyerInfoOutput> output = null;
+        boolean flag = false;
+        try {
+            output = userClient.getBuyerInfoService().getBuyerInfoByMobilePhone(mobile);
+        } catch (Exception e) {
+            logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
+            throw new ServiceException();
+        }
+
+        if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
+            logger.error("手机号查询买家接口失败：[userId={},code={},result={}]",new Object[]{mobile,output.getCode(),output.getResult()});
+            throw new ServiceException();
+        }
+        flag = !Validator.isNull(output.getData());
+        if(flag){
+            logger.info("success：电话号码没有被注册：mobile={}",mobile);
+        }else {
+            logger.info("error:电话号码已经被注册：mobile={}",mobile);
+        }
+        return flag;
     }
     @Override
@@ -111,4 +155,27 @@ public class UserRPCImpl implements UserRPC {
     public boolean checkPassword(Long userId, String password) {
         return false;
     }
+
+    @Override
+    public BuyerInfoOutput getUserByMobile(String accountName) {
+        BaseOutput<BuyerInfoOutput> output = null;
+        boolean flag = false;
+        try {
+            output = userClient.getBuyerInfoService().getBuyerInfoByMobilePhone(accountName);
+        } catch (Exception e) {
+            logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
+            throw new ServiceException();
+        }
+
+        if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
+            logger.error("手机号查询买家接口失败：[userId={},code={},result={}]",new Object[]{accountName,output.getCode(),output.getResult()});
+            throw new ServiceException();
+        }
+
+        if(Validator.isNull(output.getData())){
+            logger.info("查询用户为空：[mobile={}]",new Object[]{accountName});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_NOT_EXIST);
+        }
+        return output.getData();
+    }
 }
-package com.diligrp.mobsite.getway.rpc.seller;
-
-
-/**
- * <B>Description</B> 验证rpc <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- *
- * @author duanyugen
- */
-public interface SellerShopRPC {
-
-}
-package com.diligrp.mobsite.getway.rpc.seller.impl;
-
-import com.diligrp.mobsite.getway.rpc.seller.SellerProductRPC;
-import org.springframework.stereotype.Service;
-
-
-/**
- * <B>Description</B> 搜索 <br />
- * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2014年8月22日 上午11:41:33
- */
-@Service("sellerProductRPC")
-public class SellerProductRPCImpl implements SellerProductRPC {
-
-}
-package com.diligrp.mobsite.getway.rpc.seller.impl;
-
-import com.diligrp.mobsite.getway.rpc.seller.SellerShopRPC;
-import org.springframework.stereotype.Service;
-
-
-/**
- * <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("sellerShopRPC")
-public class SellerShopRPCImpl implements SellerShopRPC {
-
-
-}
 \ No newline at end of file
@@ -12,8 +12,8 @@ import com.diligrp.mobsite.getway.domain.protocol.topic.model.HomeStatisticsTopi
 import com.diligrp.mobsite.getway.domain.protocol.topic.model.PicInfo;
 import com.diligrp.mobsite.getway.domain.protocol.topic.model.TopicCategory;
 import com.diligrp.mobsite.getway.domain.protocol.topic.model.TopicDetail;
-import com.diligrp.mobsite.getway.rpc.buyer.CmsRPC;
-import com.diligrp.mobsite.getway.rpc.buyer.impl.CmsRPCImpl;
+import com.diligrp.mobsite.getway.rpc.CmsRPC;
+import com.diligrp.mobsite.getway.rpc.impl.CmsRPCImpl;
 import com.diligrp.mobsite.getway.service.buyer.home.TopicService;
 import com.diligrp.mobsite.getway.service.common.utils.DateUtils;
 import com.diligrp.website.util.security.Validator;
@@ -5,7 +5,7 @@ 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.buyer.UserRPC;
+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;
 package com.diligrp.mobsite.getway.service.buyer.user;
-import com.diligrp.mobsite.getway.domain.protocol.login.CheckVeriCodeReq;
-import com.diligrp.mobsite.getway.domain.protocol.login.CheckVeriCodeResp;
-import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
-import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
-import com.diligrp.mobsite.getway.domain.protocol.login.LogoutReq;
-import com.diligrp.mobsite.getway.domain.protocol.login.LogoutResp;
-import com.diligrp.mobsite.getway.domain.protocol.login.SendVeriCodeReq;
-import com.diligrp.mobsite.getway.domain.protocol.login.SendVeriCodeResp;
+import com.diligrp.mobsite.getway.domain.protocol.login.*;
 import com.diligrp.mobsite.getway.domain.protocol.register.CheckAccountNameReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.CheckAccountNameResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.CheckMobileReq;
@@ -183,4 +176,6 @@ public interface UserService {
 	TradeRecordResp getTradeRecord(TradeRecordReq req);
 	SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req);
+
+	LoginResp authlogin(AuthLoginReq req);
 }
@@ -2,9 +2,7 @@ package com.diligrp.mobsite.getway.service.buyer.user.impl;
 import com.diligrp.mobsite.getway.domain.protocol.order.*;
-import com.diligrp.mobsite.getway.rpc.buyer.*;
-import com.diligrp.mobsite.getway.rpc.seller.SellerOrderRPC;
-import com.diligrp.mobsite.getway.rpc.seller.SellerShopRPC;
+import com.diligrp.mobsite.getway.rpc.*;
 import com.diligrp.mobsite.getway.service.buyer.user.OrderService;
 import com.diligrp.website.util.redis.RedisUtil;
 import com.diligrp.website.web.interfaces.WebsiteClient;
@@ -44,11 +42,7 @@ public class OrderServiceImpl implements OrderService {
 	@Resource
 	private ShopRPC shopRPC;
-	@Resource
-	private SellerShopRPC sellerShopRPC;
-	@Resource
-	private SellerOrderRPC sellerOrderRPC;
 	@Resource
 package com.diligrp.mobsite.getway.service.buyer.user.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
+import com.diligrp.mobsite.getway.domain.common.Constant;
+import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
+import com.diligrp.mobsite.getway.domain.common.RedisKey;
+import com.diligrp.mobsite.getway.domain.common.ResultCode;
+import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.login.*;
 import com.diligrp.mobsite.getway.domain.protocol.register.*;
 import com.diligrp.mobsite.getway.domain.protocol.user.*;
+import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
+import com.diligrp.mobsite.getway.rpc.*;
+import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil;
 import com.diligrp.mobsite.getway.service.buyer.user.UserService;
+import com.diligrp.mobsite.getway.service.common.utils.PassportUtils;
+import com.diligrp.website.util.redis.impl.RedisUtilImpl;
+import com.diligrp.website.util.security.Validator;
+import com.diligrp.website.web.interfaces.domain.output.DataDictionaryResp;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <B>Description</B> 用户 服务层 <br />
  * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
@@ -18,6 +39,30 @@ import org.springframework.stereotype.Service;
 @Service("userService")
 public class UserServiceImpl implements UserService {
+    @Resource
+    private UserRPC userRPC;
+    @Resource
+    private GoodsRPC goodsRPC;
+    @Autowired
+    private RedisUtilImpl redisUtil;
+    @Autowired
+    private UserRedisUtil userRedisUtil;
+
+    @Resource
+    private RegisterNoMapperManager registerNoMapperManager;
+    @Resource
+    private PassportRPC passportRPC;
+    @Resource
+    private ConfigRPC configRPC;
+
+    @Resource
+    private ShopRPC shopRPC;
+    @Autowired
+    private MessageRPC messageRPC;
+
+
+    private static Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+
     @Override
     public LoginResp login(LoginReq req) {
         return null;
@@ -30,12 +75,77 @@ public class UserServiceImpl implements UserService {
     @Override
     public CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req) {
-        return null;
+        CheckVeriCodeResp resp = new CheckVeriCodeResp();
+
+        checkVeriCode(req.getVeriCode(), req.getMobile(),req.getMsgType());
+
+        return resp;
     }
     @Override
     public SendVeriCodeResp sendVeriCode(SendVeriCodeReq req) {
-        return null;
+        SendVeriCodeResp resp = new SendVeriCodeResp();
+
+        String mobile = req.getMobile();
+        boolean existFlag = !userRPC.checkMobile(mobile);
+
+        Integer msgType = req.getMsgType();
+        String code = null;
+        String message = null;
+
+        String redisKey = redisUtil.makeKey(RedisKey.USER_AUTH_CODE + String.valueOf(msgType), mobile);
+        String veriCode = redisUtil.getString(redisKey);
+
+        if (Validator.isEmpty(veriCode)) {
+            //生成验证码
+            veriCode = PassportUtils.generateMobileRandomNumber();
+            redisUtil.setStringByExpire(redisKey, String.valueOf(veriCode), RedisKey.USER_SEND_VERICODE_EXPIRE_TIME);
+        }
+
+        if (!Validator.isNull(msgType) && msgType != SendVeriCodeReq.MSG_TYPE_DEFAULT) {
+            if (msgType==SendVeriCodeReq.MSG_TYPE_REGISTER) {
+                //注册，电话号码已经存在
+                if(existFlag){
+                    throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_MOBILE_EXIST);
+                }
+                String passkey = configRPC.getSystemConfig(Constant.USER_REGISTER_PASS_KEY);
+                resp.setPassKey(passkey);
+
+                messageRPC.sendSMSMsg(mobile, veriCode, Constant.SMS_CONTENT_ACCOUNT_REGISTRATION);
+                resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
+                return resp;
+            }else if(msgType==SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD) {
+                //找回密码，电话号码没有存在
+                if (!existFlag) {
+                    throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
+                }
+                messageRPC.sendSMSMsg(mobile, veriCode,Constant.SMS_CONTENT_RETRIEVE_PASSWORD);
+                resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
+                return resp;
+            }else if(msgType==SendVeriCodeReq.MSG_TYPE_MODIFY_NEW_MOBILE) {
+                //修改手机号，电话号码已经存在
+                if (existFlag) {
+                    throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_EXIST);
+                }
+                code = Constant.SMS_CONTENT_MODIFY_OLD_PHONE;
+            }else if (msgType==SendVeriCodeReq.MSG_TYPE_CHECK_OLD_MOBILE) {
+                //验证旧的手机号，手机不存在
+                if (!existFlag) {
+                    throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
+                }
+                code = Constant.SMS_CONTENT_MODIFY_OLD_PHONE;
+            }
+            DataDictionaryResp dataDic = configRPC.getMessageTemplate(Constant.DIC_SMS_CONTENT);
+            message = dataDic.getValueByCode(code).getRemark().replace("{code}", veriCode);
+        }else {
+            message = Constant.SMS_CONTENT_DEFAULT.replace("{code}", veriCode);
+        }
+
+        messageRPC.sendSMS(mobile, message);
+
+        resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
+
+        return resp;
     }
     @Override
@@ -55,7 +165,71 @@ public class UserServiceImpl implements UserService {
     @Override
     public UserRegisterResp userRegister(UserRegisterReq req) {
-        return null;
+        UserRegisterResp resp = new UserRegisterResp();
+
+        //手机号码和账号验证、验证码
+        //if (!checkRegisterInfo(resp, req)) {
+        //   return resp;
+        //}
+
+        resp = passportRPC.register(req);
+
+        return resp;
+    }
+
+
+    /**
+     * 检测注册信息是否正确
+     * 1.电话号码
+     * 2.账号，会员名
+     * 3.验证码
+     * @createTime 2014年10月31日 下午2:37:16
+     * @author zhangshirui
+     */
+    private boolean checkRegisterInfo(UserRegisterResp resp, UserRegisterReq req){
+        if(!userRPC.checkMobile(req.getMobile())){
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_EXIST);
+        }
+        //验证万能验证码
+        String passkey = configRPC.getSystemConfig(Constant.USER_REGISTER_PASS_KEY);
+        if (req.getVeriCode().equals(passkey)) {
+            return true;
+        }
+
+        checkVeriCode(req.getVeriCode(), req.getMobile(),SendVeriCodeReq.MSG_TYPE_REGISTER);
+
+        return true;
+    }
+
+    /**
+     * 根据验证码和电话号码，验证收到的验证码
+     *
+     * @param code
+     * @param mobile
+     * @return
+     * @createTime 2014年8月28日 下午5:44:48
+     * @author zhangshirui
+     */
+    private void checkVeriCode(String code, String mobile,Integer msgType) {
+
+        String redisKey = redisUtil.makeKey(RedisKey.USER_AUTH_CODE + String.valueOf(msgType), mobile);
+
+        String redisCode = redisUtil.getString(redisKey);
+
+        if(Validator.isEmpty(code)){
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_EMPTY);
+        }
+
+        //验证码为空
+        if (Validator.isEmpty(redisCode)) {
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_OVERTIME);
+        }
+
+        //验证码不为空，并且和redis中的验证码相同
+        if (!code.equals(redisCode)) {
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_WRONG);
+        }
+
     }
     @Override
@@ -115,7 +289,36 @@ public class UserServiceImpl implements UserService {
     @Override
     public ModifyPwdResp modifyPwd(ModifyPwdReq req) {
-        return null;
+        BuyerInfoOutput userInfo = userRPC.getUserByMobile(req.getAccountName());
+        Long userId = userInfo.getId();
+
+
+        Map<String,String> params = new HashMap<String, String>();
+        params.put("password", req.getPassword());
+        params.put("accountId", String.valueOf(userId));
+
+
+        String result = passportRPC.modifyPwd(params);
+
+        JSONObject jsonBody = JSONObject.parseObject(result);
+        int code = jsonBody.getIntValue("code");
+        ModifyPwdResp resp = new ModifyPwdResp();
+        resp.setMsg(jsonBody.getString("msg"));
+
+        if(code != ResultCode.SUCCESS){
+            //失败
+            resp.setCode(ResultCode.BUSINESS_FAILED);
+            resp.setResultFlag(ModifyPwdResp.RESULT_FLAG_FAILED);
+            return resp;
+        }else {
+            //修改成功，退出所有账号信息
+            String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(userId));
+            redisUtil.deleteByKey(cookieRedisKey);
+        }
+
+        logger.info("修改用户密码"+jsonBody.getString("msg"));
+
+        return resp;
     }
     @Override
@@ -172,4 +375,9 @@ public class UserServiceImpl implements UserService {
     public SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req) {
         return null;
     }
+
+    @Override
+    public LoginResp authlogin(AuthLoginReq req) {
+        return null;
+    }
 }
@@ -8,8 +8,8 @@ import com.diligrp.mobsite.getway.domain.protocol.City;
 import com.diligrp.mobsite.getway.domain.protocol.common.*;
 import com.diligrp.mobsite.getway.domain.protocol.common.model.UnitInfo;
 import com.diligrp.mobsite.getway.domain.protocol.user.MemberInfo;
-import com.diligrp.mobsite.getway.rpc.buyer.ConfigRPC;
-import com.diligrp.mobsite.getway.rpc.buyer.StoreRPC;
+import com.diligrp.mobsite.getway.rpc.ConfigRPC;
+import com.diligrp.mobsite.getway.rpc.StoreRPC;
 import com.diligrp.mobsite.getway.service.common.CommonService;
 import com.diligrp.website.util.security.Validator;
 import com.diligrp.website.web.interfaces.domain.output.CityResp;
@@ -15,7 +15,7 @@ import com.diligrp.mobsite.getway.domain.protocol.version.model.AppPatch;
 import com.diligrp.mobsite.getway.manager.common.AppPatchManager;
 import com.diligrp.mobsite.getway.manager.common.FeedBackManager;
 import com.diligrp.mobsite.getway.manager.common.VersionUpdateManager;
-import com.diligrp.mobsite.getway.rpc.buyer.UserRPC;
+import com.diligrp.mobsite.getway.rpc.UserRPC;
 import com.diligrp.mobsite.getway.service.common.VersionUpdateService;
 import com.diligrp.website.util.dao.BaseQuery;
 import com.diligrp.website.util.security.Validator;
@@ -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);
 }
@@ -15,7 +15,7 @@ import com.diligrp.mobsite.getway.domain.protocol.shop.*;
  */
 public interface SellerShopService {
-    CreateOrUpdateShopResp createShop(CreateOrUpdateShopReq req);
+    CreateShopResp createShop(CreateShopReq req);
     GetShopInfoResp getShopInfo(BaseReq req);
@@ -26,4 +26,6 @@ public interface SellerShopService {
     GetShopDeliveryTimeResp getShopDeliveryTime(GetShopDeliveryTimeReq req);
     DelShopDeliveryTimeResp delShopDeliveryTime(DelShopDeliveryTimeReq req);
+
+    CreateShopResp updateShop(UpdateShopReq req);
 }
 package com.diligrp.mobsite.getway.service.seller;
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.saler.user.*;
+import com.diligrp.mobsite.getway.domain.protocol.login.*;
+import com.diligrp.mobsite.getway.domain.protocol.register.*;
+import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.*;
 /**
@@ -23,61 +26,22 @@ public interface SellerUserService {
      */
     SellerLoginResp login(SellerLoginReq req) throws RuntimeException;
-    /**
-     *卖家申请开店
-     * */
-    @Deprecated
-    BaseResp sellerAplyShop(SellerApplyShopReq req) throws RuntimeException;
-
-	/**
-	 *卖家申请开店
-	 * */
-	BaseResp sellerAplyShopNew(SellerApplyShopNewReq req);
-    /**
-     *卖家修改店铺信息
-     * */
-    BaseResp sellerModifyShop(SellerModifyShopRequest req);
-
-    /**
-     *获取店铺详情
-     * */
-    SellerShopResp getShopDetail(GetSellerShopReq req) throws RuntimeException;
-    /***
-     * 开启或关闭赊销功能 1开启 2 关闭
-     * */
-    BaseResp openOrCloseShopCredit(OpenOrCloseReq req) throws RuntimeException;
-    /***
-     * 增加vip用户
-     * */
-    BaseResp saveVipUser(VipUserReq req) throws RuntimeException;
+    SendVeriCodeResp sendVeriCode(SendVeriCodeReq req);
-    /***
-     * 删除vip用户
-     * */
-    BaseResp deleteVipUser(VipUserReq req) throws RuntimeException;
+    CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req);
-    /***
-     * 修改vip用户
-     * */
-    BaseResp updateVipUser(VipUserReq req) throws RuntimeException;
+    CheckMobileResp checkMobile(CheckMobileReq req);
-    /***
-     * 查询vip用户号码在店铺是否存在
-     * */
-    CheckVipExisitResp isExistsNumber(VipUserReq req) throws RuntimeException;
+    ModifyPwdResp modifyPwd(ModifyPwdReq req);
-    /***
-     * 获取赊账用户列表
-     * */
-    SellerShopVipListResp queryVipUser(VipUserQueryReq req) throws RuntimeException;
+    SellerRegisterResp sellerRegister(SellerRegisterReq req);
-    /***
-     * 开启或关闭vip用户
-     * */
-    OpenOrCloseVipUserResp closeOrOpenVipUser(CloseOrOpenVipUserReq req);
+    LogoutResp logout(LogoutReq req);
+    UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req);
+    GetUserInfoResp getUserIntroduction(GetUserInfoReq 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;
     }
@@ -3,10 +3,9 @@ package com.diligrp.mobsite.getway.service.seller.impl;
 import com.diligrp.mobsite.getway.domain.protocol.product.*;
 import com.diligrp.mobsite.getway.domain.protocol.saler.SellerUpdateProductReq;
 import com.diligrp.mobsite.getway.domain.protocol.saler.product.*;
-import com.diligrp.mobsite.getway.rpc.buyer.ConfigRPC;
-import com.diligrp.mobsite.getway.rpc.buyer.GoodsRPC;
-import com.diligrp.mobsite.getway.rpc.buyer.UserRPC;
-import com.diligrp.mobsite.getway.rpc.seller.SellerProductRPC;
+import com.diligrp.mobsite.getway.rpc.ConfigRPC;
+import com.diligrp.mobsite.getway.rpc.GoodsRPC;
+import com.diligrp.mobsite.getway.rpc.UserRPC;
 import com.diligrp.mobsite.getway.service.seller.SellerGoodsService;
 import com.yqyw.filter.client.KeyWordsClient;
 import org.apache.log4j.Logger;
@@ -30,8 +29,6 @@ public class SellerGoodsServiceImpl implements SellerGoodsService {
     private UserRPC userRPC;
     @Autowired
     private ConfigRPC configRpc;
-    @Resource
-	private SellerProductRPC sellerProductRPC;
     @Resource
     private GoodsRPC goodsRPC;
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Service;
 public class SellerShopServiceImpl implements SellerShopService {
     @Override
-    public CreateOrUpdateShopResp createShop(CreateOrUpdateShopReq req) {
+    public CreateShopResp createShop(CreateShopReq req) {
         return null;
     }
@@ -48,4 +48,9 @@ public class SellerShopServiceImpl implements SellerShopService {
     public DelShopDeliveryTimeResp delShopDeliveryTime(DelShopDeliveryTimeReq req) {
         return null;
     }
+
+    @Override
+    public CreateShopResp updateShop(UpdateShopReq req) {
+        return null;
+    }
 }
 package com.diligrp.mobsite.getway.service.seller.impl;
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.saler.user.*;
+import com.alibaba.fastjson.JSONObject;
+import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
+import com.diligrp.mobsite.getway.domain.common.Constant;
+import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
+import com.diligrp.mobsite.getway.domain.common.RedisKey;
+import com.diligrp.mobsite.getway.domain.common.ResultCode;
+import com.diligrp.mobsite.getway.domain.except.ServiceException;
+import com.diligrp.mobsite.getway.domain.protocol.login.*;
+import com.diligrp.mobsite.getway.domain.protocol.register.*;
+import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginReq;
+import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.*;
+import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
+import com.diligrp.mobsite.getway.rpc.*;
+import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil;
+import com.diligrp.mobsite.getway.service.common.utils.PassportUtils;
 import com.diligrp.mobsite.getway.service.seller.SellerUserService;
+import com.diligrp.website.util.redis.impl.RedisUtilImpl;
+import com.diligrp.website.util.security.Validator;
+import com.diligrp.website.web.interfaces.domain.output.DataDictionaryResp;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <B>Description</B> 卖家用户信息 <br />
@@ -17,6 +41,29 @@ import org.springframework.stereotype.Service;
 @Service
 public class SellerUserServiceImpl implements SellerUserService {
+	@Resource
+	private SellerRPC sellerRPC;
+	@Resource
+	private GoodsRPC goodsRPC;
+	@Autowired
+	private RedisUtilImpl redisUtil;
+	@Autowired
+	private UserRedisUtil userRedisUtil;
+
+	@Resource
+	private RegisterNoMapperManager registerNoMapperManager;
+	@Resource
+	private PassportRPC passportRPC;
+	@Resource
+	private ConfigRPC configRPC;
+
+	@Resource
+	private ShopRPC shopRPC;
+	@Autowired
+	private MessageRPC messageRPC;
+
+
+	private static Logger logger = LoggerFactory.getLogger(SellerUserServiceImpl.class);
 	@Override
 	public SellerLoginResp login(SellerLoginReq req) throws RuntimeException {
@@ -24,57 +71,138 @@ public class SellerUserServiceImpl implements SellerUserService {
 	}
 	@Override
-	public BaseResp sellerAplyShop(SellerApplyShopReq req) throws RuntimeException {
-		return null;
+	public SendVeriCodeResp sendVeriCode(SendVeriCodeReq req) {
+		SendVeriCodeResp resp = new SendVeriCodeResp();
+
+		String mobile = req.getMobile();
+		boolean existFlag = !sellerRPC.checkMobile(mobile);
+
+		Integer msgType = req.getMsgType();
+		String code = null;
+		String message = null;
+
+		String redisKey = redisUtil.makeKey(RedisKey.USER_AUTH_CODE + String.valueOf(msgType), mobile);
+		String veriCode = redisUtil.getString(redisKey);
+
+		if (Validator.isEmpty(veriCode)) {
+			//生成验证码
+			veriCode = PassportUtils.generateMobileRandomNumber();
+			redisUtil.setStringByExpire(redisKey, String.valueOf(veriCode), RedisKey.USER_SEND_VERICODE_EXPIRE_TIME);
+		}
+
+		if (!Validator.isNull(msgType) && msgType != SendVeriCodeReq.MSG_TYPE_DEFAULT) {
+			if (msgType==SendVeriCodeReq.MSG_TYPE_REGISTER) {
+				//注册，电话号码已经存在
+				if(existFlag){
+					throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_MOBILE_EXIST);
+				}
+				String passkey = configRPC.getSystemConfig(Constant.USER_REGISTER_PASS_KEY);
+				resp.setPassKey(passkey);
+
+				messageRPC.sendSMSMsg(mobile, veriCode, Constant.SMS_CONTENT_ACCOUNT_REGISTRATION);
+				resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
+				return resp;
+			}else if(msgType==SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD) {
+				//找回密码，电话号码没有存在
+				if (!existFlag) {
+					throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
+				}
+				messageRPC.sendSMSMsg(mobile, veriCode,Constant.SMS_CONTENT_RETRIEVE_PASSWORD);
+				resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
+				return resp;
+			}else if(msgType==SendVeriCodeReq.MSG_TYPE_MODIFY_NEW_MOBILE) {
+				//修改手机号，电话号码已经存在
+				if (existFlag) {
+					throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_EXIST);
+				}
+				code = Constant.SMS_CONTENT_MODIFY_OLD_PHONE;
+			}else if (msgType==SendVeriCodeReq.MSG_TYPE_CHECK_OLD_MOBILE) {
+				//验证旧的手机号，手机不存在
+				if (!existFlag) {
+					throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
+				}
+				code = Constant.SMS_CONTENT_MODIFY_OLD_PHONE;
+			}
+			DataDictionaryResp dataDic = configRPC.getMessageTemplate(Constant.DIC_SMS_CONTENT);
+			message = dataDic.getValueByCode(code).getRemark().replace("{code}", veriCode);
+		}else {
+			message = Constant.SMS_CONTENT_DEFAULT.replace("{code}", veriCode);
+		}
+
+		messageRPC.sendSMS(mobile, message);
+
+		resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
+
+		return resp;
 	}
 	@Override
-	public BaseResp sellerAplyShopNew(SellerApplyShopNewReq req) {
+	public CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req) {
 		return null;
 	}
 	@Override
-	public BaseResp sellerModifyShop(SellerModifyShopRequest req) {
-		return null;
-	}
+	public CheckMobileResp checkMobile(CheckMobileReq req) {
+		CheckMobileResp resp = new CheckMobileResp();
-	@Override
-	public SellerShopResp getShopDetail(GetSellerShopReq req) throws RuntimeException {
-		return null;
-	}
+		boolean flag = sellerRPC.checkMobile(req.getMobile());
-	@Override
-	public BaseResp openOrCloseShopCredit(OpenOrCloseReq req) throws RuntimeException {
-		return null;
-	}
+		resp.setCheckFlag(flag ? CheckMobileResp.CHECK_FLAG_OK : CheckMobileResp.CHECK_FLAG_ERROR);
-	@Override
-	public BaseResp saveVipUser(VipUserReq req) throws RuntimeException {
-		return null;
+		return resp;
 	}
 	@Override
-	public BaseResp deleteVipUser(VipUserReq req) throws RuntimeException {
-		return null;
+	public ModifyPwdResp modifyPwd(ModifyPwdReq req) {
+		SellerInfoOutput userInfo = sellerRPC.getSellerByMobile(req.getAccountName());
+		Long userId = userInfo.getId();
+
+
+		Map<String,String> params = new HashMap<String, String>();
+		params.put("password", req.getPassword());
+		params.put("accountId", String.valueOf(userId));
+
+
+		String result = passportRPC.modifyPwd(params);
+
+		JSONObject jsonBody = JSONObject.parseObject(result);
+		int code = jsonBody.getIntValue("code");
+		ModifyPwdResp resp = new ModifyPwdResp();
+		resp.setMsg(jsonBody.getString("msg"));
+
+		if(code != ResultCode.SUCCESS){
+			//失败
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+			resp.setResultFlag(ModifyPwdResp.RESULT_FLAG_FAILED);
+			return resp;
+		}else {
+			//修改成功，退出所有账号信息
+			String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(userId));
+			redisUtil.deleteByKey(cookieRedisKey);
+		}
+
+		logger.info("修改用户密码"+jsonBody.getString("msg"));
+
+		return resp;
 	}
 	@Override
-	public BaseResp updateVipUser(VipUserReq req) throws RuntimeException {
+	public SellerRegisterResp sellerRegister(SellerRegisterReq req) {
 		return null;
 	}
 	@Override
-	public CheckVipExisitResp isExistsNumber(VipUserReq req) throws RuntimeException {
+	public LogoutResp logout(LogoutReq req) {
 		return null;
 	}
 	@Override
-	public SellerShopVipListResp queryVipUser(VipUserQueryReq req) throws RuntimeException {
+	public UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req) {
 		return null;
 	}
 	@Override
-	public OpenOrCloseVipUserResp closeOrOpenVipUser(CloseOrOpenVipUserReq req) {
+	public GetUserInfoResp getUserIntroduction(GetUserInfoReq req) {
 		return null;
 	}
 }
@@ -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 -->
@@ -2,7 +2,7 @@ package com.diligrp.mobsite.getway.web.api.base;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.common.*;
-import com.diligrp.mobsite.getway.rpc.buyer.impl.StoreRPCImpl;
+import com.diligrp.mobsite.getway.rpc.impl.StoreRPCImpl;
 import com.diligrp.mobsite.getway.service.common.CommonService;
 import com.diligrp.website.util.security.Validator;
 import io.swagger.annotations.Api;
@@ -100,12 +100,11 @@ public class UserController extends BaseApiController {
     @ApiOperation(value = "买家验证码登录", httpMethod = "POST" , notes = "买家验证码登录",response = LoginResp.class)
     @RequestMapping(value = "/loginForAuth",method = RequestMethod.POST)
     @ResponseBody
-    public void loginForAuth(@RequestBody  LoginReq temp){
-        LoginReq req = super.getRequest(LoginReq.class);
+    public void loginForAuth(@RequestBody  AuthLoginReq temp){
+        AuthLoginReq req = super.getRequest(AuthLoginReq.class);
         try {
             BeanValidator.validator(req);
-            req.setPassword(decodeStr(req.getPassword()));
-            LoginResp resp = userService.login(req);
+            LoginResp resp = userService.authlogin(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
@@ -165,11 +164,11 @@ public class UserController extends BaseApiController {
     }
     /**
-     * 验证手机收到的验证码
+     * 忘记密码:验证手机收到的验证码
      * @createTime 2014年8月24日 下午10:55:03
      * @author weili
      */
-    @ApiOperation(value = "验证手机收到的验证码", httpMethod = "POST" , notes = "验证手机收到的验证码",response = CheckVeriCodeResp.class)
+    @ApiOperation(value = "忘记密码:验证手机号和验证码", httpMethod = "POST" , notes = "验证手机收到的验证码",response = CheckVeriCodeResp.class)
     @RequestMapping(value = "/checkAuthCode",method = RequestMethod.POST)
     @ResponseBody
     public void checkAuthCode(@RequestBody  CheckVeriCodeReq temp){
@@ -187,54 +186,6 @@ public class UserController extends BaseApiController {
             super.sendError(e.getMessage());
         }
     }
-    //
-    ///**
-    // * 修改用户信息
-    // * @createTime 2014年8月24日 下午10:55:03
-    // * @author weili
-    // */
-    //@RequestMapping("/updateUserInfo")
-    //@ResponseBody
-    //@ApiOperation(value = "修改用户信息", httpMethod = "POST")
-    //public void updateUserInfo(){
-    //    UpdateUserInfoReq req = super.getRequest(UpdateUserInfoReq.class);
-    //    try {
-    //    	UpdateUserInfoResp resp = userService.updateUserInfo(req);
-    //        super.sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-    //                e.getCode(), e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        LOGGER.error("修改密码：", e);
-    //        super.sendError(e.getMessage());
-    //    }
-    //
-    //}
-    //
-    //
-    ///**
-    // * 完善用户信息
-    // * @createTime 2014年8月24日 下午10:55:03
-    // * @author weili
-    // */
-    //@RequestMapping("/completeUserInfo")
-    //@ResponseBody
-    //public void completeUserInfo(){
-    //    CompleteUserInfoReq req = super.getRequest(CompleteUserInfoReq.class);
-    //    try {
-    //        UpdateUserInfoResp resp = userService.completeUserInfo(req);
-    //        super.sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-    //                e.getCode(), e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        LOGGER.error("修改密码：", e);
-    //        super.sendError(e.getMessage());
-    //    }
-    //
-    //}
     /**
@@ -242,7 +193,7 @@ public class UserController extends BaseApiController {
      * @createTime 2014年8月24日 下午10:55:03
      * @author weili
      */
-    @ApiOperation(value = "找回密码-修改用户密码", httpMethod = "POST" ,response = SendVeriCodeResp.class)
+    @ApiOperation(value = "找回密码-设置用户新密码", httpMethod = "POST" ,response = SendVeriCodeResp.class)
     @RequestMapping(value = "/modifyPwd",method = RequestMethod.POST)
     @ResponseBody
     public void modifyPwd(@RequestBody  ModifyPwdReq temp){
@@ -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);
@@ -32,16 +32,36 @@ public class SellerShopController extends BaseApiController{
     /**
-     * 创建或修改店铺信息
+     * 创建店铺
      */
-    @ApiOperation(value = "创建或修改店铺信息", httpMethod = "POST",response = CreateOrUpdateShopResp.class)
-    @RequestMapping(value = "/createOrUpdateShop",method = RequestMethod.POST)
+    @ApiOperation(value = "创建店铺", httpMethod = "POST",response = CreateShopResp.class)
+    @RequestMapping(value = "/createShop",method = RequestMethod.POST)
     @ResponseBody
-    public void createOrUpdateShop(@RequestBody CreateOrUpdateShopReq temp) {
-        CreateOrUpdateShopReq req = getRequest(CreateOrUpdateShopReq.class);
+    public void createShop(@RequestBody CreateShopReq temp) {
+        CreateShopReq req = getRequest(CreateShopReq.class);
         try {
             //BeanValidator.validator(req);
-            CreateOrUpdateShopResp resp = sellerShopService.createShop(req);
+            CreateShopResp resp = sellerShopService.createShop(req);
+            sendSuccessResp(resp);
+        }
+        catch(Exception e) {
+            log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
+            sendError(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 修改店铺信息
+     */
+    @ApiOperation(value = "修改店铺信息", httpMethod = "POST",response = UpdateShopResp.class)
+    @RequestMapping(value = "/updateShop",method = RequestMethod.POST)
+    @ResponseBody
+    public void updateShop(@RequestBody UpdateShopReq temp) {
+        UpdateShopReq req = getRequest(UpdateShopReq.class);
+        try {
+            //BeanValidator.validator(req);
+            CreateShopResp resp = sellerShopService.updateShop(req);
             sendSuccessResp(resp);
         }
         catch(Exception e) {
 package com.diligrp.mobsite.getway.web.api.seller.user;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
+import com.diligrp.mobsite.getway.domain.protocol.login.*;
+import com.diligrp.mobsite.getway.domain.protocol.register.CheckMobileReq;
+import com.diligrp.mobsite.getway.domain.protocol.register.CheckMobileResp;
+import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterReq;
+import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginReq;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdResp;
 import com.diligrp.mobsite.getway.service.seller.SellerUserService;
 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
+import com.diligrp.mobsite.getway.web.utils.BeanValidator;
+import com.diligrp.website.util.security.Validator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.log4j.Logger;
@@ -59,4 +68,259 @@ public class SellerUserController extends BaseApiController {
     }
+    /**
+     * 加密用户登录(加密)
+     * @createTime 2014年8月24日 下午10:55:03
+     * @author weili
+     */
+    @ApiOperation(value = "卖家登录", httpMethod = "POST",response = SellerLoginResp.class)
+    @RequestMapping(value = "/sellerLogins",method = RequestMethod.POST)
+    @ResponseBody
+    public void sellerLogins(@RequestBody  SellerLoginReq temp){
+        SellerLoginReq req = super.getRequest(SellerLoginReq.class);
+        try {
+            BeanValidator.validator(req);
+            req.setPassword(decodeStr(req.getPassword()));
+            SellerLoginResp resp = sellerUserService.login(req);
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e){
+            log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+                    e.getCode(), e.getMessage(), req.getUserId()), e);
+            super.sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("用户登录失败：", e);
+            super.sendError(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 验证手机号是否已经被注册
+     * @createTime 2017年1月9日 下午3:41:02
+     * @author weili
+     */
+    @ApiOperation(value = "验证手机号是否已经被注册", httpMethod = "POST" ,response = CheckMobileResp.class)
+    @RequestMapping(value = "/checkMobile",method = RequestMethod.POST)
+    @ResponseBody
+    public void checkMobile(@RequestBody CheckMobileReq temp){
+        CheckMobileReq req = super.getRequest(CheckMobileReq.class);
+        CheckMobileResp resp = null;
+        try {
+            if(!Validator.isNull(req) && !Validator.isNull(req.getMobile())){
+                resp = sellerUserService.checkMobile(req);
+            } else {
+                resp = new CheckMobileResp();
+            }
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e){
+            log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+                    e.getCode(), e.getMessage(), req.getUserId()), e);
+            sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("验证手机失败：", e);
+            super.sendError(e.getMessage());
+        }
+    }
+
+    /**
+     * 发送验证码到手机
+     * @createTime 2014年8月24日 下午10:55:03
+     * @author weili
+     */
+    @ApiOperation(value = "发送验证码到手机", httpMethod = "POST" , notes = "发送验证码到手机",response = SendVeriCodeResp.class)
+    @RequestMapping(value = "/sendAuthCode",method = RequestMethod.POST)
+    @ResponseBody
+    public void sendAuthCode(@RequestBody SendVeriCodeReq temp){
+        SendVeriCodeReq req= super.getRequest(SendVeriCodeReq.class);
+        try {
+            BeanValidator.validator(req);
+            SendVeriCodeResp resp = sellerUserService.sendVeriCode(req);
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e){
+            log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+                    e.getCode(), e.getMessage(), req.getUserId()), e);
+            sendError(e.getMessage());
+        } catch (Exception e) {
+            log.error("发送验证码失败：", e);
+            super.sendError(e.getMessage());
+        }
+    }
+
+    /**
+     * 忘记密码:验证手机收到的验证码
+     * @createTime 2014年8月24日 下午10:55:03
+     * @author weili
+     */
+    @ApiOperation(value = "验证手机号和验证码", httpMethod = "POST" , notes = "验证手机收到的验证码",response = CheckVeriCodeResp.class)
+    @RequestMapping(value = "/checkAuthCode",method = RequestMethod.POST)
+    @ResponseBody
+    public void checkAuthCode(@RequestBody CheckVeriCodeReq temp){
+        CheckVeriCodeReq req= super.getRequest(CheckVeriCodeReq.class);
+        try {
+            BeanValidator.validator(req);
+            CheckVeriCodeResp resp = sellerUserService.checkVeriCode(req);
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e){
+            log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+                    e.getCode(), e.getMessage(), req.getUserId()), e);
+            sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("验证手机收到的验证码：", e);
+            super.sendError(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 找回密码-修改用户密码
+     * @createTime 2014年8月24日 下午10:55:03
+     * @author weili
+     */
+    @ApiOperation(value = "找回密码-设置用户新密码", httpMethod = "POST" ,response = SendVeriCodeResp.class)
+    @RequestMapping(value = "/modifyPwd",method = RequestMethod.POST)
+    @ResponseBody
+    public void modifyPwd(@RequestBody ModifyPwdReq temp){
+        ModifyPwdReq req = super.getRequest(ModifyPwdReq.class);
+        ModifyPwdResp resp = null;
+        try {
+            BeanValidator.validator(req);
+            resp = sellerUserService.modifyPwd(req);
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e){
+            log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+                    e.getCode(), e.getMessage(), req.getUserId()), e);
+            sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("修改密码：", e);
+            super.sendError(e.getMessage());
+        }
+
+    }
+
+    /**
+     * 卖家注册
+     * @createTime 2014年8月28日 下午3:41:02
+     * @author weili
+     */
+    @ApiOperation(value = "卖家注册", httpMethod = "POST" ,response = SellerRegisterResp.class)
+    @RequestMapping(value = "/sellerRegister",method = RequestMethod.POST)
+    @ResponseBody
+    public void sellerRegister(@RequestBody SellerRegisterReq temp){
+        SellerRegisterReq req = super.getRequest(SellerRegisterReq.class);
+        try {
+            BeanValidator.validator(req);
+            SellerRegisterResp resp = sellerUserService.sellerRegister(req);
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e){
+            log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+                    e.getCode(), e.getMessage(), req.getUserId()), e);
+            sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("用户注册失败：", e);
+            super.sendError(e.getMessage());
+        }
+    }
+
+    /**
+     * 卖家注册(加密)
+     * @createTime 2014年8月28日 下午3:41:02
+     * @author weili
+     */
+    @ApiOperation(value = "卖家注册", httpMethod = "POST" ,response = SellerRegisterResp.class)
+    @RequestMapping(value = "/sellerRegisters",method = RequestMethod.POST)
+    @ResponseBody
+    public void sellerRegisters(@RequestBody  SellerRegisterReq temp){
+        SellerRegisterReq req = super.getRequest(SellerRegisterReq.class);
+        try {
+            BeanValidator.validator(req);
+            req.setPassword(decodeStr(req.getPassword()));
+            SellerRegisterResp resp = sellerUserService.sellerRegister(req);
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e){
+            log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+                    e.getCode(), e.getMessage(), req.getUserId()), e);
+            sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("用户注册失败：", e);
+            super.sendError(e.getMessage());
+        }
+    }
+
+    /**
+     * 退出操作
+     *
+     * @createTime 2014年8月29日 上午9:30:10
+     * @author weili
+     */
+    @ApiOperation(value = "退出", httpMethod = "POST"  ,response = LogoutResp.class)
+    @RequestMapping(value = "/logout",method = RequestMethod.POST)
+    @ResponseBody
+    public void logout(@RequestBody  LogoutReq temp){
+        LogoutReq req = super.getRequest(LogoutReq.class);
+        try {
+            if(Validator.isNull(req) || !Validator.isNumber(req.getUserId()+"")) {
+                throw new NullPointerException("参数传递错误");
+            }
+            LogoutResp resp = sellerUserService.logout(req);
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e){
+            log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+                    e.getCode(), e.getMessage(), req.getUserId()), e);
+            sendError(e.getCode(), e.getMessage());
+        }
+        catch (Exception e) {
+            log.error("用户退出失败：", e);
+            super.sendError(e.getMessage());
+        }
+    }
+
+    ///**
+    // * 个人信息维护
+    // * @createTime 2016年8月24日 下午10:55:03
+    // * @author weili
+    // */
+    //@ApiOperation(value = "个人信息维护", httpMethod = "POST" ,response = UpdateUserInfoResp.class)
+    //@RequestMapping(value = "/updateUserInfo",method = RequestMethod.POST)
+    //@ResponseBody
+    //public void updateUserInfo(@RequestBody UpdateUserInfoReq temp){
+    //    UpdateUserInfoReq req = super.getRequest(UpdateUserInfoReq.class);
+    //    try {
+    //        UpdateUserInfoResp resp = sellerUserService.updateUserInfo(req);
+    //        super.sendSuccessResp(resp);
+    //    } catch (ServiceException e){
+    //        log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+    //                e.getCode(), e.getMessage(), req.getUserId()), e);
+    //        sendError(e.getCode(), e.getMessage());
+    //    } catch (Exception e) {
+    //        log.error("个人信息维护：", e);
+    //        super.sendError(e.getMessage());
+    //    }
+    //
+    //}
+
+
+
+    //
+    ///**
+    // *  查询用户信息
+    // * GetUserInfoReq
+    // */
+    //@ApiOperation(value = "查询卖家用户信息", httpMethod = "POST"  ,response = GetDepositCardAmountResp.class)
+    //@RequestMapping(value = "/getsellerInfo",method = RequestMethod.POST)
+    //@ResponseBody
+    //public void getsellerInfo() {
+    //    GetUserInfoReq req = getRequest(GetUserInfoReq.class);
+    //    try {
+    //        GetUserInfoResp resp = sellerUserService.getUserIntroduction(req);
+    //        super.sendSuccessResp(resp);
+    //    } catch (ServiceException e){
+    //        log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+    //                e.getCode(), e.getMessage(), req.getUserId()), e);
+    //        sendError(e.getCode(), e.getMessage());
+    //    } catch (Exception e) {
+    //        log.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(), req.getUserId()), e);
+    //        sendError(e.getMessage());
+    //    }
+    //}
+
 }
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!-- /** * * Licensed to the Apache Software Foundation (ASF) under one * 
-	or more contributor license agreements. See the NOTICE file * distributed 
-	with this work for additional information * regarding copyright ownership. 
-	The ASF licenses this file * to you under the Apache License, Version 2.0 
-	(the * "License"); you may not use this file except in compliance * with 
-	the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 
-	* * Unless required by applicable law or agreed to in writing, software * 
-	distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 
-	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the 
-	License for the specific language governing permissions and * limitations 
-	under the License. */ -->
-<configuration>
-
-	<property>
-		<name>hbase.master</name>
-		<value>node1</value>
-	</property>
-
-	<property>
-		<name>hbase.master.port</name>
-		<value>60000</value>
-	</property>
-
-	<property>
-		<name>hbase.zookeeper.property.clientPort</name>
-		<value>2181</value>
-	</property>
-
-	<property>
-		<name>hbase.rootdir</name>
-		<value>hdfs://mycluster/hbase</value>
-	</property>
-
-	<property>
-		<name>hbase.zookeeper.quorum</name>
-		<value>node2,node3,node4</value>
-	</property>
-</configuration>
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration PUBLIC
-                "-//APACHE//DTD LOG4J 1.2//EN" "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd">
-<log4j:configuration>
-
-        <appender name="MONITOR_LOG" class="org.apache.log4j.DailyRollingFileAppender">
-                <param name="Encoding" value="UTF-8"/>
-                <param name="Append" value="true" />
-                <param name="File" value="${catalina.base}/logs/monitor/monitor.log"/>
-               <!-- <param name="File" value="/diliapp/servers/apache-tomcat-6.0.43/monitor/monitor.log"/>-->
-                <!--<param name="File" value="/home/tomcat/monitor/mobapi-gateway/monitor.log"/>-->
-
-                <param name="DatePattern" value="'.'yyyy-MM-dd" />
-                <layout class="org.apache.log4j.PatternLayout">
-                        <param name="ConversionPattern" value="[%p] [%d] [%r] [%c] - %m %n"/>
-                </layout>
-        </appender>
-
-        <category name="MONITOR_LOG" additivity="false">
-                <priority value="INFO"/>
-                <appender-ref ref="MONITOR_LOG"/>
-        </category>
-
-</log4j:configuration>
 \ No newline at end of file
@@ -33,7 +33,7 @@
     </bean>
     <bean id="passportRPC"
-          class="com.diligrp.mobsite.getway.rpc.buyer.impl.PassportRPCImpl">
+          class="com.diligrp.mobsite.getway.rpc.impl.PassportRPCImpl">
         <constructor-arg name="token" value="${website.passport.token}"/>
         <constructor-arg name="baseUrl" value="${website.passport.baseUrl}"/>
     </bean>
@@ -49,13 +49,13 @@
-    <bean id="imageUploadService" class="com.dili.imageserver.sdk.service.ImageUploadService">
-        <property name="IMAGE_UPLOAD_URL_PREFIX" value="${project.imageserver.prefix}"/>
-        <property name="AUTH_TOKEN" value="LeaDOqaef8mo4G6bSq8o2bh7lEPlViRU"/>
-        <property name="ENCODING" value="UTF-8"></property>
-        <property name="DEFAULT_MAX_PER_ROUTE" value="20"></property>
-        <property name="MAX_TOTAL" value="100"></property>
-    </bean>
+    <!--<bean id="imageUploadService" class="com.dili.imageserver.sdk.service.ImageUploadService">-->
+        <!--<property name="IMAGE_UPLOAD_URL_PREFIX" value="${project.imageserver.prefix}"/>-->
+        <!--<property name="AUTH_TOKEN" value="LeaDOqaef8mo4G6bSq8o2bh7lEPlViRU"/>-->
+        <!--<property name="ENCODING" value="UTF-8"></property>-->
+        <!--<property name="DEFAULT_MAX_PER_ROUTE" value="20"></property>-->
+        <!--<property name="MAX_TOTAL" value="100"></property>-->
+    <!--</bean>-->
     <bean id="dataStoredConfig" class="com.dili.dataStored.sdk.common.DataStoredConfig">
         <property name="trackercount" value="${project.fastdfs.trackercount}"/>
         <property name="connectTimeout" value="${project.fastdfs.connectTimeout}"/>
@@ -96,7 +96,7 @@
     <bean id="stationMsgRPC"
-          class="com.diligrp.mobsite.getway.rpc.buyer.impl.StationMsgRPCImpl">
+          class="com.diligrp.mobsite.getway.rpc.impl.StationMsgRPCImpl">
         <constructor-arg name="token" value="${website.stationmsg.token}"/>
         <constructor-arg name="baseUrl" value="${website.stationmsg.baseUrl}"/>
     </bean>