资金管理 update

jiangchengyong
1 parent e26b52a5
Showing 13 changed files with 204 additions and 43 deletions
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-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/StoreValueReq.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/FundTradeRPC.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/FundTradeRPCImpl.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/common/utils/DateUtils.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
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/shop/SellerShopController.java
@@ -10,15 +10,15 @@ public class GetfundTradeRecordReq extends BaseListReq {
     @ApiModelProperty(value = "查询类型（1：充值 2：冻结4：消费）" ,required = true)
-    private Long tradeType;
+    private Integer tradeType;
     @ApiModelProperty(value = "店铺用户ID，绑定的唯一标识")
     private Long shopBuyerId;
-    public Long getTradeType() {
+    public Integer getTradeType() {
         return tradeType;
     }
-    public void setTradeType(Long tradeType) {
+    public void setTradeType(Integer tradeType) {
         this.tradeType = tradeType;
     }
 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 com.diligrp.mobsite.getway.domain.protocol.fund.model.FundTrade;
 import java.util.List;
@@ -12,13 +10,13 @@ import java.util.List;
  */
 public class GetfundTradeRecordResp extends BaseListResp {
-    private List<FoundTrade> foundTrades;
+    private List<FundTrade> fundTrades;
-    public List<FoundTrade> getFoundTrades() {
-        return foundTrades;
+    public List<FundTrade> getFundTrades() {
+        return fundTrades;
     }
-    public void setFoundTrades(List<FoundTrade> foundTrades) {
-        this.foundTrades = foundTrades;
+    public void setFundTrades(List<FundTrade> fundTrades) {
+        this.fundTrades = fundTrades;
     }
 }
@@ -3,28 +3,27 @@ package com.diligrp.mobsite.getway.domain.protocol.fund;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+
 /**
  * Created by xxxzzz on 2017/1/3.
  */
 public class StoreValueReq extends BaseReq {
-
-
-
-    @ApiModelProperty(value = "交易类型（1：充值 2：冻结4：消费）" ,required = true)
-    private Long tradeType;
-
-
+    @ApiModelProperty(value = "买家绑定店铺唯一标识")
+    @NotNull(message="买家绑定店铺唯一标识不能为空")
+    private Long shopBuyerId;
     @ApiModelProperty(value = "交易金额",required = true)
+    @NotNull(message="交易金额不能为空")
     private Long tradePrice;
-    public Long getTradeType() {
-        return tradeType;
+    public Long getShopBuyerId() {
+        return shopBuyerId;
     }
-    public void setTradeType(Long tradeType) {
-        this.tradeType = tradeType;
+    public void setShopBuyerId(Long shopBuyerId) {
+        this.shopBuyerId = shopBuyerId;
     }
     public Long getTradePrice() {
@@ -10,7 +10,7 @@ import java.util.Date;
  *  <br />
  * @createTime 2016-11-23 17:19:15
  * @author template
- */public class FoundTrade{
+ */public class FundTrade {
     /**
      * 订单编号
@@ -30,7 +30,7 @@ import java.util.Date;
     /**
      * 交易类型（1：充值 2：冻结3：解冻 4：消费）
      */
-    private Long tradeType;
+    private Integer tradeType;
     /**
      * 交易时间
@@ -61,11 +61,11 @@ import java.util.Date;
         this.tradePrice = tradePrice;
     }
-    public Long getTradeType() {
+    public Integer getTradeType() {
         return tradeType;
     }
-    public void setTradeType(Long tradeType) {
+    public void setTradeType(Integer tradeType) {
         this.tradeType = tradeType;
     }
@@ -79,7 +79,7 @@ import java.util.Date;
     @Override
     public String toString() {
-        return "FoundTrade{" +
+        return "FundTrade{" +
                 ", orderId=" + orderId +
                 ", tradeName='" + tradeName + '\'' +
                 ", tradePrice=" + tradePrice +
+package com.diligrp.mobsite.getway.rpc;
+
+import com.b2c.myapp.common.api.fundTrade.input.FundTradeListInput;
+import com.b2c.myapp.common.api.fundTrade.input.FundTradeSaveInput;
+import com.b2c.myapp.common.api.fundTrade.output.FundTradeOutput;
+import com.b2c.myapp.common.utils.base.Page;
+
+/**
+ * Created by jiangchengyong on 2017/1/19.
+ */
+public interface FundTradeRPC {
+    /**
+     * @comment 多条件查询储值卡资金交易明细
+     * @param FundTradeListInput
+     * @return BaseOutput<Page<FundTradeOutput>>
+     * @author kelan
+     * @time 2016/12/8 10:36
+     */
+    public Page<FundTradeOutput> queryFundTrade(FundTradeListInput FundTradeListInput);
+
+    /**
+     * 储值卡交易
+     * @param fundTradeSaveInput
+     * @return
+     */
+    Boolean fundTrade(FundTradeSaveInput fundTradeSaveInput);
+}
@@ -36,4 +36,12 @@ public interface ShopBuyerRPC {
      * @return
      */
     ShopBuyerKeyOutput getShopBuyerKeys(Long shopBuyerId);
+
+    /**
+     * 修改店铺名称
+     * @param shopBuyerId
+     * @param remarkName
+     * @return
+     */
+    Boolean modifyShopRemarkName(Long shopBuyerId,String remarkName);
 }
+package com.diligrp.mobsite.getway.rpc.impl;
+
+import com.b2c.myapp.common.api.fundTrade.input.FundTradeListInput;
+import com.b2c.myapp.common.api.fundTrade.input.FundTradeSaveInput;
+import com.b2c.myapp.common.api.fundTrade.output.FundTradeOutput;
+import com.b2c.myapp.common.utils.base.Page;
+import com.diligrp.mobsite.getway.rpc.FundTradeRPC;
+
+/**
+ * Created by jiangchengyong on 2017/1/19.
+ */
+public class FundTradeRPCImpl implements FundTradeRPC {
+    /**
+     * @param FundTradeListInput
+     * @return BaseOutput<Page<FundTradeOutput>>
+     * @comment 多条件查询储值卡资金交易明细
+     * @author kelan
+     * @time 2016/12/8 10:36
+     */
+    @Override
+    public Page<FundTradeOutput> queryFundTrade(FundTradeListInput FundTradeListInput) {
+        return null;
+    }
+
+    /**
+     * 储值卡交易
+     *
+     * @param fundTradeSaveInput
+     * @return
+     */
+    @Override
+    public Boolean fundTrade(FundTradeSaveInput fundTradeSaveInput) {
+        return null;
+    }
+}
@@ -92,4 +92,28 @@ public class ShopBuyerRPCImpl implements ShopBuyerRPC {
         return null;
     }
+
+    /**
+     * 修改店铺名称
+     *
+     * @param shopBuyerId
+     * @param remarkName
+     * @return
+     */
+    @Override
+    public Boolean modifyShopRemarkName(Long shopBuyerId, String remarkName) {
+        BaseOutput<Boolean> output = null;
+        boolean flag = false;
+        try {
+            output = myAppClient.getShopBuyerService().modifyShopRemarkName(shopBuyerId,remarkName);
+            if(output.getCode().equals(200)){
+                return output.getData();
+            }
+        } catch (Exception e) {
+            log.error("修改店铺名称接口出错：msg={}",e);
+            throw new ServiceException();
+        }
+
+        return null;
+    }
 }
 package com.diligrp.mobsite.getway.service.common.utils;
+import java.sql.Time;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -25,7 +26,8 @@ public class DateUtils {
     public static final String DATE_TIME_FORMAT12 = "yyyy-MM-dd hh:mm:ss";
     public static final String DATE_TIME_FORMAT24 = "yyyy-MM-dd HH:mm:ss";
     public static final String DATE_TIME_FORMAT24_NO_SECOND = "yyyy-MM-dd HH:mm";
-    
+    public static final String DATE_TIME_FORMAT_TIME= "HH:mm";
+
     public static final String DATE_TIME_FORMAT_MILLI = "yyyy-MM-dd HH:mm:ss S";
     public static final String DATE_FORMAT_ALL = "yyyyMMddHHmmssS";
@@ -42,6 +44,7 @@ public class DateUtils {
     public static String formateDateLenient(Date date,String formatStr,boolean lenient){
         SimpleDateFormat format = new SimpleDateFormat(formatStr);
         format.setLenient(lenient);
+
         return format.format(date);
     }
@@ -175,8 +178,8 @@ public class DateUtils {
     /**
      * 日期相减得到相差小时数
-     * @param date
-     * @param paramInt
+     * @param reductionDate
+     * @param minuendDate
      * @return
      * @createTime 2015年4月8日 下午3:00:03
      * @author zhangshirui
@@ -188,8 +191,8 @@ public class DateUtils {
     /**
      * 日期相减得到相差秒数
-     * @param date
-     * @param paramInt
+     * @param reductionDate
+     * @param minuendDate
      * @return
      * @createTime 2015年4月8日 下午3:00:03
      * @author zhangshirui
@@ -204,10 +207,28 @@ public class DateUtils {
         calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), 24, 0);
         return calendar.getTime();
     }
+
+    public static Time parseTime(String dateStr,String formatStr) throws Exception {
+        SimpleDateFormat format = new SimpleDateFormat(formatStr);
+        format.setLenient(true);
+        try {
+            return new Time(format.parse(dateStr).getTime());
+        } catch (ParseException e) {
+            throw new Exception("解析日期出错");
+        }
+    }
     public static void main(String[] args) {
-        long ss = DateUtils.subDateToSeconds(DateUtils.getLastTimeCurrentDay(new Date()), new Date());
-        
-        System.out.println(ss);
+//        long ss = DateUtils.subDateToSeconds(DateUtils.getLastTimeCurrentDay(new Date()), new Date());
+        Time time = null;
+        try {
+            time = DateUtils.parseTime("17:30",DATE_TIME_FORMAT_TIME);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Date date = new Date(time.getTime());
+
+        System.out.println(DateUtils.formateDate(date,DATE_TIME_FORMAT_TIME));
     }
 }
@@ -11,7 +11,7 @@ public interface FundService {
     public GetFundsResp getFunds(GetFundsReq fundsReq) ;
-    StoreValueResp storeValue(Long price);
+    StoreValueResp storeValue(StoreValueReq temp);
     GetfundTradeRecordResp getfundTradeRecord(GetfundTradeRecordReq req);
     ModifyShopRemarkNameResp modifyShopRemarkName(ModifyShopRemarkNameReq req);
 package com.diligrp.mobsite.getway.service.seller.impl;
+import com.b2c.myapp.common.api.fundTrade.input.FundTradeListInput;
+import com.b2c.myapp.common.api.fundTrade.input.FundTradeSaveInput;
+import com.b2c.myapp.common.api.fundTrade.output.FundTradeOutput;
 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.output.ShopBuyerDetailOutput;
+import com.b2c.myapp.common.enums.TradeType;
 import com.b2c.myapp.common.utils.base.Page;
+import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.protocol.fund.*;
+import com.diligrp.mobsite.getway.domain.protocol.fund.model.FundTrade;
+import com.diligrp.mobsite.getway.rpc.FundTradeRPC;
 import com.diligrp.mobsite.getway.rpc.ShopBuyerRPC;
 import com.diligrp.mobsite.getway.rpc.ShopRPC;
 import com.diligrp.mobsite.getway.service.seller.FundService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Created by weili on 2017/1/3.
  */
@@ -20,6 +32,8 @@ public class FundServiceImpl implements FundService{
     private ShopBuyerRPC shopBuyerRPC;
     @Autowired
     private ShopRPC shopRPC;
+    @Autowired
+    private FundTradeRPC fundTradeRPC;
     @Override
     public GetFundsResp getFunds(GetFundsReq fundsReq) {
         ShopBuyerDetail shopBuyerDetail = new ShopBuyerDetail();
@@ -39,18 +53,49 @@ public class FundServiceImpl implements FundService{
     }
     @Override
-    public StoreValueResp storeValue(Long price) {
-
-        return null;
+    public StoreValueResp storeValue(StoreValueReq temp) {
+        FundTradeSaveInput fundTradeSaveInput = new FundTradeSaveInput();
+        fundTradeSaveInput.setTradeType(TradeType.StoreValue);
+        fundTradeSaveInput.setShopBuyerId(temp.getShopBuyerId());
+        fundTradeSaveInput.setTradePrice(temp.getTradePrice());
+        Boolean result = fundTradeRPC.fundTrade(fundTradeSaveInput);
+        return new StoreValueResp();
     }
     @Override
     public GetfundTradeRecordResp getfundTradeRecord(GetfundTradeRecordReq req) {
-        return null;
+        FundTradeListInput fundTradeListInput = new FundTradeListInput();
+        fundTradeListInput.setShopBuyerId(req.getShopBuyerId());
+        fundTradeListInput.setTradeType(TradeType.getTradeType(req.getTradeType()));
+        Page<FundTradeOutput> page = fundTradeRPC.queryFundTrade(fundTradeListInput);
+        GetfundTradeRecordResp resp = new GetfundTradeRecordResp();
+        if(null != page){
+            resp.setMaxPageNum(page.getPageCount());
+            List<FundTrade> fundTrades = new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(page.getResult())){
+                for (FundTradeOutput temp:
+                        page.getResult()) {
+                    FundTrade fundTrade = new FundTrade();
+                    fundTrade.setTradePrice(temp.getTradePrice());
+                    fundTrade.setCreated(temp.getCreated());
+                    fundTrade.setOrderId(temp.getOrderId());
+                    fundTrade.setTradeName(temp.getTradeName());
+                    fundTrade.setTradeType(temp.getTradeType().getIndex());
+                    fundTrades.add(fundTrade);
+                }
+            }
+            resp.setFundTrades(fundTrades);
+        }
+        return resp;
     }
     @Override
     public ModifyShopRemarkNameResp modifyShopRemarkName(ModifyShopRemarkNameReq req) {
-        return null;
+        Boolean result = shopBuyerRPC.modifyShopRemarkName(req.getShopBuyerId(),req.getRemarkName());
+        ModifyShopRemarkNameResp resp = new ModifyShopRemarkNameResp();
+        if(!result){
+            resp.setCode(ResultCode.BUSINESS_FAILED);
+        }
+        return resp;
     }
 }
@@ -8,7 +8,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+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 javax.annotation.Resource;
@@ -71,7 +74,7 @@ public class FundController extends BaseApiController{
     public void storeValue(@RequestBody StoreValueReq temp) {
         StoreValueReq req = super.getRequest(StoreValueReq.class);
         try {
-            StoreValueResp resp = fundService.storeValue(req.getTradePrice());
+            StoreValueResp resp = fundService.storeValue(temp);
             super.sendSuccessResp(resp);
         } catch (ServiceException e) {
             log.error("获取储值列表出现业务异常", e);
@@ -4,6 +4,7 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeReq;
 import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeResp;
 import com.diligrp.mobsite.getway.domain.protocol.shop.*;
+import com.diligrp.mobsite.getway.service.common.utils.DateUtils;
 import com.diligrp.mobsite.getway.service.seller.SellerShopService;
 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
 import com.diligrp.mobsite.getway.web.utils.BeanValidator;