第三方支付

src/main/java/com/poteviohealth/ym/ipos/controller/SettlementController.java

@@ -3,16 +3,22 @@ package com.poteviohealth.ym.ipos.controller;
 import com.poteviohealth.cgp.common.controller.BaseWebController;
 import com.poteviohealth.cgp.common.facade.log.OperateType;
 import com.poteviohealth.cgp.common.facade.log.OperationLog;
+import com.poteviohealth.cgp.common.filter.TokenContext;
 import com.poteviohealth.cgp.common.integrated.StringParams;
+import com.poteviohealth.cgp.common.model.CommonPage;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
+import com.poteviohealth.ym.ipos.model.split.SplitWithdraw;
 import com.poteviohealth.ym.ipos.model.split.back.AccountBalanceBack;
 import com.poteviohealth.ym.ipos.model.split.back.SettlementQueryBack;
 import com.poteviohealth.ym.ipos.model.split.back.WithdrawBack;
 import com.poteviohealth.ym.ipos.model.split.detail.SettlementQueryDetail;
+import com.poteviohealth.ym.ipos.model.split.dto.SplitWithdrawDto;
 import com.poteviohealth.ym.ipos.model.split.dto.WithdrawDto;
 import com.poteviohealth.ym.ipos.service.ISplitService;
