update found

jiangchengyong
1 parent d56dd93a
Showing 10 changed files with 178 additions and 62 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/GetfundTradeRecordResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/ModifyShopRemarkNameReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/model/FoundTrade.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 com.diligrp.mobsite.getway.domain.base.BaseListReq;
 import io.swagger.annotations.ApiModelProperty;
  
 /**
  * Created by xxxzzz on 2017/1/3.
  */
-public class GetFundsReq extends BaseReq {
+public class GetFundsReq extends BaseListReq {
     @ApiModelProperty(value = "搜索关键词")
     private String keyword;
     @ApiModelProperty(value="店铺ID")
     private Long shopId;
-    @ApiModelProperty(value = "页码")
-    private Integer pageNum;
-
     public String getKeyword() {
         return keyword;
     }
@@ -29,12 +26,4 @@ public class GetFundsReq extends BaseReq {
     public void setShopId(Long shopId) {
         this.shopId = shopId;
     }
-
-    public Integer getPageNum() {
-        return pageNum;
-    }
-
-    public void setPageNum(Integer pageNum) {
-        this.pageNum = pageNum;
-    }
 }
 package com.diligrp.mobsite.getway.domain.protocol.fund;
  
+import com.b2c.orders.commons.utils.DateUtils;
 import com.diligrp.mobsite.getway.domain.base.BaseListResp;
+import com.diligrp.mobsite.getway.domain.protocol.fund.model.FoundTrade;
 import io.swagger.annotations.ApiModelProperty;
  
+import java.util.List;
+
 /**
  * Created by xxxzzz on 2017/1/3.
  */
 public class GetfundTradeRecordResp extends BaseListResp {
  
+    private List<FoundTrade> foundTrades;
  
-    @ApiModelProperty(value = "储值金额/订单金额" ,required = true)
-    private Long tradePrice ;
-
-
-    @ApiModelProperty(value = "储值时间/消费时间")
-    private String tradeTime;
-
-    @ApiModelProperty(value = "交易类型")
-    private Long tradeType;
-
-    //@ApiModelProperty(value = "储值余额/消费时间")
-    //private Long residueTotalPrice;
-
-
-    public Long getTradePrice() {
-        return tradePrice;
-    }
-
-    public void setTradePrice(Long tradePrice) {
-        this.tradePrice = tradePrice;
-    }
-
-    public String getTradeTime() {
-        return tradeTime;
-    }
-
-    public void setTradeTime(String tradeTime) {
-        this.tradeTime = tradeTime;
-    }
-
-    public Long getTradeType() {
-        return tradeType;
+    public List<FoundTrade> getFoundTrades() {
+        return foundTrades;
     }
  
-    public void setTradeType(Long tradeType) {
-        this.tradeType = tradeType;
+    public void setFoundTrades(List<FoundTrade> foundTrades) {
+        this.foundTrades = foundTrades;
     }
 }
+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 ModifyShopRemarkNameReq extends BaseReq {
+    @ApiModelProperty(value = "店铺用户ID，绑定的唯一标识")
+    private Long shopBuyerId;
+    @ApiModelProperty(value = "备注名称")
+    private String remarkName;
+
+    public Long getShopBuyerId() {
+        return shopBuyerId;
+    }
+
+    public void setShopBuyerId(Long shopBuyerId) {
+        this.shopBuyerId = shopBuyerId;
+    }
+
+    public String getRemarkName() {
+        return remarkName;
+    }
+
+    public void setRemarkName(String remarkName) {
+        this.remarkName = remarkName;
+    }
+}
@@ -3,7 +3,7 @@ package com.diligrp.mobsite.getway.domain.protocol.fund;
 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  
 /**
- * Created by david on 2015/7/14.
+ * Created by jiangchengyong on 2017/1/16.
  */
-public class SignRsponse extends BaseResp {
+public class ModifyShopRemarkNameResp extends BaseResp{
 }
@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * Created by xxxzzz on 2017/1/3.
  */
-public class FundTradeReq extends BaseReq {
+public class StoreValueReq extends BaseReq {
  
  
  
@@ -5,5 +5,5 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
 /**
  * Created by xxxzzz on 2017/1/3.
  */
-public class FundTradeResp extends BaseResp {
+public class StoreValueResp extends BaseResp {
 }
+package com.diligrp.mobsite.getway.domain.protocol.fund.model;
+
+import com.b2c.myapp.common.enums.TradeType;
+import com.b2c.myapp.common.utils.base.BaseDomain;
+import io.swagger.annotations.ApiParam;
+
+import java.util.Date;
+
+/**
+ *  <br />
+ * @createTime 2016-11-23 17:19:15
+ * @author template
+ */public class FoundTrade{
+
+    /**
+     * 订单编号
+     */
+    private Long orderId;
+
+    /**
+     * 交易名称
+     */
+    private String tradeName;
+
+    /**
+     * 交易金额
+     */
+    private Long tradePrice;
+
+    /**
+     * 交易类型（1：充值 2：冻结3：解冻 4：消费）
+     */
+    private Long tradeType;
+
+    /**
+     * 交易时间
+     */
+    private Date created;
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getTradeName() {
+        return tradeName;
+    }
+
+    public void setTradeName(String tradeName) {
+        this.tradeName = tradeName;
+    }
+
+    public Long getTradePrice() {
+        return tradePrice;
+    }
+
+    public void setTradePrice(Long tradePrice) {
+        this.tradePrice = tradePrice;
+    }
+
+    public Long getTradeType() {
+        return tradeType;
+    }
+
+    public void setTradeType(Long tradeType) {
+        this.tradeType = tradeType;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    @Override
+    public String toString() {
+        return "FoundTrade{" +
+                ", orderId=" + orderId +
+                ", tradeName='" + tradeName + '\'' +
+                ", tradePrice=" + tradePrice +
+                ", tradeType=" + tradeType +
+                ", created=" + created +
+                '}';
+    }
+}
 \ No newline at end of file
@@ -11,7 +11,8 @@ public interface FundService {
  
     public GetFundsResp getFunds(GetFundsReq fundsReq) ;
  
-    FundTradeResp storeValue(Long price);
+    StoreValueResp storeValue(Long price);
  
     GetfundTradeRecordResp getfundTradeRecord(GetfundTradeRecordReq req);
+    ModifyShopRemarkNameResp modifyShopRemarkName(ModifyShopRemarkNameReq req);
 }
@@ -2,7 +2,6 @@ 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;
 import com.diligrp.mobsite.getway.domain.protocol.fund.*;
@@ -40,7 +39,7 @@ public class FundServiceImpl implements FundService{
     }
  
     @Override
-    public FundTradeResp storeValue(Long price) {
+    public StoreValueResp storeValue(Long price) {
  
         return null;
     }
@@ -49,4 +48,9 @@ public class FundServiceImpl implements FundService{
     public GetfundTradeRecordResp getfundTradeRecord(GetfundTradeRecordReq req) {
         return null;
     }
+
+    @Override
+    public ModifyShopRemarkNameResp modifyShopRemarkName(ModifyShopRemarkNameReq req) {
+        return null;
+    }
 }
@@ -5,7 +5,6 @@ import com.diligrp.mobsite.getway.domain.protocol.fund.*;
 import com.diligrp.mobsite.getway.service.seller.FundService;
 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
@@ -66,13 +65,13 @@ public class FundController extends BaseApiController{
      * @createTime 2017年1月3日 下午5:32:02
      * @author weili
      */
-    @ApiOperation(value = "储值卡操作", httpMethod = "POST",response = FundTradeResp.class)
+    @ApiOperation(value = "储值卡操作", httpMethod = "POST",response = StoreValueResp.class)
     @RequestMapping(value = "/storeValue",method = RequestMethod.POST)
     @ResponseBody
-    public void storeValue(@RequestBody FundTradeReq temp) {
-        FundTradeReq req = super.getRequest(FundTradeReq.class);
+    public void storeValue(@RequestBody StoreValueReq temp) {
+        StoreValueReq req = super.getRequest(StoreValueReq.class);
         try {
-            FundTradeResp resp = fundService.storeValue(req.getTradePrice());
+            StoreValueResp resp = fundService.storeValue(req.getTradePrice());
             super.sendSuccessResp(resp);
         } catch (ServiceException e) {
             log.error("获取储值列表出现业务异常", e);
@@ -87,12 +86,12 @@ public class FundController extends BaseApiController{
     /**
      * 储值操作
      * <p/>
-     * 请求协议体：GetFundsReq
-     * 返回协议体：GetFundsResp
+     * 请求协议体：GetfundTradeRecordReq
+     * 返回协议体：GetfundTradeRecordResp
      *
      * @return
      * @createTime 2017年1月3日 下午5:32:02
-     * @author weili
+     * @author jcy
      */
     @ApiOperation(value = "获取储值/交易记录", httpMethod = "POST",response = GetfundTradeRecordResp.class)
     @RequestMapping(value = "/getfundTradeRecord",method = RequestMethod.POST)
@@ -112,5 +111,33 @@ public class FundController extends BaseApiController{
         }
     }
  
+    /**
+     * 修改店铺备注名称
+     * <p/>
+     * 请求协议体：ModifyShopRemarkNameReq
+     * 返回协议体：ModifyShopRemarkNameResp
+     *
+     * @return
+     * @createTime 2017年1月3日 下午5:32:02
+     * @author jcy
+     */
+    @ApiOperation(value = "修改店铺备注名称", httpMethod = "POST",response = ModifyShopRemarkNameResp.class)
+    @RequestMapping(value = "/modifyShopRemarkName",method = RequestMethod.POST)
+    @ResponseBody
+    public void modifyShopRemarkName(@RequestBody ModifyShopRemarkNameReq temp) {
+        ModifyShopRemarkNameReq req = super.getRequest(ModifyShopRemarkNameReq.class);
+        try {
+            ModifyShopRemarkNameResp resp = fundService.modifyShopRemarkName(req);
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e) {
+            log.error("修改店铺备注名称出现业务异常", e);
+            super.sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("修改店铺备注名称失败", e);
+            super.sendError(e.getMessage());
+        }
+    }
+
+
  
 }