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

jiangchengyong
2 parents e02d4076 7cd7c324
Showing 11 changed files with 296 additions and 94 deletions
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/register/CheckMobileReq.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/shop/UpdateShopResp.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/SellerShopService.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerShopServiceImpl.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/shop/SellerShopController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/user/SellerUserController.java
 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.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;
     /**
@@ -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.domain.protocol.shop;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+/**
+ * <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 UpdateShopResp extends BaseResp {
+
+
+  }
@@ -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);
 }
@@ -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;
+    }
 }
@@ -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) {
@@ -2,14 +2,17 @@ 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.*;
+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.*;
+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.mobsite.getway.web.utils.DiligrpEndpoint;
 import com.diligrp.website.util.security.Validator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -93,13 +96,13 @@ public class SellerUserController extends BaseApiController {
     /**
      * 验证手机号是否已经被注册
-     * @createTime 2014年8月28日 下午3:41:02
-     * @author zhangshirui
+     * @createTime 2017年1月9日 下午3:41:02
+     * @author weili
      */
-    @RequestMapping("/checkMobile")
+    @ApiOperation(value = "验证手机号是否已经被注册", httpMethod = "POST" ,response = CheckMobileResp.class)
+    @RequestMapping(value = "/checkMobile",method = RequestMethod.POST)
     @ResponseBody
-    @DiligrpEndpoint(req = CheckMobileReq.class, resp=CheckMobileResp.class,group = "手机端个人中心",desc = "验证指定手机号是否已被注册")
-    public void checkMobile(){
+    public void checkMobile(@RequestBody CheckMobileReq temp){
         CheckMobileReq req = super.getRequest(CheckMobileReq.class);
         CheckMobileResp resp = null;
         try {
@@ -148,7 +151,7 @@ public class SellerUserController 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){
@@ -271,53 +274,53 @@ public class SellerUserController extends BaseApiController {
         }
     }
-    /**
-     * 个人信息维护
-     * @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());
-        }
+    ///**
+    // * 个人信息维护
+    // * @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());
-        }
-    }
+    //
+    ///**
+    // *  查询用户信息
+    // * 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());
+    //    }
+    //}
 }