+import com.poteviohealth.ym.ipos.service.ISplitWithdrawService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +37,8 @@ public class SettlementController extends BaseWebController {
 
     @Resource
     private ISplitService splitService;
+    @Resource
+    private ISplitWithdrawService splitWithdrawService;
 
 
     @PostMapping("/merchantQuery")
@@ -44,6 +52,11 @@ public class SettlementController extends BaseWebController {
     @ApiOperation(value = "单账户查询")
     @OperationLog(type = OperateType.SELECT, description ="单账户查询")
     public VaultsResponse<AccountBalanceBack> accountBalanceQuery(@RequestBody StringParams params) {
+
+        if(StringUtils.isEmpty(params.getId())){
+            params.setId(TokenContext.cureWebUser().getIposMerchantId());
+        }
+
         return splitService.accountBalanceQuery(params.getId());
     }
 
@@ -51,6 +64,9 @@ public class SettlementController extends BaseWebController {
     @ApiOperation(value = "取现")
     @OperationLog(type = OperateType.SELECT, description ="取现")
     public VaultsResponse<WithdrawBack> withdraw(@RequestBody WithdrawDto dto) {
+        if(StringUtils.isEmpty(dto.getMerchantId())){
+            dto.setMerchantId(TokenContext.cureWebUser().getIposMerchantId());
+        }
         return splitService.withdraw(dto);
     }
 
@@ -61,4 +77,10 @@ public class SettlementController extends BaseWebController {
     public VaultsResponse<WithdrawBack> withdrawQuery(@RequestBody StringParams params) {
         return splitService.withdrawQuery(params.getId());
     }
+
+    @PostMapping("/list")
+    @ApiOperation(value = "取现记录",notes = "list")
+    public VaultsResponse<CommonPage<SplitWithdraw>> list(@RequestBody SplitWithdrawDto dto){
+        return VaultsResponse.success(splitWithdrawService.pageList(dto));
+    }
 }

src/main/java/com/poteviohealth/ym/ipos/model/split/dto/SplitWithdrawDto.java

@@ -0,0 +1,27 @@
+package com.poteviohealth.ym.ipos.model.split.dto;
+
+import com.poteviohealth.cgp.common.model.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 取现查询
+ * @author Qin
+ */
+@Data
+public class SplitWithdrawDto extends PageQuery {
+
+    @ApiModelProperty(value = "取现状态,交易状态:s-成功 p-处理中 f-失败")
+    private String transStatus;
+
+    @ApiModelProperty(value = "账务状态,交易状态:s-成功 p-处理中 f-失败 b-回账成功")
+    private String acctStatus;
+
+    @ApiModelProperty(value = "取现日期")
+    private Date transDateStart;
+
+    @ApiModelProperty(value = "取现日期")
+    private Date transDateEnd;
+}

src/main/java/com/poteviohealth/ym/ipos/service/ISplitService.java

@@ -1,10 +1,12 @@
 package com.poteviohealth.ym.ipos.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
 import com.poteviohealth.ym.ipos.model.back.BaseBack;
 import com.poteviohealth.ym.ipos.model.payment.PayRefundQuery;
 import com.poteviohealth.ym.ipos.model.split.SplitRecords;
 import com.poteviohealth.ym.ipos.model.split.SplitRecordsDetail;
+import com.poteviohealth.ym.ipos.model.split.SplitWithdraw;
 import com.poteviohealth.ym.ipos.model.split.back.AccountBalanceBack;
 import com.poteviohealth.ym.ipos.model.split.back.SettlementQueryBack;
 import com.poteviohealth.ym.ipos.model.split.back.WithdrawBack;
@@ -17,7 +19,7 @@ import java.util.List;
  * 分账接口
  * @author Qin
  */
-public interface ISplitService {
+public interface ISplitService  extends IService<SplitWithdraw> {
 
     /**
      * 延时交易确认

src/main/java/com/poteviohealth/ym/ipos/service/ISplitWithdrawService.java

@@ -1,12 +1,22 @@
 package com.poteviohealth.ym.ipos.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.poteviohealth.cgp.common.model.CommonPage;
 import com.poteviohealth.ym.ipos.model.split.SplitWithdraw;
+import com.poteviohealth.ym.ipos.model.split.dto.SplitWithdrawDto;
 
 /**
  * 分账提现记录
  * @author Qin
  */
-public interface ISplitWithdrawService extends IService<SplitWithdraw> {
+public interface ISplitWithdrawService extends IService<SplitWithdraw>{
+
+
+    /**
+     * 取现列表
+     * @param dto
+     * @return
+     */
+    CommonPage<SplitWithdraw> pageList(SplitWithdrawDto dto);
 
 }

src/main/java/com/poteviohealth/ym/ipos/service/impl/SplitServiceImpl.java

@@ -4,25 +4,31 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.poteviohealth.cgp.common.filter.TokenContext;
+import com.poteviohealth.cgp.common.model.CommonPage;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
 import com.poteviohealth.cgp.common.utils.CgpTool;
+import com.poteviohealth.cgp.common.utils.MyBatisConvertUtils;
 import com.poteviohealth.ym.ipos.model.back.BaseBack;
 import com.poteviohealth.ym.ipos.model.payment.PayRefundQuery;
 import com.poteviohealth.ym.ipos.model.split.*;
 import com.poteviohealth.ym.ipos.model.split.back.*;
 import com.poteviohealth.ym.ipos.model.split.detail.*;
+import com.poteviohealth.ym.ipos.model.split.dto.SplitWithdrawDto;
 import com.poteviohealth.ym.ipos.model.split.dto.WithdrawDto;
 import com.poteviohealth.ym.ipos.service.ISplitRecordsDetailService;
 import com.poteviohealth.ym.ipos.service.ISplitRecordsService;
 import com.poteviohealth.ym.ipos.service.ISplitService;
 import com.poteviohealth.ym.ipos.service.ISplitWithdrawService;
 import com.poteviohealth.ym.ipos.utils.YmUtil;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;

src/main/java/com/poteviohealth/ym/ipos/service/impl/SplitWithdrawServiceImpl.java

@@ -1,8 +1,13 @@
 package com.poteviohealth.ym.ipos.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.poteviohealth.cgp.common.model.CommonPage;
+import com.poteviohealth.cgp.common.utils.MyBatisConvertUtils;
 import com.poteviohealth.ym.ipos.mapper.SplitWithdrawMapper;
 import com.poteviohealth.ym.ipos.model.split.SplitWithdraw;
+import com.poteviohealth.ym.ipos.model.split.dto.SplitWithdrawDto;
 import com.poteviohealth.ym.ipos.service.ISplitWithdrawService;
 import org.springframework.stereotype.Service;
 
@@ -13,4 +18,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class SplitWithdrawServiceImpl extends ServiceImpl<SplitWithdrawMapper, SplitWithdraw> implements ISplitWithdrawService {
 
+
+    @Override
+    public CommonPage<SplitWithdraw> pageList(SplitWithdrawDto dto) {
+        Page<SplitWithdraw> page = MyBatisConvertUtils.convert2Page(dto);
+        QueryWrapper<SplitWithdraw> wrapper = new QueryWrapper<>();
+        wrapper.eq(dto.getTransStatus() != null,"trans_status", dto.getTransStatus());
+        wrapper.eq(dto.getAcctStatus() != null,"acct_status", dto.getAcctStatus());
+        wrapper.ge(dto.getTransDateStart() != null, "trans_date",dto.getTransDateStart());
+        wrapper.le(dto.getTransDateEnd() != null, "trans_date",dto.getTransDateEnd());
+        Page<SplitWithdraw> result = this.page(page,wrapper);
+        CommonPage<SplitWithdraw> ret = MyBatisConvertUtils.convert2CommonPage(result);
+        ret.setRecords(result.getRecords());
+        return ret;
+    }
 }