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

weiliwhereareyou@163.com
2 parents 8dda41e2 5528ec91
Showing 3 changed files with 53 additions and 5 deletions
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/PickInfoRPC.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/buyer/pickinfo/impl/PickInfoServiceImpl.java
@@ -3,6 +3,7 @@ package com.diligrp.mobsite.getway.rpc;
 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 java.util.List;
@@ -46,5 +47,12 @@ public interface PickInfoRPC {
      * @author kelan
      * @time 2016/12/16 17:58
      */
-    public Boolean delPickingInfoById(Long id);
+    Boolean delPickingInfoById(Long id);
+
+    /**
+     * 根据收货信息ID查收货信息详情
+     * @param id
+     * @return
+     */
+    PickingInfoOutput getPickingInfoById(Long id);
 }
@@ -137,4 +137,26 @@ public class PickInfoRPCImpl implements PickInfoRPC{
             throw new ServiceException();
         }
     }
+
+    /**
+     * 根据收货信息ID查收货信息详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public PickingInfoOutput getPickingInfoById(Long id) {
+        BaseOutput<PickingInfoOutput> output = null;
+        try {
+            output = myAppClient.getPickingInfoService().getPickingInfoById(id);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }else{
+                throw new ServiceException(Integer.parseInt(output.getCode()),output.getResult());
+            }
+        } catch (Exception e) {
+            logger.error("根据收货信息ID查收货信息详情接口出错：msg={}",e);
+            throw new ServiceException();
+        }
+    }
 }
@@ -30,7 +30,14 @@ public class PickInfoServiceImpl implements PickInfoService{
     @Override
     public AddPickInfoResp addPickInfo(AddPickInfoReq req) {
         AddPickInfoResp resp = new AddPickInfoResp();
+        PickInfo pickInfo = req.getPickInfo();
         PickingInfoSaveInput pickingInfoSaveInput = new PickingInfoSaveInput();
+        pickingInfoSaveInput.setBuyerId(req.getUserId());
+        pickingInfoSaveInput.setName(pickInfo.getName());
+        pickingInfoSaveInput.setAddressDetail(pickInfo.getStreetAddress());
+        pickingInfoSaveInput.setAddressId(pickInfo.getCityId());
+        pickingInfoSaveInput.setDef(pickInfo.getIsDefault());
+        pickingInfoSaveInput.setTelphone(pickInfo.getMobile());
         PickingInfoOutput pickingInfoOutput = pickInfoRPC.addPickingInfo(pickingInfoSaveInput);
         if(null == pickingInfoOutput){
             resp.setCode(ResultCode.BUSINESS_FAILED);
@@ -47,7 +54,15 @@ public class PickInfoServiceImpl implements PickInfoService{
     @Override
     public UpdatePickInfoResp updatePickInfo(UpdatePickInfoReq req) {
         UpdatePickInfoResp resp = new UpdatePickInfoResp();
+        PickInfo pickInfo = req.getPickInfo();
         PickingInfoUpdateInput pickingInfoUpdateInput = new PickingInfoUpdateInput();
+        pickingInfoUpdateInput.setId(pickInfo.getId());
+        pickingInfoUpdateInput.setBuyerId(req.getUserId());
+        pickingInfoUpdateInput.setName(pickInfo.getName());
+        pickingInfoUpdateInput.setAddressDetail(pickInfo.getStreetAddress());
+        pickingInfoUpdateInput.setAddressId(pickInfo.getCityId());
+        pickingInfoUpdateInput.setDef(pickInfo.getIsDefault());
+        pickingInfoUpdateInput.setTelphone(pickInfo.getMobile());
         if(!pickInfoRPC.modify(pickingInfoUpdateInput)){
             resp.setCode(ResultCode.BUSINESS_FAILED);
         }
@@ -63,7 +78,11 @@ public class PickInfoServiceImpl implements PickInfoService{
     @Override
     public GetPickInfoResp getPickInfo(GetPickInfoReq req) {
         GetPickInfoResp resp = new GetPickInfoResp();
-
+        PickingInfoOutput pickInfoOutput = pickInfoRPC.getPickingInfoById(req.getId());
+        if(null == pickInfoOutput){
+            resp.setCode(ResultCode.BUSINESS_FAILED);
+        }
+        resp.setPickingInfo(PickInfoOutputToPickInfo(pickInfoOutput));
         return resp;
     }
@@ -76,7 +95,7 @@ public class PickInfoServiceImpl implements PickInfoService{
     @Override
     public DelPickInfoResp delPickInfo(DelPickInfoReq req) {
         DelPickInfoResp resp = new DelPickInfoResp();
-        if(pickInfoRPC.delPickingInfoById(req.getId())){
+        if(!pickInfoRPC.delPickingInfoById(req.getId())){
             resp.setCode(ResultCode.BUSINESS_FAILED);
         }
         return resp;
@@ -125,8 +144,7 @@ public class PickInfoServiceImpl implements PickInfoService{
     public GetDefaultPickInfoResp getDefaultPickInfo(GetDefaultPickInfoReq req) {
         GetDefaultPickInfoResp resp = new GetDefaultPickInfoResp();
         PickingInfoOutput pickingInfoOutput = pickInfoRPC.getDefaultPickingInfoByBuyerId(req.getUserId());
-        PickInfo pickInfo = PickInfoOutputToPickInfo(pickingInfoOutput);
-        resp.setPickingInfo(pickInfo);
+        resp.setPickingInfo(PickInfoOutputToPickInfo(pickingInfoOutput));
         return resp;
     }