店铺update

jiangchengyong
1 parent 9c1727e7
Showing 10 changed files with 119 additions and 60 deletions
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/GetShopInfoResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/GetShowStyleResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/UpdateShopReq.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/ShopRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/ShopRPCImpl.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
 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 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;
-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) {