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

jiangchengyong
2 parents 1689160e 6aff1b99
Showing 16 changed files with 177 additions and 79 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/GetProductRecommendReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/GetProductRecommendResp.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/GoodsRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/UserRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/GoodsRPCImpl.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/ShopRPCImpl.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/UserRPCImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/goods/GoodsService.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/goods/impl/GoodsServiceImpl.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-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/base/CommonController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/goods/GoodsController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/shop/ShopController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/UserController.java
 package com.diligrp.mobsite.getway.domain.protocol.detail;
-import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import com.diligrp.mobsite.getway.domain.base.BaseListReq;
 /**
  * <B>Description</B> 获取商品推荐请求 <br />
@@ -11,7 +11,7 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  * @author wujianjun
  */
 @SuppressWarnings("serial")
-public class GetProductRecommendReq extends BaseReq {
+public class GetProductRecommendReq extends BaseListReq {
     /**
      * 店铺ID
 package com.diligrp.mobsite.getway.domain.protocol.detail;
-import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import com.diligrp.mobsite.getway.domain.base.BaseListResp;
 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
  * @author wujianjun
  */
 @SuppressWarnings("serial")
-public class GetProductRecommendResp extends BaseResp {
+public class GetProductRecommendResp extends BaseListResp {
     /**
      * 商品列表
@@ -15,6 +15,8 @@ import com.diligrp.titan.sdk.domain.Category;
 import com.diligrp.titan.sdk.domain.Product;
 import com.diligrp.titan.sdk.input.CategoryInput;
 import com.diligrp.titan.sdk.input.PopProductView;
+import com.diligrp.titan.sdk.input.ProductSearchInput;
+import com.diligrp.titan.sdk.output.PageOutput;
 import java.util.HashMap;
 import java.util.List;
@@ -123,4 +125,6 @@ public interface GoodsRPC {
 	List<Category> searchProductCategory(String input, Long userId);
 	Object addGoods(PopProductView req, Long userId);
+
+	PageOutput<List<Product>> getProductRecommend(ProductSearchInput input , Long userId);
 }
@@ -97,4 +97,6 @@ public interface UserRPC {
     BuyerInfoOutput getUserByMobile(String accountName);
+
+    void getDepositCardAmount();
 }
@@ -21,7 +21,9 @@ import com.diligrp.titan.sdk.domain.Category;
 import com.diligrp.titan.sdk.domain.Product;
 import com.diligrp.titan.sdk.input.CategoryInput;
 import com.diligrp.titan.sdk.input.PopProductView;
+import com.diligrp.titan.sdk.input.ProductSearchInput;
 import com.diligrp.titan.sdk.output.BaseOutput;
+import com.diligrp.titan.sdk.output.PageOutput;
 import com.diligrp.website.util.redis.RedisUtil;
 import com.diligrp.website.util.security.Validator;
 import org.slf4j.Logger;
@@ -268,5 +270,19 @@ public class GoodsRPCImpl implements GoodsRPC {
         return output.getData();
     }
-
+    public PageOutput<List<Product>>  getProductRecommend(ProductSearchInput input, Long userId) {
+        PageOutput<List<Product>> output = null;
+        try {
+            output = titanClient.getProductService().searchListPopProducts(input);
+        }catch (Exception e){
+            logger.info("获取店铺热门推荐商品接口出错：",e);
+            throw new ServiceException(ResultCode.NETWORK_FAILED);
+        }
+        if (output.getCode()!=200) {
+            logger.error("获取店铺热门推荐商品失败[userId={},code={},result={}]",
+                    new Object[]{ userId,output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
+        }
+        return output;
+    }
 }
@@ -4,6 +4,7 @@ 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.api.shopProductRecommend.output.ShopProductRecommendOutput;
 import com.b2c.myapp.common.utils.BaseOutput;
 import com.b2c.myapp.sdk.MyAppClient;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
@@ -14,6 +15,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.List;
 /**
  * <B>Description</B> <br />
@@ -144,4 +146,6 @@ public class ShopRPCImpl implements ShopRPC {
 			throw new ServiceException(ResultCode.NETWORK_FAILED);
 		}
 	}
+
+
 }
@@ -101,6 +101,29 @@ public class UserRPCImpl implements UserRPC {
     }
     @Override
+    public void getDepositCardAmount() {
+        BaseOutput<BuyerInfoOutput> output = null;
+        boolean flag = false;
+        try {
+          //  output = myAppClient.getFundTradeService()..getBuyerInfoByMobilePhone(accountName);
+        } catch (Exception e) {
+            logger.error("手机号查询买家接口挂掉：msg={}",e.getMessage());
+            throw new ServiceException();
+        }
+
+        //if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
+        //    logger.error("手机号查询买家接口失败：[userId={},code={},result={}]",new Object[]{accountName,output.getCode(),output.getResult()});
+        //    throw new ServiceException();
+        //}
+        //
+        //if(Validator.isNull(output.getData())){
+        //    logger.info("查询用户为空：[mobile={}]",new Object[]{accountName});
+        //    throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_NOT_EXIST);
+        //}
+
+    }
+
+    @Override
     public boolean modifyPwd(String accountName, String newPassword) {
         return false;
     }
@@ -13,6 +13,8 @@ import com.diligrp.mobsite.getway.domain.protocol.common.GetProductCategoryReq;
 import com.diligrp.mobsite.getway.domain.protocol.common.GetProductCategoryResp;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductIntroductionReq;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductIntroductionResp;
+import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductRecommendReq;
+import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductRecommendResp;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByCategoryReq;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByCategoryResp;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByKeywordReq;
@@ -35,4 +37,6 @@ public interface GoodsService {
     SearchProductByCategoryResp searchByCategory(SearchProductByCategoryReq req);
     GetProductIntroductionResp getIntroductionById(GetProductIntroductionReq req);
+
+    GetProductRecommendResp getProductRecommend(GetProductRecommendReq req);
 }
 package com.diligrp.mobsite.getway.service.buyer.goods.impl;
+import com.diligrp.mobsite.getway.domain.common.enums.PageEnum;
+import com.diligrp.mobsite.getway.domain.protocol.Goods;
+import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
 import com.diligrp.mobsite.getway.domain.protocol.common.GetProductCategoryReq;
 import com.diligrp.mobsite.getway.domain.protocol.common.GetProductCategoryResp;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductIntroductionReq;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductIntroductionResp;
+import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductRecommendReq;
+import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductRecommendResp;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByCategoryReq;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByCategoryResp;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByKeywordReq;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByKeywordResp;
+import com.diligrp.mobsite.getway.rpc.GoodsRPC;
 import com.diligrp.mobsite.getway.service.buyer.goods.GoodsService;
+import com.diligrp.titan.sdk.domain.Product;
+import com.diligrp.titan.sdk.input.ProductSearchInput;
+import com.diligrp.titan.sdk.output.PageOutput;
+import com.diligrp.website.util.security.Validator;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author zhangshirui
  * @ClassName: GoodsServiceImpl
@@ -20,6 +34,10 @@ import org.springframework.stereotype.Service;
 @Service("goodsService")
 public class GoodsServiceImpl implements GoodsService {
+    @Resource
+    private GoodsRPC goodsRPC;
+
+
     @Override
     public SearchProductByKeywordResp searchGoodList(SearchProductByKeywordReq req) {
         return null;
@@ -39,4 +57,34 @@ public class GoodsServiceImpl implements GoodsService {
     public GetProductIntroductionResp getIntroductionById(GetProductIntroductionReq req) {
         return null;
     }
+
+    @Override
+    public GetProductRecommendResp getProductRecommend(GetProductRecommendReq req) {
+        ProductSearchInput input = new ProductSearchInput();
+        input.setIndexTop(0);
+        input.setPageSize(PageEnum.MINPAGESIZE.getValue());
+        input.setPage(Validator.isNull(req.getPageNum()) ? PageEnum.PAGENUM.getValue() : req.getPageNum());
+        PageOutput<List<Product>> recommendGoods = goodsRPC.getProductRecommend(input, req.getUserId());
+        GetProductRecommendResp resp = new GetProductRecommendResp();
+        if (!Validator.isEmpty(recommendGoods.getData())){
+            resp.setGoods(buildRecommendGoods(recommendGoods.getData()));
+        }
+        resp.setMaxPageNum(recommendGoods.getTotalPage());
+        return resp;
+    }
+
+
+
+    private List<GoodsSuper> buildRecommendGoods(List<Product> recommendGoods) {
+        List<GoodsSuper> goodsList = new ArrayList<>();
+        for(Product goodsInfo:recommendGoods){
+            GoodsSuper goods = new Goods();
+            goods.setPid(goodsInfo.getPid());
+            goods.setName("");
+            goods.setDefaultPic("");
+            goodsList.add(goods);
+        }
+        return goodsList;
+    }
+
 }
 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.*;
 /**
@@ -20,4 +16,5 @@ public interface ShopService {
     BindToShopResp bindToShop(BindToShopReq req);
     GetShopByIdResp getShopById(GetShopByIdReq req);
+
 }
@@ -5,15 +5,12 @@ 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.rpc.ShopRPC;
 import com.diligrp.mobsite.getway.service.buyer.shop.ShopService;
 import com.diligrp.website.util.security.Validator;
 import org.slf4j.Logger;
@@ -22,7 +19,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
@@ -38,7 +34,7 @@ import java.util.List;
 public class ShopServiceImpl implements ShopService {
 	@Resource
-	private ShopRPCImpl shopRPC;
+	private ShopRPC shopRPC;
 	@Resource
 	private ShopBuyerRPC shopBuyerRPC;
@@ -82,4 +78,6 @@ public class ShopServiceImpl implements ShopService {
 		return resp;
 	}
+
+
 }
@@ -363,6 +363,9 @@ public class UserServiceImpl implements UserService {
     @Override
     public GetDepositCardAmountResp getDepositCardAmount(GetDepositCardAmountReq req) {
+
+        userRPC.getDepositCardAmount();
+
         return null;
     }
@@ -24,7 +24,7 @@ import javax.annotation.Resource;
  */
 @Controller
 @RequestMapping("/mobsiteApp/common")
-@Api(value = "/mobsiteApp/common", description = "公共：城市信息,上传图片等")
+@Api(value = "/mobsiteApp-common", description = "公共：城市信息,上传图片等")
 public class CommonController extends BaseApiController {
@@ -55,7 +55,7 @@ public class CommonController extends BaseApiController {
     /**
      * 根据城市id查询城市信息
      */
-    @ApiOperation(value = "根据城市id查询城市信息", httpMethod = "POST",response = GetCitysResp.class)
+    @ApiOperation(value = "根据城市id数组查询城市信息", httpMethod = "POST",response = GetCitysResp.class)
     @RequestMapping(value = "/getCitys",method = RequestMethod.POST)
     @ResponseBody
     public void getCitys(@ModelAttribute GetCitysReq temp) {
@@ -3,8 +3,7 @@ package com.diligrp.mobsite.getway.web.api.buyer.goods;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.common.GetProductCategoryReq;
 import com.diligrp.mobsite.getway.domain.protocol.common.GetProductCategoryResp;
-import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductIntroductionReq;
-import com.diligrp.mobsite.getway.domain.protocol.detail.GetProductIntroductionResp;
+import com.diligrp.mobsite.getway.domain.protocol.detail.*;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByCategoryReq;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByCategoryResp;
 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByKeywordReq;
@@ -148,6 +147,24 @@ public class GoodsController extends BaseApiController {
     }
+    /**
+     * 获取热门推荐
+     */
+    @ApiOperation(value = "热门推荐", httpMethod = "POST",response = BindToShopResp.class)
+    @RequestMapping(value = "/getProductRecommend",method = RequestMethod.POST)
+    @ResponseBody
+    public void getProductRecommend(@RequestBody GetProductRecommendReq temp) {
+        GetProductRecommendReq req = getRequest(GetProductRecommendReq.class);
+        GetProductRecommendResp resp = null;
+        try {
+            resp = goodsService.getProductRecommend(req);
+            sendSuccessResp(resp);
+        }
+        catch(Exception e) {
+            log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
+            sendError(e.getMessage());
+        }
+    }
 }
@@ -79,24 +79,6 @@ public class ShopController extends BaseApiController {
         }
     }
-    /**
-     * 获取热门推荐
-     */
-    @ApiOperation(value = "热门推荐", httpMethod = "POST",response = BindToShopResp.class)
-    @RequestMapping(value = "/getProductRecommend",method = RequestMethod.POST)
-    @ResponseBody
-    public void getProductRecommend(@RequestBody  GetProductRecommendReq temp) {
-        GetProductRecommendReq req = getRequest(GetProductRecommendReq.class);
-        GetProductRecommendResp resp = null;
-        try {
-            BeanValidator.validator(req);
-            sendSuccessResp(resp);
-        }
-        catch(Exception e) {
-            log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
-            sendError(e.getMessage());
-        }
-    }
     /**
@@ -341,50 +341,50 @@ public class UserController extends BaseApiController {
     }
-    /**
-     *  查询用户信息
-     * GetUserInfoReq
-     */
-    @ApiOperation(value = "查询买家用户信息", httpMethod = "POST"  ,response = GetDepositCardAmountResp.class)
-    @RequestMapping(value = "/getBuyerInfo",method = RequestMethod.POST)
-    @ResponseBody
-    public void getBuyerInfo() {
-        GetUserInfoReq req = getRequest(GetUserInfoReq.class);
-        try {
-            GetUserInfoResp resp = userService.getUserIntroduction(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(), req.getUserId()), e);
-            sendError(e.getMessage());
-        }
-    }
+    ///**
+    // *  查询用户信息
+    // * GetUserInfoReq
+    // */
+    //@ApiOperation(value = "查询买家用户信息", httpMethod = "POST"  ,response = GetDepositCardAmountResp.class)
+    //@RequestMapping(value = "/getBuyerInfo",method = RequestMethod.POST)
+    //@ResponseBody
+    //public void getBuyerInfo() {
+    //    GetUserInfoReq req = getRequest(GetUserInfoReq.class);
+    //    try {
+    //        GetUserInfoResp resp = userService.getUserIntroduction(req);
+    //        super.sendSuccessResp(resp);
+    //    } catch (ServiceException e){
+    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+    //                e.getCode(), e.getMessage(), req.getUserId()), e);
+    //        sendError(e.getCode(), e.getMessage());
+    //    } catch (Exception e) {
+    //        LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(), req.getUserId()), e);
+    //        sendError(e.getMessage());
+    //    }
+    //}
-    /**
-     *  搜索买家用户信息
-     * GetUserInfoReq
-     */
-    @ApiOperation(value = "搜索买家用户信息", httpMethod = "POST"  ,response = SearchUserInfoResp.class)
-    @RequestMapping(value = "/searchBuyerInfo",method = RequestMethod.POST)
-    @ResponseBody
-    public void searchBuyerInfo(@RequestBody  SearchUserInfoReq temp) {
-        SearchUserInfoReq req = getRequest(SearchUserInfoReq.class);
-        try {
-            SearchUserInfoResp resp = userService.searchBuyerInfo(req);
-            super.sendSuccessResp(resp);
-        } catch (ServiceException e){
-            LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-                    e.getCode(), e.getMessage(), req.getUserId()), e);
-            sendError(e.getCode(), e.getMessage());
-        } catch (Exception e) {
-            LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(), req.getUserId()), e);
-            sendError(e.getMessage());
-        }
-    }
+    ///**
+    // *  搜索买家用户信息
+    // * GetUserInfoReq
+    // */
+    //@ApiOperation(value = "搜索买家用户信息", httpMethod = "POST"  ,response = SearchUserInfoResp.class)
+    //@RequestMapping(value = "/searchBuyerInfo",method = RequestMethod.POST)
+    //@ResponseBody
+    //public void searchBuyerInfo(@RequestBody  SearchUserInfoReq temp) {
+    //    SearchUserInfoReq req = getRequest(SearchUserInfoReq.class);
+    //    try {
+    //        SearchUserInfoResp resp = userService.searchBuyerInfo(req);
+    //        super.sendSuccessResp(resp);
+    //    } catch (ServiceException e){
+    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+    //                e.getCode(), e.getMessage(), req.getUserId()), e);
+    //        sendError(e.getCode(), e.getMessage());
+    //    } catch (Exception e) {
+    //        LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(), req.getUserId()), e);
+    //        sendError(e.getMessage());
+    //    }
+    //}
     /**