店铺资金相关接口 update

jiangchengyong
1 parent ff8e5911
Showing 9 changed files with 111 additions and 33 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetFundsReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetFundsResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetfundTradeRecordReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetfundTradeRecordResp.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/ShopBuyerRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/ShopBuyerRPCImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/FundService.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/FundServiceImpl.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/fund/FundController.java
 package com.diligrp.mobsite.getway.domain.protocol.fund;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * Created by xxxzzz on 2017/1/3.
  */
 public class GetFundsReq extends BaseReq {
+    @ApiModelProperty(value = "搜索关键词")
+    private String keyword;
+    @ApiModelProperty(value="店铺ID")
+    private Long shopId;
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public Long getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Long shopId) {
+        this.shopId = shopId;
+    }
 }
@@ -3,6 +3,7 @@ package com.diligrp.mobsite.getway.domain.protocol.fund;
 import com.b2c.myapp.common.api.shop.output.ShopOutput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
 import com.diligrp.mobsite.getway.domain.base.BaseListResp;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
@@ -10,16 +11,23 @@ import java.util.List;
  * Created by xxxzzz on 2017/1/3.
  */
 public class GetFundsResp extends BaseListResp {
-    private ShopOutput shop;
-    private List<ShopBuyerDetailOutput> shopBuyers;
-    public ShopOutput getShop() {
-        return shop;
-    }
-
-    public void setShop(ShopOutput shop) {
-        this.shop = shop;
-    }
+    /**
+     * 店铺储值总金额
+     */
+    @ApiModelProperty(value = "店铺储值总金额")
+    private Long storedTotalPrice;
+    /**
+     * 店铺可用余额
+     */
+    @ApiModelProperty(value = "店铺可用余额")
+    private Long residueTotalPrice;
+    /**
+     * 店铺冻结总金额
+     */
+    @ApiModelProperty(value = "店铺冻结总金额")
+    private Long freezeTotalPrice;
+    private List<ShopBuyerDetailOutput> shopBuyers;
     public List<ShopBuyerDetailOutput> getShopBuyers() {
         return shopBuyers;
     }
@@ -27,4 +35,28 @@ public class GetFundsResp extends BaseListResp {
     public void setShopBuyers(List<ShopBuyerDetailOutput> shopBuyers) {
         this.shopBuyers = shopBuyers;
     }
+
+    public Long getStoredTotalPrice() {
+        return storedTotalPrice;
+    }
+
+    public void setStoredTotalPrice(Long storedTotalPrice) {
+        this.storedTotalPrice = storedTotalPrice;
+    }
+
+    public Long getResidueTotalPrice() {
+        return residueTotalPrice;
+    }
+
+    public void setResidueTotalPrice(Long residueTotalPrice) {
+        this.residueTotalPrice = residueTotalPrice;
+    }
+
+    public Long getFreezeTotalPrice() {
+        return freezeTotalPrice;
+    }
+
+    public void setFreezeTotalPrice(Long freezeTotalPrice) {
+        this.freezeTotalPrice = freezeTotalPrice;
+    }
 }
@@ -11,6 +11,8 @@ public class GetfundTradeRecordReq extends BaseListReq {
     @ApiModelProperty(value = "查询类型（1：充值 2：冻结4：消费）" ,required = true)
     private Long tradeType;
+    @ApiModelProperty(value = "店铺用户ID，绑定的唯一标识")
+    private Long shopBuyerId;
     public Long getTradeType() {
         return tradeType;
@@ -19,4 +21,12 @@ public class GetfundTradeRecordReq extends BaseListReq {
     public void setTradeType(Long tradeType) {
         this.tradeType = tradeType;
     }
+
+    public Long getShopBuyerId() {
+        return shopBuyerId;
+    }
+
+    public void setShopBuyerId(Long shopBuyerId) {
+        this.shopBuyerId = shopBuyerId;
+    }
 }
@@ -16,6 +16,9 @@ public class GetfundTradeRecordResp extends BaseListResp {
     @ApiModelProperty(value = "储值时间/消费时间")
     private String tradeTime;
+    @ApiModelProperty(value = "交易类型")
+    private Long tradeType;
+
     //@ApiModelProperty(value = "储值余额/消费时间")
     //private Long residueTotalPrice;
@@ -35,4 +38,12 @@ public class GetfundTradeRecordResp extends BaseListResp {
     public void setTradeTime(String tradeTime) {
         this.tradeTime = tradeTime;
     }
+
+    public Long getTradeType() {
+        return tradeType;
+    }
+
+    public void setTradeType(Long tradeType) {
+        this.tradeType = tradeType;
+    }
 }
 package com.diligrp.mobsite.getway.rpc;
+import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerDetail;
 import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerListInput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerKeyOutput;
@@ -15,12 +16,12 @@ import java.util.List;
 public interface ShopBuyerRPC {
     /**
      * @comment 查找店铺所有买家列表
-     * @param shopBuyerListInput 店铺买家对象
+     * @param shopBuyerDetail 店铺买家对象
      * @return Page<ShopBuyerDetailOutput>
      * @author kelan
      * @time 2016/12/1 9:59
      */
-    public Page<ShopBuyerDetailOutput> queryShopAllBuyerList(ShopBuyerListInput shopBuyerListInput);
+    public Page<ShopBuyerDetailOutput> queryShopAllBuyerList(ShopBuyerDetail shopBuyerDetail);
     /**
      * 绑定并激活（查询买家是否绑定相关店铺，未绑定直接绑定，已绑定直接激活）
      * @param buyerId
 package com.diligrp.mobsite.getway.rpc.impl;
+import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerDetail;
 import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerListInput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerKeyOutput;
@@ -23,18 +24,18 @@ public class ShopBuyerRPCImpl implements ShopBuyerRPC {
     @Resource
     private MyAppClient myAppClient;
     /**
-     * @param shopBuyerListInput 店铺买家对象
+     * @param shopBuyerDetail 店铺买家对象
      * @return BaseOutput<List<ShopBuyerOutput>>
      * @comment 查找店铺所有买家列表
      * @author kelan
      * @time 2016/12/1 9:59
      */
     @Override
-    public Page<ShopBuyerDetailOutput> queryShopAllBuyerList(ShopBuyerListInput shopBuyerListInput) {
+    public Page<ShopBuyerDetailOutput> queryShopAllBuyerList(ShopBuyerDetail shopBuyerDetail) {
         BaseOutput<Page<ShopBuyerDetailOutput>> output = null;
         boolean flag = false;
         try {
-            output = myAppClient.getShopBuyerService().queryShopAllBuyerList(shopBuyerListInput);
+            output = myAppClient.getShopBuyerService().queryShopAllBuyerList(shopBuyerDetail);
             if(output.getCode().equals(200)){
                 return output.getData();
             }
@@ -9,9 +9,9 @@ import com.diligrp.mobsite.getway.domain.protocol.fund.*;
 public interface FundService {
-    public GetFundsResp getFunds(Long shopId) ;
+    public GetFundsResp getFunds(GetFundsReq fundsReq) ;
-    FundTradeResp fundTrade(FundTradeReq req);
+    FundTradeResp storeValue(Long price);
     GetfundTradeRecordResp getfundTradeRecord(GetfundTradeRecordReq req);
 }
 package com.diligrp.mobsite.getway.service.seller.impl;
 import com.b2c.myapp.common.api.shop.output.ShopOutput;
+import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerDetail;
 import com.b2c.myapp.common.api.shopBuyer.input.ShopBuyerListInput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerDetailOutput;
 import com.b2c.myapp.common.utils.base.Page;
@@ -21,21 +22,25 @@ public class FundServiceImpl implements FundService{
     @Autowired
     private ShopRPC shopRPC;
     @Override
-    public GetFundsResp getFunds(Long shopId) {
-        ShopBuyerListInput shopBuyerListInput = new ShopBuyerListInput();
-        shopBuyerListInput.setShopId(shopId);
-        Page<ShopBuyerDetailOutput> shopBuyerDetailOutputPage = shopBuyerRPC.queryShopAllBuyerList(shopBuyerListInput);
-        ShopOutput shopOutput = shopRPC.getShopByShopId(shopId);
+    public GetFundsResp getFunds(GetFundsReq fundsReq) {
+        ShopBuyerDetail shopBuyerDetail = new ShopBuyerDetail();
+        shopBuyerDetail.setShopId(fundsReq.getShopId());
+        shopBuyerDetail.setBuyerMobilePhone(fundsReq.getKeyword());
+        Page<ShopBuyerDetailOutput> shopBuyerDetailOutputPage = shopBuyerRPC.queryShopAllBuyerList(shopBuyerDetail);
+        ShopOutput shopOutput = shopRPC.getShopByShopId(fundsReq.getShopId());
         GetFundsResp fundsResp = new GetFundsResp();
-        fundsResp.setShop(shopOutput);
+        fundsResp.setFreezeTotalPrice(shopOutput.getFreezeTotalPrice());
+        fundsResp.setResidueTotalPrice(shopOutput.getResidueTotalPrice());
+        fundsResp.setStoredTotalPrice(shopOutput.getStoredTotalPrice());
         fundsResp.setShopBuyers(shopBuyerDetailOutputPage.getResult());
         fundsResp.setMaxPageNum(shopBuyerDetailOutputPage.getPageCount());
         return fundsResp;
     }
     @Override
-    public FundTradeResp fundTrade(FundTradeReq req) {
+    public FundTradeResp storeValue(Long price) {
+
         return null;
     }
@@ -9,10 +9,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -42,12 +39,11 @@ public class FundController extends BaseApiController{
      * @author weili
      */
     @ApiOperation(value = "获取储值列表", httpMethod = "POST",response = GetFundsResp.class)
-    @ApiImplicitParam(paramType = "query",name = "shopId",dataType = "Long", required = true, value = "店铺ID")
     @RequestMapping(value = "/getFunds",method = RequestMethod.POST)
     @ResponseBody
-    public void getFunds(Long shopId) {
+    public void getFunds(@ModelAttribute GetFundsReq fundsReq) {
         try {
-            GetFundsResp resp = fundService.getFunds(shopId);
+            GetFundsResp resp = fundService.getFunds(fundsReq);
             super.sendSuccessResp(resp);
         } catch (ServiceException e) {
             log.error("获取储值列表出现业务异常", e);
@@ -70,13 +66,14 @@ public class FundController extends BaseApiController{
      * @author weili
      */
     @ApiOperation(value = "储值卡操作", httpMethod = "POST",response = FundTradeResp.class)
-    @RequestMapping(value = "/fundTrade",method = RequestMethod.POST)
+    @ApiImplicitParam(paramType = "query",name = "price",dataType = "Long", required = true, value = "储值金额")
+    @RequestMapping(value = "/storeValue",method = RequestMethod.POST)
     @ResponseBody
-    public void fundTrade(@RequestBody FundTradeReq temp) {
+    public void storeValue(Long price) {
         FundTradeReq req = super.getRequest(FundTradeReq.class);
         try {
-            FundTradeResp resp = fundService.fundTrade(req);
+            FundTradeResp resp = fundService.storeValue(price);
             super.sendSuccessResp(resp);
         } catch (ServiceException e) {
             log.error("获取储值列表出现业务异常", e);