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

Jiang
2 parents e59d841c ce323d7b
Showing 46 changed files with 119 additions and 1268 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/AddLogisticsLineReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/AddLogisticsLineResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/AddLogisticsVehicleReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/AddLogisticsVehicleResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CancelTopLogisticsLineReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CancelTopLogisticsLineResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CountLogisticsLineReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CountLogisticsLineResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CountLogisticsLineVehicleReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CountLogisticsLineVehicleResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CountLogisticsVehicleReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CountLogisticsVehicleResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CreateShopReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CreateShopResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/DeleteLogisticsLineReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/DeleteLogisticsLineResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/DeleteLogisticsVehicleReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/DeleteLogisticsVehicleResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/FindLogisticsVehicleByModelIdReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/FindLogisticsVehicleByModelIdResp.java
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import java.util.List;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.LineInfo;
-
-/**
- * <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 AddLogisticsLineReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-	
-	/**
-	 * 始发地
-	 */
-    private LineInfo from;
-    
-    /**
-     * 目的地
-     */
-    private List<LineInfo> to;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-
-	public LineInfo getFrom() {
-		return from;
-	}
-
-	public void setFrom(LineInfo from) {
-		this.from = from;
-	}
-
-	public List<LineInfo> getTo() {
-		return to;
-	}
-
-	public void setTo(List<LineInfo> to) {
-		this.to = to;
-	}
-    
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class AddLogisticsLineResp extends BaseResp {
-
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.VehicleInfo;
-
-/**
- * <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 AddLogisticsVehicleReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-	
-	/**
-     * 车牌号
-     * */
-    private String plateNumber;
-
-    /**
-     * 车型ID
-     * */
-    private Long modelId;
-
-    /**
-     * 车型名称
-     * */
-    private String modelName;
-
-    /**
-     * 车长
-     * */
-    private Float length;
-    
-    /**
-     * 载重量
-     */
-    private Float carryWeight;
-    
-    /**
-     * 行驶证号
-     */
-    private String vehicleLicenseNumber;
-    
-    /**
-     * 驾驶证号
-     */
-    private String drivingLicenseNumber;
-    
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-
-	public String getPlateNumber() {
-		return plateNumber;
-	}
-
-	public void setPlateNumber(String plateNumber) {
-		this.plateNumber = plateNumber;
-	}
-
-	public Long getModelId() {
-		return modelId;
-	}
-
-	public void setModelId(Long modelId) {
-		this.modelId = modelId;
-	}
-
-	public String getModelName() {
-		return modelName;
-	}
-
-	public void setModelName(String modelName) {
-		this.modelName = modelName;
-	}
-
-	public Float getLength() {
-		return length;
-	}
-
-	public void setLength(Float length) {
-		this.length = length;
-	}
-
-	public Float getCarryWeight() {
-		return carryWeight;
-	}
-
-	public void setCarryWeight(Float carryWeight) {
-		this.carryWeight = carryWeight;
-	}
-
-	public String getVehicleLicenseNumber() {
-		return vehicleLicenseNumber;
-	}
-
-	public void setVehicleLicenseNumber(String vehicleLicenseNumber) {
-		this.vehicleLicenseNumber = vehicleLicenseNumber;
-	}
-
-	public String getDrivingLicenseNumber() {
-		return drivingLicenseNumber;
-	}
-
-	public void setDrivingLicenseNumber(String drivingLicenseNumber) {
-		this.drivingLicenseNumber = drivingLicenseNumber;
-	}
-
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class AddLogisticsVehicleResp extends BaseResp {
-
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 CancelTopLogisticsLineReq extends BaseReq {
-
-	/**
-	 * 线路id
-	 */
-	private Long id;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class CancelTopLogisticsLineResp extends BaseResp {
-
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 CountLogisticsLineReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class CountLogisticsLineResp extends BaseResp {
-	
-	private Integer lineCount;
-
-	public Integer getLineCount() {
-		return lineCount;
-	}
-
-	public void setLineCount(Integer lineCount) {
-		this.lineCount = lineCount;
-	}
-	
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 CountLogisticsLineVehicleReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class CountLogisticsLineVehicleResp extends BaseResp {
-	
-	private Integer lineCount;
-	
-	private Integer vehicleCount;
-
-	public Integer getLineCount() {
-		return lineCount;
-	}
-
-	public void setLineCount(Integer lineCount) {
-		this.lineCount = lineCount;
-	}
-
-	public Integer getVehicleCount() {
-		return vehicleCount;
-	}
-
-	public void setVehicleCount(Integer vehicleCount) {
-		this.vehicleCount = vehicleCount;
-	}
-	
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 CountLogisticsVehicleReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class CountLogisticsVehicleResp extends BaseResp {
-	
-	private Integer vehicleCount;
-
-	public Integer getVehicleCount() {
-		return vehicleCount;
-	}
-
-	public void setVehicleCount(Integer vehicleCount) {
-		this.vehicleCount = vehicleCount;
-	}
-	
-	
-}
 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;
@@ -30,7 +29,7 @@ public class CreateShopReq extends BaseReq {
 	private String shopLogo;
 	@ApiModelProperty(value = "主营类目")
-	private List<Category> categories;
+	private List<Long> categorieIds;
@@ -56,6 +55,9 @@ public class CreateShopReq extends BaseReq {
 	@ApiModelProperty(value = "送货时间段")
 	private List<String> deliveryTime;
+	@ApiModelProperty(value = "上货市场")
+	private Long marketId;
+
 	public Long getCityCode() {
@@ -90,13 +92,12 @@ public class CreateShopReq extends BaseReq {
 		this.shopLogo = shopLogo;
 	}
-
-	public List<Category> getCategories() {
-		return categories;
+	public List<Long> getCategorieIds() {
+		return categorieIds;
 	}
-	public void setCategories(List<Category> categories) {
-		this.categories = categories;
+	public void setCategorieIds(List<Long> categorieIds) {
+		this.categorieIds = categorieIds;
 	}
 	public Integer getProductDisplayWay() {
@@ -154,4 +155,13 @@ public class CreateShopReq extends BaseReq {
 	public void setPhone(String phone) {
 		this.phone = phone;
 	}
+
+	@Override
+	public Long getMarketId() {
+		return marketId;
+	}
+
+	public void setMarketId(Long marketId) {
+		this.marketId = marketId;
+	}
 }
@@ -17,13 +17,13 @@ public class CreateShopResp extends BaseResp {
      * 店铺code
      */
     @ApiModelProperty(value = "店铺分享码" )
-    private Integer shopAuthCode;
+    private Long shopAuthCode;
-    public Integer getShopAuthCode() {
+    public Long getShopAuthCode() {
         return shopAuthCode;
     }
-    public void setShopAuthCode(Integer shopAuthCode) {
+    public void setShopAuthCode(Long shopAuthCode) {
         this.shopAuthCode = shopAuthCode;
     }
 }
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import java.util.List;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 DeleteLogisticsLineReq extends BaseReq {
-
-	/**
-	 * 路线id
-	 */
-	private List<Long> ids;
-
-	public List<Long> getIds() {
-		return ids;
-	}
-
-	public void setIds(List<Long> ids) {
-		this.ids = ids;
-	}
-    
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class DeleteLogisticsLineResp extends BaseResp {
-
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import java.util.List;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 DeleteLogisticsVehicleReq extends BaseReq {
-
-	/**
-	 * 车辆id
-	 */
-	private List<Long> ids;
-
-	public List<Long> getIds() {
-		return ids;
-	}
-
-	public void setIds(List<Long> ids) {
-		this.ids = ids;
-	}
-    
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class DeleteLogisticsVehicleResp extends BaseResp {
-
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 FindLogisticsVehicleByModelIdReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-	
-	/**
-	 * 车型ID
-	 */
-	private Long modelId;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-
-	public Long getModelId() {
-		return modelId;
-	}
-
-	public void setModelId(Long modelId) {
-		this.modelId = modelId;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import java.util.List;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.VehicleInfo;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class FindLogisticsVehicleByModelIdResp extends BaseResp {
-	
-	/**
-	 * 车型下车辆列表
-	 */
-	List<VehicleInfo> list;
-
-	public List<VehicleInfo> getList() {
-		return list;
-	}
-
-	public void setList(List<VehicleInfo> list) {
-		this.list = list;
-	}
-
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 GetLogisticsLineReq extends BaseReq {
-
-	/**
-	 * 路线id
-	 */
-	private Long id;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.LineInfo;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class GetLogisticsLineResp extends BaseResp {
-	
-	private LineInfo line;
-
-	public LineInfo getLine() {
-		return line;
-	}
-
-	public void setLine(LineInfo line) {
-		this.line = line;
-	}
-	
-	
-
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 GetLogisticsVehicleReq extends BaseReq {
-
-	/**
-	 * 车辆id
-	 */
-	private Long id;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.VehicleInfo;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class GetLogisticsVehicleResp extends BaseResp {
-	
-	private VehicleInfo vehicle;
-
-	public VehicleInfo getVehicle() {
-		return vehicle;
-	}
-
-	public void setVehicle(VehicleInfo vehicle) {
-		this.vehicle = vehicle;
-	}
-	
-	
-}
 package com.diligrp.mobsite.getway.domain.protocol.shop;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.Category;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
@@ -26,7 +25,7 @@ public class GetShopInfoResp extends BaseResp {
     private String shopLogo;
     @ApiModelProperty(value = "主营类目")
-    private List<Category> categories;
+    private List<Long> categories;
@@ -49,10 +48,6 @@ public class GetShopInfoResp extends BaseResp {
     @ApiModelProperty(value = "店铺公告")
     private String shopNotices;
-    @ApiModelProperty(value = "送货时间段")
-    private List<String> deliveryTime;
-
-
     public Long getShopId() {
         return shopId;
     }
@@ -94,11 +89,11 @@ public class GetShopInfoResp extends BaseResp {
     }
-    public List<Category> getCategories() {
+    public List<Long> getCategories() {
         return categories;
     }
-    public void setCategories(List<Category> categories) {
+    public void setCategories(List<Long> categories) {
         this.categories = categories;
     }
@@ -134,14 +129,6 @@ public class GetShopInfoResp extends BaseResp {
         this.shopNotices = shopNotices;
     }
-    public List<String> getDeliveryTime() {
-        return deliveryTime;
-    }
-
-    public void setDeliveryTime(List<String> deliveryTime) {
-        this.deliveryTime = deliveryTime;
-    }
-
     public String getShopAddr() {
         return shopAddr;
     }
@@ -6,4 +6,4 @@ import com.diligrp.mobsite.getway.domain.base.BaseListResp;
  * Created by xxxzzz on 2016/12/27.
  */
 public class GetShowStyleResp extends BaseListResp {
 -}
+}
 \ No newline at end of file
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 ListByModelLogisticsVehicleReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import java.util.List;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.CarSumInfo;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.VehicleModelsInfo;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class ListByModelLogisticsVehicleResp extends BaseResp {
-	
-	/**
-	 * 店铺车型列表
-	 */
-	List<CarSumInfo> list;
-
-	public List<CarSumInfo> getList() {
-		return list;
-	}
-
-	public void setList(List<CarSumInfo> list) {
-		this.list = list;
-	}
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 ListLogisticsLineMoreReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import java.util.List;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.LineInfo;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class ListLogisticsLineMoreResp extends BaseResp {
-	
-	/**
-	 * 线路信息
-	 */
-	private List<LineInfo> lines;
-	
-	/**
-	 * 线路条数
-	 */
-	private Integer lineCount;
-	
-	/**
-	 * 线路包含的省份信息
-	 */
-	private List<String> provinces;
-
-	public List<LineInfo> getLines() {
-		return lines;
-	}
-
-	public void setLines(List<LineInfo> lines) {
-		this.lines = lines;
-	}
-
-	public Integer getLineCount() {
-		return lineCount;
-	}
-
-	public void setLineCount(Integer lineCount) {
-		this.lineCount = lineCount;
-	}
-
-	public List<String> getProvinces() {
-		return provinces;
-	}
-
-	public void setProvinces(List<String> provinces) {
-		this.provinces = provinces;
-	}
-
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 ListLogisticsLineReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import java.util.List;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.LineInfo;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class ListLogisticsLineResp extends BaseResp {
-	
-	/**
-	 * 线路列表
-	 */
-	private List<LineInfo> lines;
-	
-	/**
-	 * top线路
-	 */
-	private List<LineInfo> topLines;
-
-	public List<LineInfo> getLines() {
-		return lines;
-	}
-
-	public void setLines(List<LineInfo> lines) {
-		this.lines = lines;
-	}
-
-	public List<LineInfo> getTopLines() {
-		return topLines;
-	}
-
-	public void setTopLines(List<LineInfo> topLines) {
-		this.topLines = topLines;
-	}
-	
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 ListLogisticsVehicleModelsReq extends BaseReq {
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import java.util.List;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.VehicleModelsInfo;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class ListLogisticsVehicleModelsResp extends BaseResp {
-	
-	/**
-	 * 车型列表
-	 */
-	List<VehicleModelsInfo> models;
-
-	public List<VehicleModelsInfo> getModels() {
-		return models;
-	}
-
-	public void setModels(List<VehicleModelsInfo> models) {
-		this.models = models;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 ListLogisticsVehicleReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import java.util.List;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.VehicleInfo;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class ListLogisticsVehicleResp extends BaseResp {
-	
-	private List<VehicleInfo> vehicles;
-
-	public List<VehicleInfo> getVehicles() {
-		return vehicles;
-	}
-
-	public void setVehicles(List<VehicleInfo> vehicles) {
-		this.vehicles = vehicles;
-	}
-	
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.ContactUserInfo;
-
-/**
- * <B>查询商品详情resp</B> <br />
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author duanyugen
- */
-public class LogisticsShopMainPageResp extends BaseResp {
-
-	/**
-	 * 物流店铺详情
-	 */
-	private ShopLogisticsDetail shop;
-
-	/**
-	 * 联系人
-	 */
-	private ContactUserInfo contact;
-
-	/**
-	 * 店铺描述
-	 * */
-	private String desc;
-
-	public ShopLogisticsDetail getShop() {
-		return shop;
-	}
-
-	public void setShop(ShopLogisticsDetail shop) {
-		this.shop = shop;
-	}
-
-	public ContactUserInfo getContact() {
-		return contact;
-	}
-
-	public void setContact(ContactUserInfo contact) {
-		this.contact = contact;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-
-	public void setDesc(String desc) {
-		this.desc = desc;
-	}
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.CarSumInfo;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.LineInfo;
-import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopNewIntroduction;
-
-import java.util.List;
-
-/**
- * Created by david on 2015/7/27.
- */
-public class ShopLogisticsDetail extends ShopNewIntroduction {
-
-	/**
-	 * 车辆信息
-	 * */
-	private List<CarSumInfo> carSumInfos;
-
-	/**
-	 * 运输路线列表
-	 * */
-	private List<LineInfo> transferLines;
-	/**
-	 * 服务类型
-	 */
-	private List<Integer> buyOnOtherService;
-	/**
-	 * 车辆数量
-	 */
-	private Integer vehicleNum;
-	/**
-	 * 综合评论
-	 */
-	private String commentScore;
-	/**
-	 * 物流代验货
-	 */
-	private Integer logisticsSupportCheck;
-	/**
-	 * 物流代集货
-	 */
-	private Integer logisticsSupportCollection;
-	/**
-	 * 物流店铺类型
-	 */
-	private Long logisticsShopType;
-
-	public List<CarSumInfo> getCarSumInfos() {
-		return carSumInfos;
-	}
-
-	public void setCarSumInfos(List<CarSumInfo> carSumInfos) {
-		this.carSumInfos = carSumInfos;
-	}
-
-	public List<LineInfo> getTransferLines() {
-		return transferLines;
-	}
-
-	public void setTransferLines(List<LineInfo> transferLines) {
-		this.transferLines = transferLines;
-	}
-
-	public List<Integer> getBuyOnOtherService() {
-		return buyOnOtherService;
-	}
-
-	public void setBuyOnOtherService(List<Integer> buyOnOtherService) {
-		this.buyOnOtherService = buyOnOtherService;
-	}
-
-	public Integer getVehicleNum() {
-		return vehicleNum;
-	}
-
-	public void setVehicleNum(Integer vehicleNum) {
-		this.vehicleNum = vehicleNum;
-	}
-
-	public String getCommentScore() {
-		return commentScore;
-	}
-
-	public void setCommentScore(String commentScore) {
-		this.commentScore = commentScore;
-	}
-
-	public Integer getLogisticsSupportCheck() {
-		return logisticsSupportCheck;
-	}
-
-	public void setLogisticsSupportCheck(Integer logisticsSupportCheck) {
-		this.logisticsSupportCheck = logisticsSupportCheck;
-	}
-
-	public Integer getLogisticsSupportCollection() {
-		return logisticsSupportCollection;
-	}
-
-	public void setLogisticsSupportCollection(Integer logisticsSupportCollection) {
-		this.logisticsSupportCollection = logisticsSupportCollection;
-	}
-
-	public Long getLogisticsShopType() {
-		return logisticsShopType;
-	}
-
-	public void setLogisticsShopType(Long logisticsShopType) {
-		this.logisticsShopType = logisticsShopType;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
-
-/**
- * <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 TopLogisticsLineReq extends BaseReq {
-
-	/**
-	 * 店铺id
-	 */
-	private Long shopId;
-	
-	/**
-	 * 路线ID
-	 */
-	private Long id;
-
-	public Long getShopId() {
-		return shopId;
-	}
-
-	public void setShopId(Long shopId) {
-		this.shopId = shopId;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-	
-}
-package com.diligrp.mobsite.getway.domain.protocol.shop;
-
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
-
-/**
- * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
- * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
- * <B>Company</B> 地利集团
- * @createTime 2015年6月9日 下午1:53:00
- * @author wujiaqiang
- */
-public class TopLogisticsLineResp extends BaseResp {
-
-}
 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 javax.validation.constraints.NotNull;
 import java.util.List;
 /**
@@ -17,7 +17,8 @@ public class UpdateShopReq extends BaseReq {
-	@ApiModelProperty(value = "店铺Id")
+	@ApiModelProperty(value = "店铺Id",required = true)
+	@NotNull(message="店铺ID不能为空")
 	private Long shopId;
 	@ApiModelProperty(value = "城市code")
@@ -33,7 +34,7 @@ public class UpdateShopReq extends BaseReq {
 	private String shopLogo;
 	@ApiModelProperty(value = "主营类目")
-	private List<Category> categories;
+	private List<Long> categorieIds;
@@ -59,6 +60,9 @@ public class UpdateShopReq extends BaseReq {
 	@ApiModelProperty(value = "送货时间段")
 	private List<String> deliveryTime;
+	@ApiModelProperty(value = "上货市场")
+	private Long marketId;
+
 	public Long getShopId() {
 		return shopId;
@@ -100,13 +104,12 @@ public class UpdateShopReq extends BaseReq {
 		this.shopLogo = shopLogo;
 	}
-
-	public List<Category> getCategories() {
-		return categories;
+	public List<Long> getCategorieIds() {
+		return categorieIds;
 	}
-	public void setCategories(List<Category> categories) {
-		this.categories = categories;
+	public void setCategorieIds(List<Long> categorieIds) {
+		this.categorieIds = categorieIds;
 	}
 	public Integer getProductDisplayWay() {
@@ -164,4 +167,13 @@ public class UpdateShopReq extends BaseReq {
 	public void setPhone(String phone) {
 		this.phone = phone;
 	}
+
+	@Override
+	public Long getMarketId() {
+		return marketId;
+	}
+
+	public void setMarketId(Long marketId) {
+		this.marketId = marketId;
+	}
 }
@@ -4,12 +4,6 @@ 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 /
@@ -17,7 +11,7 @@ import java.util.List;
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /
  * <BCompany</B 地利集团
  * @createTime 2015年6月10日 下午1:40:21
- * @author zhangshirui
+ * @author jcy
  */
 public interface ShopRPC {
@@ -25,11 +19,11 @@ public interface ShopRPC {
 	/**
 	 * @comment 创建店铺
 	 * @param shopSaveInput 店铺基本信息
-	 * @return Integer
+	 * @return ShopOutput
 	 * @author kelan
 	 * @time 2016/11/29 19:03
 	 */
-	public Integer createShopInfo(ShopSaveInput shopSaveInput);
+	public ShopOutput createShopInfo(ShopSaveInput shopSaveInput);
 	/**
 	 * @comment 通过卖家id获取店铺信息
 	 * @param sellerId 卖家id
@@ -8,16 +8,12 @@ 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 />
@@ -36,14 +32,14 @@ public class ShopRPCImpl implements ShopRPC {
 	private MyAppClient myAppClient;
 	/**
 	 * @param shopSaveInput 店铺基本信息
-	 * @return Integer
+	 * @return ShopOutput
 	 * @comment 创建店铺
 	 * @author jiangchengyong
 	 * @time 2016/11/29 19:03
 	 */
 	@Override
-	public Integer createShopInfo(ShopSaveInput shopSaveInput) {
-		BaseOutput<Integer> output = null;
+	public ShopOutput createShopInfo(ShopSaveInput shopSaveInput) {
+		BaseOutput<ShopOutput> output = null;
 		try{
 			output = myAppClient.getShopInfoService().createShopInfo(shopSaveInput);
 			if(output.getCode().equals(200)){
@@ -27,5 +27,5 @@ public interface SellerShopService {
     DelShopDeliveryTimeResp delShopDeliveryTime(DelShopDeliveryTimeReq req);
-    CreateShopResp updateShop(UpdateShopReq req);
+    UpdateShopResp updateShop(UpdateShopReq req) throws Exception;
 }
 package com.diligrp.mobsite.getway.service.seller.impl;
+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.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeReq;
 import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeResp;
 import com.diligrp.mobsite.getway.domain.protocol.shop.*;
+import com.diligrp.mobsite.getway.rpc.ShopRPC;
 import com.diligrp.mobsite.getway.service.seller.SellerShopService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <B>Description</B> 卖家用户信息 <br />
@@ -18,15 +28,50 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SellerShopServiceImpl implements SellerShopService {
+    @Autowired
+    private ShopRPC shopRPC;
     @Override
     public CreateShopResp createShop(CreateShopReq req) {
-        return null;
+        ShopSaveInput shopSaveInput = new ShopSaveInput();
+        shopSaveInput.setAddressId(req.getCityCode());
+        shopSaveInput.setAddressDetail(req.getShopAddr());
+        shopSaveInput.setMarketId(req.getMarketId());
+        shopSaveInput.setSellerId(req.getToken().getUserId());
+        shopSaveInput.setServiceTel(req.getPhone());
+        shopSaveInput.setShopLogo(req.getShopLogo());
+        shopSaveInput.setShopName(req.getShopName());
+        shopSaveInput.setBusinessCategoryIds(StringUtils.join(req.getCategorieIds(),","));
+        ShopOutput shopOutput = shopRPC.createShopInfo(shopSaveInput);
+
+        CreateShopResp createShopResp = new CreateShopResp();
+        createShopResp.setShopAuthCode(shopOutput.getPromoCode());
+        return createShopResp;
     }
     @Override
     public GetShopInfoResp getShopInfo(BaseReq req) {
-        return null;
+        GetShopInfoResp getShopInfoResp = new GetShopInfoResp();
+        ShopOutput shopOutput = shopRPC.getShopBySellerId(req.getToken().getUserId());
+        getShopInfoResp.setShopName(shopOutput.getShopName());
+        getShopInfoResp.setShopLogo(shopOutput.getShopLogo());
+        String[] categoryIds = shopOutput.getBusinessCategoryIds().split(",");
+        List<Long> categoryList = new ArrayList<>();
+        for (String categoryId:categoryIds
+             ) {
+            categoryList.add(Long.valueOf(categoryId));
+        }
+        getShopInfoResp.setCategories(categoryList);
+        getShopInfoResp.setCityCode(shopOutput.getAddressId());
+        getShopInfoResp.setCityName(shopOutput.getAddressText());
+        getShopInfoResp.setFreeShippingPrice(shopOutput.getFreeShippingPrice());
+        getShopInfoResp.setPhone(shopOutput.getServiceTel());
+        getShopInfoResp.setPostage(shopOutput.getPostage());
+        getShopInfoResp.setProductDisplayWay(shopOutput.getProductDisplayWay());
+        getShopInfoResp.setShopAddr(shopOutput.getAddressDetail());
+        getShopInfoResp.setShopId(shopOutput.getId());
+        getShopInfoResp.setShopNotices(shopOutput.getShopNotices());
+        return getShopInfoResp;
     }
     @Override
@@ -50,7 +95,21 @@ public class SellerShopServiceImpl implements SellerShopService {
     }
     @Override
-    public CreateShopResp updateShop(UpdateShopReq req) {
-        return null;
+    public UpdateShopResp updateShop(UpdateShopReq req) {
+        UpdateShopResp updateShopResp = new UpdateShopResp();
+        ShopUpdateInput shopUpdateInput = new ShopUpdateInput();
+        shopUpdateInput.setAddressId(req.getCityCode());
+        shopUpdateInput.setAddressDetail(req.getShopAddr());
+        shopUpdateInput.setMarketId(req.getMarketId());
+        shopUpdateInput.setSellerId(req.getToken().getUserId());
+        shopUpdateInput.setServiceTel(req.getPhone());
+        shopUpdateInput.setShopLogo(req.getShopLogo());
+        shopUpdateInput.setShopName(req.getShopName());
+        shopUpdateInput.setBusinessCategoryIds(StringUtils.join(req.getCategorieIds(),","));
+        Boolean result = shopRPC.modifyShopBasicInfo(shopUpdateInput);
+        if(!result){
+            throw new ServiceException("修改店铺信息失败");
+        }
+        return updateShopResp;
     }
 }
@@ -6,6 +6,7 @@ import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeResp;
 import com.diligrp.mobsite.getway.domain.protocol.shop.*;
 import com.diligrp.mobsite.getway.service.seller.SellerShopService;
 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
+import com.diligrp.mobsite.getway.web.utils.BeanValidator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -24,7 +25,7 @@ import javax.annotation.Resource;
 @Controller
 @RequestMapping("/mobsiteApp/seller/shop")
 @Api(value = "/mobsiteApp-shop-seller", description = "店铺接口-卖家")
-public class SellerShopController extends BaseApiController{
+public class SellerShopController extends BaseApiController {
     private Logger log = LoggerFactory.getLogger(getClass());
     @Resource
@@ -40,7 +41,7 @@ public class SellerShopController extends BaseApiController{
     public void createShop(@RequestBody CreateShopReq temp) {
         CreateShopReq req = getRequest(CreateShopReq.class);
         try {
-            //BeanValidator.validator(req);
+            BeanValidator.validator(req);
             CreateShopResp resp = sellerShopService.createShop(req);
             sendSuccessResp(resp);
         }
@@ -60,8 +61,8 @@ public class SellerShopController extends BaseApiController{
     public void updateShop(@RequestBody UpdateShopReq temp) {
         UpdateShopReq req = getRequest(UpdateShopReq.class);
         try {
-            //BeanValidator.validator(req);
-            CreateShopResp resp = sellerShopService.updateShop(req);
+            BeanValidator.validator(req);
+            UpdateShopResp resp = sellerShopService.updateShop(req);
             sendSuccessResp(resp);
         }
         catch(Exception e) {
@@ -81,7 +82,6 @@ public class SellerShopController extends BaseApiController{
     public void getShopInfo() {
         BaseReq req = getRequest(BaseReq.class);
         try {
-            //BeanValidator.validator(req);
             GetShopInfoResp resp = sellerShopService.getShopInfo(req);
             sendSuccessResp(resp);
         }catch(Exception e) {