收货地址实现

jiangchengyong
1 parent b01020f8
Showing 5 changed files with 97 additions and 18 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/pickinfo/GetPickInfoListResp.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/pickinfo/impl/PickInfoServiceImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/shop/ShopService.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/shop/impl/ShopServiceImpl.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/shop/ShopController.java
@@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
@@ -19,6 +20,14 @@ public class GetPickInfoListResp extends BaseResp {
     /**
      * 提货人信息列表
      */
+    @ApiModelProperty(value = "收货人列表")
     private List<PickInfo> pickInfos;
+    public List<PickInfo> getPickInfos() {
+        return pickInfos;
+    }
+
+    public void setPickInfos(List<PickInfo> pickInfos) {
+        this.pickInfos = pickInfos;
+    }
 }
@@ -2,12 +2,18 @@ package com.diligrp.mobsite.getway.service.buyer.pickinfo.impl;
 import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoSaveInput;
 import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoUpdateInput;
+import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
+import com.diligrp.mobsite.getway.domain.common.ResultCode;
+import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
 import com.diligrp.mobsite.getway.domain.protocol.pickinfo.*;
 import com.diligrp.mobsite.getway.rpc.PickInfoRPC;
 import com.diligrp.mobsite.getway.service.buyer.pickinfo.PickInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by jiangchengyong on 2017/1/12.
  */
@@ -23,9 +29,13 @@ public class PickInfoServiceImpl implements PickInfoService{
      */
     @Override
     public AddPickInfoResp addPickInfo(AddPickInfoReq req) {
+        AddPickInfoResp resp = new AddPickInfoResp();
         PickingInfoSaveInput pickingInfoSaveInput = new PickingInfoSaveInput();
-        pickInfoRPC.addPickingInfo(pickingInfoSaveInput);
-        return null;
+        PickingInfoOutput pickingInfoOutput = pickInfoRPC.addPickingInfo(pickingInfoSaveInput);
+        if(null == pickingInfoOutput){
+            resp.setCode(ResultCode.BUSINESS_FAILED);
+        }
+        return resp;
     }
     /**
@@ -36,9 +46,12 @@ public class PickInfoServiceImpl implements PickInfoService{
      */
     @Override
     public UpdatePickInfoResp updatePickInfo(UpdatePickInfoReq req) {
+        UpdatePickInfoResp resp = new UpdatePickInfoResp();
         PickingInfoUpdateInput pickingInfoUpdateInput = new PickingInfoUpdateInput();
-        pickInfoRPC.modify(pickingInfoUpdateInput);
-        return null;
+        if(!pickInfoRPC.modify(pickingInfoUpdateInput)){
+            resp.setCode(ResultCode.BUSINESS_FAILED);
+        }
+        return resp;
     }
     /**
@@ -49,7 +62,9 @@ public class PickInfoServiceImpl implements PickInfoService{
      */
     @Override
     public GetPickInfoResp getPickInfo(GetPickInfoReq req) {
-        return null;
+        GetPickInfoResp resp = new GetPickInfoResp();
+
+        return resp;
     }
     /**
@@ -60,8 +75,11 @@ public class PickInfoServiceImpl implements PickInfoService{
      */
     @Override
     public DelPickInfoResp delPickInfo(DelPickInfoReq req) {
-        pickInfoRPC.delPickingInfoById(req.getId());
-        return null;
+        DelPickInfoResp resp = new DelPickInfoResp();
+        if(pickInfoRPC.delPickingInfoById(req.getId())){
+            resp.setCode(ResultCode.BUSINESS_FAILED);
+        }
+        return resp;
     }
     /**
@@ -72,8 +90,28 @@ public class PickInfoServiceImpl implements PickInfoService{
      */
     @Override
     public GetPickInfoListResp getPickInfoList(GetPickInfoListReq req) {
-        pickInfoRPC.queryPickingInfosByBuyerId(req.getToken().getUserId());
-        return null;
+        GetPickInfoListResp resp = new GetPickInfoListResp();
+        List<PickingInfoOutput> outputList = pickInfoRPC.queryPickingInfosByBuyerId(req.getToken().getUserId());
+        List<PickInfo> pickInfos = new ArrayList<>();
+        for (PickingInfoOutput pickingInfoOutput :
+                outputList) {
+            PickInfo pickInfo = PickInfoOutputToPickInfo(pickingInfoOutput);
+            pickInfos.add(pickInfo);
+        }
+        resp.setPickInfos(pickInfos);
+        return resp;
+    }
+
+    private PickInfo PickInfoOutputToPickInfo(PickingInfoOutput pickingInfoOutput) {
+        PickInfo pickInfo = new PickInfo();
+        pickInfo.setCityAddress(pickingInfoOutput.getAddressText());
+        pickInfo.setStreetAddress(pickingInfoOutput.getAddressDetail());
+        pickInfo.setCityId(pickingInfoOutput.getAddressId());
+        pickInfo.setId(pickingInfoOutput.getId());
+        pickInfo.setIsDefault(pickingInfoOutput.getDef());
+        pickInfo.setMobile(pickingInfoOutput.getTelphone());
+        pickInfo.setName(pickingInfoOutput.getName());
+        return pickInfo;
     }
     /**
@@ -85,8 +123,11 @@ public class PickInfoServiceImpl implements PickInfoService{
      */
     @Override
     public GetDefaultPickInfoResp getDefaultPickInfo(GetDefaultPickInfoReq req) {
-        pickInfoRPC.getDefaultPickingInfoByBuyerId(req.getUserId());
-        return null;
+        GetDefaultPickInfoResp resp = new GetDefaultPickInfoResp();
+        PickingInfoOutput pickingInfoOutput = pickInfoRPC.getDefaultPickingInfoByBuyerId(req.getUserId());
+        PickInfo pickInfo = PickInfoOutputToPickInfo(pickingInfoOutput);
+        resp.setPickingInfo(pickInfo);
+        return resp;
     }
     /**
@@ -98,10 +139,13 @@ public class PickInfoServiceImpl implements PickInfoService{
      */
     @Override
     public SetDefaultPickInfoResp setDefault(Long consigneeId, Long userId) {
+        SetDefaultPickInfoResp resp = new SetDefaultPickInfoResp();
         PickingInfoUpdateInput pickingInfoUpdateInput = new PickingInfoUpdateInput();
         pickingInfoUpdateInput.setId(consigneeId);
         pickingInfoUpdateInput.setBuyerId(userId);
-        pickInfoRPC.modify(pickingInfoUpdateInput);
-        return null;
+        if(!pickInfoRPC.modify(pickingInfoUpdateInput)){
+            resp.setCode(ResultCode.BUSINESS_FAILED);
+        }
+        return resp;
     }
 }
 package com.diligrp.mobsite.getway.service.buyer.shop;
