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

weiliwhereareyou@163.com
2 parents 6bc4741f 84afa95a
Showing 4 changed files with 104 additions and 3 deletions
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/DeliveryTimeRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/DeliveryTimeRPCImpl.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/PickInfoRPCImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerShopServiceImpl.java
@@ -25,7 +25,7 @@ public interface DeliveryTimeRPC {
      * @author kelan
      * @time 2016/11/30 16:25
      */
-    public Boolean deleteShopDeliveryTime(Long deliveryTimeId);
+    public Boolean deleteShopDeliveryTime(Long... deliveryTimeId);
     /**
      * @comment 查找店铺送货时间段
      * @param deliveryTimeListInput　店铺送货时间段对象
@@ -3,7 +3,11 @@ package com.diligrp.mobsite.getway.rpc.impl;
 import com.b2c.myapp.common.api.deliveryTime.input.DeliveryTimeListInput;
 import com.b2c.myapp.common.api.deliveryTime.input.DeliveryTimeSaveInput;
 import com.b2c.myapp.common.api.deliveryTime.output.DeliveryTimeOutput;
+import com.b2c.myapp.common.api.fundTrade.output.FundTradeOutput;
+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.DeliveryTimeRPC;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,6 +35,16 @@ public class DeliveryTimeRPCImpl implements DeliveryTimeRPC {
      */
     @Override
     public DeliveryTimeOutput createShopDeliveryTime(DeliveryTimeSaveInput deliveryTimeSaveInput) {
+        BaseOutput<DeliveryTimeOutput> output = null;
+        try {
+            output = myAppClient.getDeliveryTimeService().createShopDeliveryTime(deliveryTimeSaveInput);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            logger.error("创建店铺送货时间段接口出错：msg={}",e);
+            throw new ServiceException();
+        }
         return null;
     }
@@ -42,7 +56,17 @@ public class DeliveryTimeRPCImpl implements DeliveryTimeRPC {
      * @time 2016/11/30 16:25
      */
     @Override
-    public Boolean deleteShopDeliveryTime(Long deliveryTimeId) {
+    public Boolean deleteShopDeliveryTime(Long... deliveryTimeId) {
+        BaseOutput<Boolean> output = null;
+        try {
+            output = myAppClient.getDeliveryTimeService().deleteShopDeliveryTime(deliveryTimeId);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            logger.error("删除店铺送货时间段接口出错：msg={}",e);
+            throw new ServiceException();
+        }
         return null;
     }
@@ -55,6 +79,16 @@ public class DeliveryTimeRPCImpl implements DeliveryTimeRPC {
      */
     @Override
     public List<DeliveryTimeOutput> queryShopDeliveryTime(DeliveryTimeListInput deliveryTimeListInput) {
+        BaseOutput<List<DeliveryTimeOutput>> output = null;
+        try {
+            output = myAppClient.getDeliveryTimeService().queryShopDeliveryTime(deliveryTimeListInput);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            logger.error("查找店铺送货时间段接口出错：msg={}",e);
+            throw new ServiceException();
+        }
         return null;
     }
 }
 package com.diligrp.mobsite.getway.rpc.impl;
+import com.b2c.myapp.common.api.deliveryTime.output.DeliveryTimeOutput;
 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.b2c.myapp.common.utils.BaseOutput;
+import com.b2c.myapp.sdk.MyAppClient;
+import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.rpc.PickInfoRPC;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
 import java.util.List;
 /**
  * Created by jiangchengyong on 2017/1/12.
  */
+@Component
 public class PickInfoRPCImpl implements PickInfoRPC{
+    private Logger logger = LoggerFactory.getLogger(PickInfoRPCImpl.class);
+
+    @Resource
+    private MyAppClient myAppClient;
     /**
      * 新增收货人
@@ -21,6 +34,16 @@ public class PickInfoRPCImpl implements PickInfoRPC{
      */
     @Override
     public PickingInfoOutput addPickingInfo(PickingInfoSaveInput pickingInfoSaveInput) {
+        BaseOutput<PickingInfoOutput> output = null;
+        try {
+            output = myAppClient.getPickingInfoService().addPickingInfo(pickingInfoSaveInput);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            logger.error("新增收货人接口出错：msg={}",e);
+            throw new ServiceException();
+        }
         return null;
     }
@@ -32,6 +55,16 @@ public class PickInfoRPCImpl implements PickInfoRPC{
      */
     @Override
     public Boolean modify(PickingInfoUpdateInput pickingInfoUpdateInput) {
+        BaseOutput<Boolean> output = null;
+        try {
+            output = myAppClient.getPickingInfoService().modify(pickingInfoUpdateInput);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            logger.error("修改收货人信息接口出错：msg={}",e);
+            throw new ServiceException();
+        }
         return null;
     }
@@ -43,6 +76,16 @@ public class PickInfoRPCImpl implements PickInfoRPC{
      */
     @Override
     public List<PickingInfoOutput> queryPickingInfosByBuyerId(Long buyerId) {
+        BaseOutput<List<PickingInfoOutput>> output = null;
+        try {
+            output = myAppClient.getPickingInfoService().queryPickingInfosByBuyerId(buyerId);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            logger.error("按买家ID查询收货人接口出错：msg={}",e);
+            throw new ServiceException();
+        }
         return null;
     }
@@ -55,6 +98,16 @@ public class PickInfoRPCImpl implements PickInfoRPC{
      */
     @Override
     public PickingInfoOutput getDefaultPickingInfoByBuyerId(Long buyerId) {
+        BaseOutput<PickingInfoOutput> output = null;
+        try {
+            output = myAppClient.getPickingInfoService().getDefaultPickingInfoByBuyerId(buyerId);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            logger.error("根据买家id获取默认收货地址接口出错：msg={}",e);
+            throw new ServiceException();
+        }
         return null;
     }
@@ -67,6 +120,16 @@ public class PickInfoRPCImpl implements PickInfoRPC{
      */
     @Override
     public Boolean delPickingInfoById(Long id) {
+        BaseOutput<Boolean> output = null;
+        try {
+            output = myAppClient.getPickingInfoService().delPickingInfoById(id);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            logger.error("删除收货地址接口出错：msg={}",e);
+            throw new ServiceException();
+        }
         return null;
     }
 }
@@ -122,7 +122,11 @@ public class SellerShopServiceImpl implements SellerShopService {
     @Override
     public DelShopDeliveryTimeResp delShopDeliveryTime(DelShopDeliveryTimeReq req) {
-        return null;
+        DelShopDeliveryTimeResp resp = new DelShopDeliveryTimeResp();
+        if(!deliveryTimeRPC.deleteShopDeliveryTime(req.getIds())){
+            resp.setCode(ResultCode.BUSINESS_FAILED);
+        }
+        return resp;
     }
     @Override