b2c / gateway · Commits

Commit e02d40766d904dd3bfdf505e3220b48b6720d6bb

Authored by jiangchengyong
1 parent e2b6c603

店铺 资金相关接口 update

Inline Side-by-side
Showing 10 changed files with 280 additions and 123 deletions
.gitignore 0 → 100644
  View file @e02d407
  1 +#target/
  2 +target/
  3 +
  4 +# IDEA #
  5 +.idea/
  6 +*.iml
  7 +
  8 +# Eclipse #
  9 +.settings/
  10 +.classpath
  11 +.project
  12 +
  13 +# Log #
  14 +logs/
  15 +*.log%
  16 +
  17 +#mac
  18 +.DS_Store
  19 +
  20 +#svn
  21 +.svn
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetFundsResp.java
  View file @e02d407
1 1 package com.diligrp.mobsite.getway.domain.protocol.fund;
2 2  
  3 +import com.b2c.myapp.common.api.shop.output.ShopOutput;
  4 +import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
3 5 import com.diligrp.mobsite.getway.domain.base.BaseListResp;
4   -import io.swagger.annotations.ApiModelProperty;
  6 +
  7 +import java.util.List;
5 8  
6 9 /**
7 10 * Created by xxxzzz on 2017/1/3.
8 11 */
9 12 public class GetFundsResp extends BaseListResp {
10   -
11   -
12   - @ApiModelProperty(value = "储值总金额")
13   - private Long storedTotalPrice;
14   -
15   - @ApiModelProperty(value = "可用余额")
16   - private Long residueTotalPrice;
17   -
18   - @ApiModelProperty(value = "冻结总金额")
19   - private Long freezeTotalPrice;
20   -
21   - @ApiModelProperty(value = "用户名称")
22   - private String userName ;
23   -
24   - @ApiModelProperty(value = "用户头像")
25   - private String headImg ;
26   -
27   - public String getHeadImg() {
28   - return headImg;
29   - }
30   -
31   - public void setHeadImg(String headImg) {
32   - this.headImg = headImg;
33   - }
34   -
35   - public String getUserName() {
36   - return userName;
37   - }
38   -
39   - public void setUserName(String userName) {
40   - this.userName = userName;
  13 + private ShopOutput shop;
  14 + private List<ShopBuyerDetailOutput> shopBuyers;
  15 + public ShopOutput getShop() {
  16 + return shop;
41 17 }
42 18  
43   - public Long getStoredTotalPrice() {
44   - return storedTotalPrice;
  19 + public void setShop(ShopOutput shop) {
  20 + this.shop = shop;
45 21 }
46 22  
47   - public void setStoredTotalPrice(Long storedTotalPrice) {
48   - this.storedTotalPrice = storedTotalPrice;
  23 + public List<ShopBuyerDetailOutput> getShopBuyers() {
  24 + return shopBuyers;
49 25 }
50 26  
51   - public Long getResidueTotalPrice() {
52   - return residueTotalPrice;
  27 + public void setShopBuyers(List<ShopBuyerDetailOutput> shopBuyers) {
  28 + this.shopBuyers = shopBuyers;
53 29 }
54   -
55   - public void setResidueTotalPrice(Long residueTotalPrice) {
56   - this.residueTotalPrice = residueTotalPrice;
57   - }
58   -
59   - public Long getFreezeTotalPrice() {
60   - return freezeTotalPrice;
61   - }
62   -
63   - public void setFreezeTotalPrice(Long freezeTotalPrice) {
64   - this.freezeTotalPrice = freezeTotalPrice;
65   - }
66   -
67   -
68 30 }
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/ShopBuyerRPC.java 0 → 100644
  View file @e02d407
  1 +package com.diligrp.mobsite.getway.rpc;
  2 +
  3 +import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerListInput;
  4 +import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
  5 +import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerKeyOutput;
  6 +import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerOutput;
  7 +import com.b2c.myapp.common.utils.BaseOutput;
  8 +import com.b2c.myapp.common.utils.base.Page;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * Created by jiangchengyong on 2017/1/10.
  14 + */
  15 +public interface ShopBuyerRPC {
  16 + /**
  17 + * @comment 查找店铺所有买家列表
  18 + * @param shopBuyerListInput 店铺买家对象
  19 + * @return Page<ShopBuyerDetailOutput>
  20 + * @author kelan
  21 + * @time 2016/12/1 9:59
  22 + */
  23 + public Page<ShopBuyerDetailOutput> queryShopAllBuyerList(ShopBuyerListInput shopBuyerListInput);
  24 + /**
  25 + * 绑定并激活（查询买家是否绑定相关店铺，未绑定直接绑定，已绑定直接激活）
  26 + * @param buyerId
  27 + * @param promoCode
  28 + * @return
  29 + */
  30 + ShopBuyerOutput bindAndActivate(Long buyerId,Long promoCode);
  31 +
  32 + /**
  33 + * 获取店铺用户的相关主键信息（buyId、shopId、sellerId）
  34 + * @param shopBuyerId
  35 + * @return
  36 + */
  37 + ShopBuyerKeyOutput getShopBuyerKeys(Long shopBuyerId);
  38 +}
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/ShopRPC.java
  View file @e02d407
1 1 package com.diligrp.mobsite.getway.rpc;
2 2  
  3 +import com.b2c.myapp.common.api.shop.input.ShopListInput;
  4 +import com.b2c.myapp.common.api.shop.input.ShopSaveInput;
  5 +import com.b2c.myapp.common.api.shop.input.ShopUpdateInput;
  6 +import com.b2c.myapp.common.api.shop.output.ShopOutput;
  7 +import com.b2c.myapp.common.utils.BaseOutput;
3 8 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
4 9 import com.diligrp.mobsite.getway.domain.protocol.ShopIntroduction;
5 10 import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
... ... @@ -7,70 +12,55 @@ import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
7 12 import java.util.List;
8 13  
9 14 /**
10   - * <B>Description</B> <br />
11   - * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
12   - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
13   - * <B>Company</B> 地利集团
  15 + * <BDescription</B <br /
  16 + * <BCopyright</B Copyright (c) 2015 www.diligrp.com All rights reserved. <br /
  17 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /
  18 + * <BCompany</B 地利集团
14 19 * @createTime 2015年6月10日 下午1:40:21
15 20 * @author zhangshirui
16 21 */
17 22 public interface ShopRPC {
18 23  
19   -
20   - /**
21   - * 查询店铺分类信息
22   - * @param shopId
23   - * @return
24   - * @createTime 2015年6月10日 下午4:35:14
25   - * @author zhangshirui
26   - */
27   - List<ProductCategory> getShopCategory(Long shopId);
28 24  
29 25 /**
30   - * 根据店铺id，查询推荐商品信息
31   - * @param shopId
32   - * @return
33   - * @createTime 2015年6月11日 下午6:09:41
34   - * @author zhangshirui
  26 + * @comment 创建店铺
  27 + * @param shopSaveInput 店铺基本信息
  28 + * @return Integer
  29 + * @author kelan
  30 + * @time 2016/11/29 19:03
35 31 */
36   - List<Long> getRecommendProducts(Long shopId);
37   -
  32 + public Integer createShopInfo(ShopSaveInput shopSaveInput);
38 33 /**
39   - * 根据店铺id查询店铺简介
40   - * @param shopId
41   - * @return
42   - * @createTime 2015年6月12日 上午10:37:02
43   - * @author zhangshirui
  34 + * @comment 通过卖家id获取店铺信息
  35 + * @param sellerId 卖家id
  36 + * @return ShopOutput
  37 + * @author kelan
  38 + * @time 2016/11/29 18:54
44 39 */
45   - ShopIntroduction getShopIntroductionById(Long shopId);
46   -
  40 + public ShopOutput getShopBySellerId(Long sellerId);
47 41 /**
48   - * 根据用户id查询店铺简介
49   - * @param userId
50   - * @return
51   - * @createTime 2015年6月12日 上午10:38:32
52   - * @author zhangshirui
  42 + * @comment 通过店铺id获取店铺信息
  43 + * @param shopId 店铺id
  44 + * @return ShopOutput
  45 + * @author kelan
  46 + * @time 2016/12/2 10:15
53 47 */
54   - ShopIntroduction getShopIntroductionByUserId(Long userId);
55   -
  48 + public ShopOutput getShopByShopId(Long shopId);
56 49 /**
57   - * 根据二级域名查询店铺信息
58   - * @param domain
59   - * @return
60   - * @createTime 2015年6月25日 下午3:42:24
61   - * @author zhangshirui
  50 + * @comment 多字段条件查询店铺信息
  51 + * @param shopListInput 多字段条件查询
  52 + * @return ShopOutput
  53 + * @author kelan
  54 + * @time 2016/11/30 10:00
62 55 */
63   - ShopInfo getShopInfoByDomain(String domain);
64   -
65   -
66   -
  56 + public ShopOutput getShopInfo(ShopListInput shopListInput);
67 57 /**
68   - * 根据用户信息查询店铺信息
69   - * @param userId
70   - * @return
71   - * @createTime 2015年8月1日 上午10:53:23
72   - * @author zhangshirui
  58 + * @comment 修改店铺基本信息
  59 + * @param shopUpdateInput
  60 + * @return Integer
  61 + * @author kelan
  62 + * @time 2016/11/30 15:43
73 63 */
74   - ShopInfo getShopInfoByUser(Long userId);
  64 + public Boolean modifyShopBasicInfo(ShopUpdateInput shopUpdateInput);
75 65  
76 66 }
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/ShopBuyerRPCImpl.java 0 → 100644
  View file @e02d407
  1 +package com.diligrp.mobsite.getway.rpc.impl;
  2 +
  3 +import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerListInput;
  4 +import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
  5 +import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerKeyOutput;
  6 +import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerOutput;
  7 +import com.b2c.myapp.common.utils.BaseOutput;
  8 +import com.b2c.myapp.common.utils.base.Page;
  9 +import com.b2c.myapp.sdk.MyAppClient;
  10 +import com.diligrp.mobsite.getway.domain.except.ServiceException;
  11 +import com.diligrp.mobsite.getway.rpc.ShopBuyerRPC;
  12 +import org.apache.log4j.Logger;
  13 +
  14 +import javax.annotation.Resource;
  15 +import java.util.List;
  16 +
  17 +/**
  18 + * Created by jiangchengyong on 2017/1/10.
  19 + */
  20 +public class ShopBuyerRPCImpl implements ShopBuyerRPC {
  21 + private final static Logger log = Logger.getLogger(ShopBuyerRPCImpl.class);
  22 + @Resource
  23 + private MyAppClient myAppClient;
  24 + /**
  25 + * @param shopBuyerListInput 店铺买家对象
  26 + * @return BaseOutput<List<ShopBuyerOutput>>
  27 + * @comment 查找店铺所有买家列表
  28 + * @author kelan
  29 + * @time 2016/12/1 9:59
  30 + */
  31 + @Override
  32 + public Page<ShopBuyerDetailOutput> queryShopAllBuyerList(ShopBuyerListInput shopBuyerListInput) {
  33 + BaseOutput<Page<ShopBuyerDetailOutput>> output = null;
  34 + boolean flag = false;
  35 + try {
  36 + output = myAppClient.getShopBuyerService().queryShopAllBuyerList(shopBuyerListInput);
  37 + if(output.getCode().equals(200)){
  38 + return output.getData();
  39 + }
  40 + } catch (Exception e) {
  41 + log.error("查找店铺所有买家列表接口出错：msg={}",e);
  42 + throw new ServiceException();
  43 + }
  44 + return null;
  45 + }
  46 +
  47 + /**
  48 + * 绑定并激活（查询买家是否绑定相关店铺，未绑定直接绑定，已绑定直接激活）
  49 + *
  50 + * @param buyerId
  51 + * @param promoCode
  52 + * @return
  53 + */
  54 + @Override
  55 + public ShopBuyerOutput bindAndActivate(Long buyerId, Long promoCode) {
  56 + BaseOutput<ShopBuyerOutput> output = null;
  57 + boolean flag = false;
  58 + try {
  59 + output = myAppClient.getShopBuyerService().bindAndActivate(buyerId,promoCode);
  60 + if(output.getCode().equals(200)){
  61 + return output.getData();
  62 + }
  63 + } catch (Exception e) {
  64 + log.error("绑定并激活接口出错：msg={}",e);
  65 + throw new ServiceException();
  66 + }
  67 +
  68 + return null;
  69 + }
  70 +
  71 + /**
  72 + * 获取店铺用户的相关主键信息（buyId、shopId、sellerId）
  73 + *
  74 + * @param shopBuyerId
  75 + * @return
  76 + */
  77 + @Override
  78 + public ShopBuyerKeyOutput getShopBuyerKeys(Long shopBuyerId) {
  79 + BaseOutput<ShopBuyerKeyOutput> output = null;
  80 + boolean flag = false;
  81 + try {
  82 + output = myAppClient.getShopBuyerService().getShopBuyerKeys(shopBuyerId);
  83 + if(output.getCode().equals(200)){
  84 + return output.getData();
  85 + }
  86 + } catch (Exception e) {
  87 + log.error("获取店铺用户的相关主键信息接口出错：msg={}",e);
  88 + throw new ServiceException();
  89 + }
  90 +
  91 + return null;
  92 + }
  93 +}
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/ShopRPCImpl.java
  View file @e02d407
1 1 package com.diligrp.mobsite.getway.rpc.impl;
2 2  
  3 +import com.b2c.myapp.common.api.shop.input.ShopListInput;
  4 +import com.b2c.myapp.common.api.shop.input.ShopSaveInput;
  5 +import com.b2c.myapp.common.api.shop.input.ShopUpdateInput;
  6 +import com.b2c.myapp.common.api.shop.output.ShopOutput;
3 7 import com.diligrp.mobsite.getway.domain.protocol.ProductCategory;
4 8 import com.diligrp.mobsite.getway.domain.protocol.ShopIntroduction;
5 9 import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
... ... @@ -23,34 +27,63 @@ public class ShopRPCImpl implements ShopRPC {
23 27  
24 28 private Logger logger = LoggerFactory.getLogger(ShopRPCImpl.class);
25 29  
  30 + /**
  31 + * @param shopSaveInput 店铺基本信息
  32 + * @return Integer
  33 + * @comment 创建店铺
  34 + * @author kelan
  35 + * @time 2016/11/29 19:03
  36 + */
26 37 @Override
27   - public List<ProductCategory> getShopCategory(Long shopId) {
  38 + public Integer createShopInfo(ShopSaveInput shopSaveInput) {
28 39 return null;
29 40 }
30 41  
  42 + /**
  43 + * @param sellerId 卖家id
  44 + * @return ShopOutput
  45 + * @comment 通过卖家id获取店铺信息
  46 + * @author kelan
  47 + * @time 2016/11/29 18:54
  48 + */
31 49 @Override
32   - public List<Long> getRecommendProducts(Long shopId) {
  50 + public ShopOutput getShopBySellerId(Long sellerId) {
33 51 return null;
34 52 }
35 53  
  54 + /**
  55 + * @param shopId 店铺id
  56 + * @return ShopOutput
  57 + * @comment 通过店铺id获取店铺信息
  58 + * @author kelan
  59 + * @time 2016/12/2 10:15
  60 + */
36 61 @Override
37   - public ShopIntroduction getShopIntroductionById(Long shopId) {
  62 + public ShopOutput getShopByShopId(Long shopId) {
38 63 return null;
39 64 }
40 65  
  66 + /**
  67 + * @param shopListInput 多字段条件查询
  68 + * @return ShopOutput
  69 + * @comment 多字段条件查询店铺信息
  70 + * @author kelan
  71 + * @time 2016/11/30 10:00
  72 + */
41 73 @Override
42   - public ShopIntroduction getShopIntroductionByUserId(Long userId) {
  74 + public ShopOutput getShopInfo(ShopListInput shopListInput) {
43 75 return null;
44 76 }
45 77  
  78 + /**
  79 + * @param shopUpdateInput
  80 + * @return Integer
  81 + * @comment 修改店铺基本信息
  82 + * @author kelan
  83 + * @time 2016/11/30 15:43
  84 + */
46 85 @Override
47   - public ShopInfo getShopInfoByDomain(String domain) {
  86 + public Boolean modifyShopBasicInfo(ShopUpdateInput shopUpdateInput) {
48 87 return null;
49 88 }
50   -
51   - @Override
52   - public ShopInfo getShopInfoByUser(Long userId) {
53   - return null;
54   - }
55   -
56 89 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/FundService.java
  View file @e02d407
... ... @@ -9,7 +9,7 @@ import com.diligrp.mobsite.getway.domain.protocol.fund.*;
9 9 public interface FundService {
10 10  
11 11  
12   - public GetFundsResp getFunds(GetFundsReq req) ;
  12 + public GetFundsResp getFunds(Long shopId) ;
13 13  
14 14 FundTradeResp fundTrade(FundTradeReq req);
15 15  
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/FundServiceImpl.java
  View file @e02d407
1 1 package com.diligrp.mobsite.getway.service.seller.impl;
2 2  
  3 +import com.b2c.myapp.common.api.shop.output.ShopOutput;
  4 +import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerListInput;
  5 +import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
  6 +import com.b2c.myapp.common.utils.base.Page;
3 7 import com.diligrp.mobsite.getway.domain.protocol.fund.*;
  8 +import com.diligrp.mobsite.getway.rpc.ShopBuyerRPC;
  9 +import com.diligrp.mobsite.getway.rpc.ShopRPC;
4 10 import com.diligrp.mobsite.getway.service.seller.FundService;
  11 +import org.springframework.beans.factory.annotation.Autowired;
5 12 import org.springframework.stereotype.Service;
6 13  
7 14 /**
... ... @@ -9,9 +16,22 @@ import org.springframework.stereotype.Service;
9 16 */
10 17 @Service
11 18 public class FundServiceImpl implements FundService{
  19 + @Autowired
  20 + private ShopBuyerRPC shopBuyerRPC;
  21 + @Autowired
  22 + private ShopRPC shopRPC;
12 23 @Override
13   - public GetFundsResp getFunds(GetFundsReq req) {
14   - return null;
  24 + public GetFundsResp getFunds(Long shopId) {
  25 + ShopBuyerListInput shopBuyerListInput = new ShopBuyerListInput();
  26 + shopBuyerListInput.setShopId(shopId);
  27 + Page<ShopBuyerDetailOutput> shopBuyerDetailOutputPage = shopBuyerRPC.queryShopAllBuyerList(shopBuyerListInput);
  28 + ShopOutput shopOutput = shopRPC.getShopByShopId(shopId);
  29 +
  30 + GetFundsResp fundsResp = new GetFundsResp();
  31 + fundsResp.setShop(shopOutput);
  32 + fundsResp.setShopBuyers(shopBuyerDetailOutputPage.getResult());
  33 + fundsResp.setMaxPageNum(shopBuyerDetailOutputPage.getPageCount());
  34 + return fundsResp;
15 35 }
16 36  
17 37 @Override
... ...
mobsite-getway-web/pom.xml
  View file @e02d407
... ... @@ -72,7 +72,7 @@
72 72 <profile>
73 73 <id>dev</id>
74 74 <activation>
75   - <activeByDefault>false</activeByDefault>
  75 + <activeByDefault>true</activeByDefault>
76 76 </activation>
77 77 <properties>
78 78 <!-- 显示模板 -->
... ... @@ -214,7 +214,7 @@
214 214 <website.act.token>token</website.act.token>
215 215  
216 216 <!-- interface user -->
217   - <website.user.baseUrl>http://user.zandeapp.com</website.user.baseUrl>
  217 + <website.user.baseUrl>http://shopuser.zandeapp.com</website.user.baseUrl>
218 218 <website.user.token>token</website.user.token>
219 219  
220 220 <!-- interface order -->
... ... @@ -367,7 +367,7 @@
367 367 <website.act.token>token</website.act.token>
368 368  
369 369 <!-- interface user -->
370   - <website.user.baseUrl>http://user.zandeapp.com</website.user.baseUrl>
  370 + <website.user.baseUrl>http://shopuser.zandeapp.com</website.user.baseUrl>
371 371 <website.user.token>token</website.user.token>
372 372  
373 373 <!-- interface order -->
... ... @@ -514,7 +514,7 @@
514 514  
515 515  
516 516 <!-- interface user -->
517   - <website.user.baseUrl>http://user.zandeapp.com</website.user.baseUrl>
  517 + <website.user.baseUrl>http://shopuser.zandeapp.com</website.user.baseUrl>
518 518 <website.user.token>token</website.user.token>
519 519  
520 520 <!-- interface order -->
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/fund/FundController.java
  View file @e02d407
... ... @@ -5,6 +5,7 @@ import com.diligrp.mobsite.getway.domain.protocol.fund.*;
5 5 import com.diligrp.mobsite.getway.service.seller.FundService;
6 6 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
7 7 import io.swagger.annotations.Api;
  8 +import io.swagger.annotations.ApiImplicitParam;
8 9 import io.swagger.annotations.ApiOperation;
9 10 import org.apache.log4j.Logger;
10 11 import org.springframework.stereotype.Controller;
... ... @@ -41,13 +42,12 @@ public class FundController extends BaseApiController{
41 42 * @author weili
42 43 */
43 44 @ApiOperation(value = "获取储值列表", httpMethod = "POST",response = GetFundsResp.class)
  45 + @ApiImplicitParam(paramType = "query",name = "shopId",dataType = "Long", required = true, value = "店铺ID")
44 46 @RequestMapping(value = "/getFunds",method = RequestMethod.POST)
45 47 @ResponseBody
46   - public void getFunds() {
47   -
48   - GetFundsReq req = super.getRequest(GetFundsReq.class);
  48 + public void getFunds(Long shopId) {
49 49 try {
50   - GetFundsResp resp = fundService.getFunds(req);
  50 + GetFundsResp resp = fundService.getFunds(shopId);
51 51 super.sendSuccessResp(resp);
52 52 } catch (ServiceException e) {
53 53 log.error("获取储值列表出现业务异常", e);
... ...