Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletCathDetailVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/15 9:55
+ */
+@Data
+public class WalletCathDetailVo {
+
+    /**
+     *  订单状态：0-未提现,待审核，1-已审核
+     */
+    @ApiModelProperty(value = "订单状态：0-未提现,待审核，1-已审核")
+    private Integer stauts;
+
+    /**
+     *  提现日期
+     */
+    @ApiModelProperty(value = "提现日期", hidden = true )
+    private Long crtTime;
+
+    /**
+     *  审核日期
+     */
+    @ApiModelProperty(value = "审核日期")
+    private Long finishTime;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletCathVo.java

@@ -14,6 +14,7 @@ import java.math.BigDecimal;
 @Data
 public class WalletCathVo {
 
+     private Long id;
     /**
      *  用户iD
      */

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletDetailPageVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/15 9:22
+ */
+@Data
+public class WalletDetailPageVo {
+
+
+    @ApiModelProperty("主键ID")
+    private Integer id;
+
+    /**
+     *  来源：0-活动，1-佣金，2-会员充值，10-提现，11-转账，12-购买
+     */
+    @ApiModelProperty(value = "来源：0-活动，1-佣金，2-会员充值，10-提现，11-转账，12-购买")
+    private Integer source;
+
+    /**
+     *  收入/支出：0-收入，1-支出
+     */
+    @ApiModelProperty(value = "收入/支出：0-收入，1-支出")
+    private Integer itype;
+
+    /**
+     *  收入/支出的金额(分)
+     */
+    @ApiModelProperty(value = "收入/支出的金额(分)")
+    private BigDecimal amount;
+
+    /**
+     *  操作时间
+     */
+    @ApiModelProperty(value = "操作时间", hidden = true )
+    private Long crtTime;
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletCathBiz.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.github.wxiaoqi.security.admin.entity.MyWalletCath;
 import com.github.wxiaoqi.security.admin.mapper.MyWalletCathMapper;
+import com.github.wxiaoqi.security.admin.vo.WalletCathDetailVo;
 import com.github.wxiaoqi.security.admin.vo.WalletCathPageVo;
 import com.github.wxiaoqi.security.admin.vo.WalletCathVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -15,6 +16,7 @@ import tk.mybatis.mapper.entity.Example;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author libin
@@ -59,4 +61,14 @@ public class MyWalletCathBiz extends BaseBiz<MyWalletCathMapper, MyWalletCath> {
         return walletCathPageVo;
     }
 
+    public WalletCathDetailVo getWalletCathDetailById(Long id) {
+        WalletCathDetailVo walletCathDetailVo = new WalletCathDetailVo();
+        MyWalletCath myWalletCath = new MyWalletCath();
+        myWalletCath.setId(id);
+        MyWalletCath walletCath = mapper.selectByPrimaryKey(myWalletCath);
+        Optional.ofNullable(walletCath).ifPresent(wc->{
+            BeanUtils.copyProperties(wc,walletCathDetailVo);
+        });
+        return walletCathDetailVo;
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletDetailBiz.java

@@ -2,9 +2,17 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
 import com.github.wxiaoqi.security.admin.mapper.MyWalletDetailMapper;
+import com.github.wxiaoqi.security.admin.vo.WalletDetailPageVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -18,4 +26,31 @@ import org.springframework.transaction.annotation.Transactional;
 public class MyWalletDetailBiz extends BaseBiz<MyWalletDetailMapper, MyWalletDetail> {
 
 
+ public PageDataVO<WalletDetailPageVo> findWalletDetailPage(Integer userId,Integer pageNo,Integer pageSize){
+
+     PageDataVO<WalletDetailPageVo> walletDetailPageVo = new PageDataVO<>();
+     Example example = new Example(MyWalletDetail.class);
+     Example.Criteria criteria = example.createCriteria();
+     criteria.andEqualTo("userId",userId);
+
+     PageDataVO<WalletDetailPageVo> walletDetailPageVoPageDataVO = PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.selectByExample(example));
+     List<WalletDetailPageVo> walletDetails = walletDetailPageVoPageDataVO.getData();
+     if (CollectionUtils.isEmpty(walletDetails)){
+         return walletDetailPageVo;
+     }
+     List<WalletDetailPageVo> walletDetailPageVoList = new ArrayList<>();
+     WalletDetailPageVo walletDetail;
+     for (WalletDetailPageVo walletDetailPage : walletDetails) {
+         walletDetail = new WalletDetailPageVo();
+         BeanUtils.copyProperties(walletDetailPage,walletDetail);
+         walletDetailPageVoList.add(walletDetail);
+     }
+     walletDetailPageVo.setTotalPage(walletDetailPageVoPageDataVO.getTotalPage());
+     walletDetailPageVo.setTotalCount(walletDetailPageVoPageDataVO.getTotalCount());
+     walletDetailPageVo.setPageSize(walletDetailPageVoPageDataVO.getPageSize());
+     walletDetailPageVo.setPageNum(walletDetailPageVoPageDataVO.getPageNum());
+     walletDetailPageVo.setData(walletDetailPageVoList);
+     return walletDetailPageVo;
+ }
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MyWalletDetailController.java

+package com.github.wxiaoqi.security.admin.rest;
+
+import com.github.wxiaoqi.security.admin.biz.MyWalletDetailBiz;
+import com.github.wxiaoqi.security.admin.vo.WalletDetailPageVo;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/15 9:45
+ */
+@RestController
+@RequestMapping("/walletDetail")
+public class MyWalletDetailController {
+
+    @Autowired
+    private MyWalletDetailBiz myWalletDetailBiz;
+
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+    @GetMapping("/page")
+    public ObjectRestResponse<PageDataVO<WalletDetailPageVo>> findWalletDetailPage(@RequestParam("pageNo") Integer pageNo,@RequestParam("pageSize") Integer pageSize, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            PageDataVO<WalletDetailPageVo> walletDetailPage = myWalletDetailBiz.findWalletDetailPage(Integer.valueOf(infoFromToken.getId()), pageNo, pageSize);
+            return ObjectRestResponse.succ(walletDetailPage);
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+
+    }
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/WalletCathController.java

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.MyWalletCathBiz;
+import com.github.wxiaoqi.security.admin.vo.WalletCathDetailVo;
 import com.github.wxiaoqi.security.admin.vo.WalletCathPageVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -34,7 +33,8 @@ public class WalletCathController {
     @Autowired
     private UserAuthConfig userAuthConfig;
 
-    @GetMapping
+    @ApiOperation("提现记录列表")
+    @GetMapping("/page")
     public ObjectRestResponse<WalletCathPageVo> findWatchCatchByWithdrawalState(@RequestParam("state") Integer state,
                                                                                 @RequestParam("pageNo") Integer pageNo,
                                                                                 @RequestParam("pageSize") Integer pageSize,
@@ -47,4 +47,11 @@ public class WalletCathController {
             throw new BaseException(e);
         }
     }
+
+    @ApiOperation("提现详情")
+    @GetMapping("/detail/{id}")
+    public ObjectRestResponse<WalletCathDetailVo> getWalletCathDetailById(@PathVariable(value = "id") Long id) {
+        WalletCathDetailVo walletCathDetailVo = myWalletCathBiz.getWalletCathDetailById(id);
+        return ObjectRestResponse.succ(walletCathDetailVo);
+    }
 }