+import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeReq;
+import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeResp;
 import com.diligrp.mobsite.getway.domain.protocol.detail.*;
 import com.diligrp.mobsite.getway.domain.protocol.search.*;
 import com.diligrp.mobsite.getway.domain.protocol.shop.*;
 package com.diligrp.mobsite.getway.service.buyer.shop.impl;
 import com.b2c.myapp.common.api.shop.output.ShopOutput;
+import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerOutput;
 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.GetShopDeliveryTimeReq;
+import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeResp;
 import com.diligrp.mobsite.getway.domain.protocol.detail.BindToShopReq;
 import com.diligrp.mobsite.getway.domain.protocol.detail.BindToShopResp;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetShopByIdReq;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetShopByIdResp;
+import com.diligrp.mobsite.getway.rpc.DeliveryTimeRPC;
+import com.diligrp.mobsite.getway.rpc.ShopBuyerRPC;
 import com.diligrp.mobsite.getway.rpc.impl.ShopRPCImpl;
 import com.diligrp.mobsite.getway.service.buyer.shop.ShopService;
 import com.diligrp.website.util.security.Validator;
@@ -16,6 +21,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 /**
@@ -31,13 +39,17 @@ public class ShopServiceImpl implements ShopService {
 	@Resource
 	private ShopRPCImpl shopRPC;
-
+	@Resource
+	private ShopBuyerRPC shopBuyerRPC;
 	private Logger logger = LoggerFactory.getLogger(getClass());
 	@Override
 	public BindToShopResp bindToShop(BindToShopReq req) {
-		return null;
+		ShopBuyerOutput shopBuyerOutput = shopBuyerRPC.bindAndActivate(req.getUserId(),Long.valueOf(req.getShopAuthCode()));
+		BindToShopResp bindToShopResp = new BindToShopResp();
+		bindToShopResp.setShopBuyerOutput(shopBuyerOutput);
+		return bindToShopResp;
 	}
 	@Override
@@ -49,7 +61,6 @@ public class ShopServiceImpl implements ShopService {
 			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.SHOP_NOT_EXIST);
 		}
 		GetShopByIdResp resp = new GetShopByIdResp();
-		resp.setShopId(shop.getId());
 		resp.setPhone(shop.getServiceTel());
 		resp.setShopId(shop.getId());
 		resp.setShopLogo(shop.getShopLogo());
@@ -58,6 +69,17 @@ public class ShopServiceImpl implements ShopService {
 		resp.setCityCode(shop.getAddressId());
 		resp.setCityName(shop.getAddressText());
 		resp.setShopAddr(shop.getAddressDetail());
+		String[] categorys = shop.getBusinessCategoryIds().split(",");
+		List<Long> categoryList = new ArrayList<>();
+		for (String category :
+				categorys) {
+			categoryList.add(Long.valueOf(category));
+		}
+		resp.setCategories(categoryList);
+		resp.setFreeShippingPrice(shop.getFreeShippingPrice());
+		resp.setPostage(shop.getPostage());
+		resp.setProductDisplayWay(shop.getProductDisplayWay());
 		return resp;
 	}
+
 }
@@ -4,6 +4,7 @@ import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeReq;
 import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeResp;
 import com.diligrp.mobsite.getway.domain.protocol.detail.*;
 import com.diligrp.mobsite.getway.service.buyer.shop.ShopService;
+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;
@@ -34,6 +35,8 @@ public class ShopController extends BaseApiController {
     @Resource
     private ShopService shopServiceImpl;
+    @Resource
+    private SellerShopService sellerShopService;
     private Logger log = LoggerFactory.getLogger(getClass());
@@ -87,7 +90,6 @@ public class ShopController extends BaseApiController {
         GetProductRecommendResp resp = null;
         try {
             BeanValidator.validator(req);
-           //   resp = shopServiceImpl.getRecommends(req);
             sendSuccessResp(resp);
         }
         catch(Exception e) {
@@ -108,7 +110,7 @@ public class ShopController extends BaseApiController {
         GetShopDeliveryTimeResp resp = null;
         try {
             BeanValidator.validator(req);
-            //   resp = shopServiceImpl.getRecommends(req);
+            resp = sellerShopService.getShopDeliveryTime(temp);
             sendSuccessResp(resp);
         }
         catch(Exception e) {