1、提现统计

src/main/java/org/springblade/modules/guosen/bussiness/controller/BussinessDebitController.java

@@ -87,15 +87,15 @@ public class BussinessDebitController extends BladeController {
 		if(bussiness != null){
 			bussinessDebit.setBussinessId(bussiness.getId());
 		}
-		Date updateTime = bussinessDebit.getUpdateTime();
-		String updateTimeFormat = null;
-		if(bussinessDebit.getUpdateTime() != null){
-			bussinessDebit.setUpdateTime(null);
+		Date createTime = bussinessDebit.getCreateTime();
+		String createTimeFormat = null;
+		if(createTime != null){
+			bussinessDebit.setCreateTime(null);
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			updateTimeFormat = sdf.format(updateTime);
+			createTimeFormat = sdf.format(createTime);
 		}
 		LambdaQueryWrapper<BussinessDebit> lambda = Condition.getQueryWrapper(bussinessDebit).lambda();
-		lambda.like(updateTime != null, BussinessDebit::getCreateTime, updateTimeFormat);
+		lambda.like(createTime != null, BussinessDebit::getCreateTime, createTimeFormat);
 		IPage<BussinessDebit> pages = bussinessDebitService.page(Condition.getPage(query), lambda.orderByDesc(BussinessDebit::getUpdateTime));
 		return R.data(pages);
 	}

src/main/java/org/springblade/modules/guosen/bussiness/service/impl/BussinessDebitServiceImpl.java

@@ -54,15 +54,15 @@ public class BussinessDebitServiceImpl extends BaseServiceImpl<BussinessDebitMap
 
 	@Override
 	public BigDecimal debitStat(BussinessDebit bussinessDebit) {
-		Date updateTime = bussinessDebit.getUpdateTime();
-		String updateTimeFormat = null;
-		if(updateTime != null){
+		Date createTime = bussinessDebit.getCreateTime();
+		String createTimeFormat = null;
+		if(createTime != null){
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			updateTimeFormat = sdf.format(updateTime);
-			bussinessDebit.setUpdateTime(null);
+			createTimeFormat = sdf.format(createTime);
+			bussinessDebit.setCreateTime(null);
 		}
 		LambdaQueryWrapper<BussinessDebit> lambda = Condition.getQueryWrapper(bussinessDebit).lambda();
-		lambda.like(updateTime != null, BussinessDebit::getCreateTime, updateTimeFormat);
+		lambda.like(createTime != null, BussinessDebit::getCreateTime, createTimeFormat);
 		lambda.eq(BussinessDebit::getStatus, SystemConstant.BussinessDebitStatus.SUCCESS.getValue());
 		lambda.eq(BussinessDebit::getType, SystemConstant.BussinessDebitType.COMMISSION.getValue());
 		List<BussinessDebit> list = baseMapper.selectList(lambda);

src/main/java/org/springblade/modules/guosen/bussinessuserwithdraw/controller/BussinessUserWithdrawController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.guosen.bussinessuserwithdraw.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -36,6 +37,10 @@ import org.springblade.modules.guosen.bussinessuserwithdraw.wrapper.BussinessUse
 import org.springblade.modules.guosen.bussinessuserwithdraw.service.IBussinessUserWithdrawService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  *  控制器
  *
@@ -68,7 +73,16 @@ public class BussinessUserWithdrawController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入bussinessUserWithdraw")
 	public R<IPage<BussinessUserWithdrawVO>> list(BussinessUserWithdraw bussinessUserWithdraw, Query query) {
-		IPage<BussinessUserWithdraw> pages = bussinessUserWithdrawService.page(Condition.getPage(query), Condition.getQueryWrapper(bussinessUserWithdraw));
+		Date createTime = bussinessUserWithdraw.getCreateTime();
+		String createTimeFormat = null;
+		if(createTime != null){
+			bussinessUserWithdraw.setCreateTime(null);
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			createTimeFormat = sdf.format(createTime);
+		}
+		LambdaQueryWrapper<BussinessUserWithdraw> lambda = Condition.getQueryWrapper(bussinessUserWithdraw).lambda();
+		lambda.like(createTime != null, BussinessUserWithdraw::getCreateTime, createTimeFormat);
+		IPage<BussinessUserWithdraw> pages = bussinessUserWithdrawService.page(Condition.getPage(query), lambda.orderByDesc(BussinessUserWithdraw::getCreateTime));
 		return R.data(BussinessUserWithdrawWrapper.build().pageVO(pages));
 	}
 
@@ -125,5 +139,16 @@ public class BussinessUserWithdrawController extends BladeController {
 		return R.status(bussinessUserWithdrawService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 提现统计
+	 */
+	@GetMapping("/withdrawStat")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "提现统计", notes = "传入withdraw")
+	public R<BigDecimal> withdrawStat(BussinessUserWithdraw withdraw) {
+		BigDecimal bigDecimal = this.bussinessUserWithdrawService.withdrawStat(withdraw);
+		return R.data(bigDecimal);
+	}
+
 	
 }

src/main/java/org/springblade/modules/guosen/bussinessuserwithdraw/entity/BussinessUserWithdraw.java

@@ -59,6 +59,19 @@ public class BussinessUserWithdraw extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "提现账号")
 		private String bankAccountNo;
+
+		/**
+		* 提现账户名
+		*/
+		@ApiModelProperty(value = "提现账户名")
+		private String receiverAccountName;
+
+	/**
+	 * 提现银行编码
+	 */
+	@ApiModelProperty(value = "提现银行编码")
+	private String bankCode;
+
 	/**
 	* 到账类型	REAL_TIME:实时	TWO_HOUR:2小时到账	NEXT_DAY:次日到账（无特殊情况资金于次日上午7点左右到提现银行账户中）
 	*/

src/main/java/org/springblade/modules/guosen/bussinessuserwithdraw/mapper/BussinessUserWithdrawMapper.xml

@@ -16,6 +16,8 @@
         <result column="merchant_no" property="merchantNo"/>
         <result column="bank_card_id" property="bankCardId"/>
         <result column="bank_account_no" property="bankAccountNo"/>
+        <result column="receiver_account_name" property="receiverAccountName"/>
+        <result column="bank_code" property="bankCode"/>
         <result column="receive_type" property="receiveType"/>
         <result column="order_amount" property="orderAmount"/>
         <result column="remark" property="remark"/>

src/main/java/org/springblade/modules/guosen/bussinessuserwithdraw/service/IBussinessUserWithdrawService.java

@@ -16,11 +16,14 @@
  */
 package org.springblade.modules.guosen.bussinessuserwithdraw.service;
 
+import org.springblade.modules.guosen.bussiness.entity.BussinessDebit;
 import org.springblade.modules.guosen.bussinessuserwithdraw.entity.BussinessUserWithdraw;
 import org.springblade.modules.guosen.bussinessuserwithdraw.vo.BussinessUserWithdrawVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.math.BigDecimal;
+
 /**
  *  服务类
  *
@@ -48,4 +51,6 @@ public interface IBussinessUserWithdrawService extends BaseService<BussinessUser
 
 	BussinessUserWithdraw getByBussinessOrderId(Long bussinessId, String bussinessOrderId);
 
+	BigDecimal withdrawStat(BussinessUserWithdraw withdraw);
+
 }

src/main/java/org/springblade/modules/guosen/bussinessuserwithdraw/service/impl/BussinessUserWithdrawServiceImpl.java

@@ -17,6 +17,8 @@
 package org.springblade.modules.guosen.bussinessuserwithdraw.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springblade.common.constant.SystemConstant;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.modules.guosen.bussinessuserwithdraw.entity.BussinessUserWithdraw;
 import org.springblade.modules.guosen.bussinessuserwithdraw.vo.BussinessUserWithdrawVO;
 import org.springblade.modules.guosen.bussinessuserwithdraw.mapper.BussinessUserWithdrawMapper;
@@ -25,6 +27,11 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
 /**
  *  服务实现类
  *
@@ -75,4 +82,21 @@ public class BussinessUserWithdrawServiceImpl extends BaseServiceImpl<BussinessU
 		return baseMapper.selectOne(lambda);
 	}
 
+	@Override
+	public BigDecimal withdrawStat(BussinessUserWithdraw withdraw) {
+		Date createTime = withdraw.getCreateTime();
+		String createTimeFormat = null;
+		if(createTime != null){
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			createTimeFormat = sdf.format(createTime);
+			withdraw.setCreateTime(null);
+		}
+		LambdaQueryWrapper<BussinessUserWithdraw> lambda = Condition.getQueryWrapper(withdraw).lambda();
+		lambda.like(createTime != null, BussinessUserWithdraw::getCreateTime, createTimeFormat);
+		lambda.eq(BussinessUserWithdraw::getWithdrawStatus, SystemConstant.WithdrawOrderStatus.SUCCESS.getValue());
+		List<BussinessUserWithdraw> list = baseMapper.selectList(lambda);
+		BigDecimal stat = list.stream().map(item -> item.getOrderAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
+		return stat;
+	}
+
 }

src/main/java/org/springblade/yeePay/controller/BussinessPayController.java

@@ -457,6 +457,8 @@ public class BussinessPayController {
 		withdraw.setUserRegisterRequestId(userRegisterRequestId);
 		withdraw.setRequestNo(UUID.randomUUID().toString().replaceAll("-", "").toUpperCase());
 		withdraw.setRequestIp(requestIp);
+		withdraw.setReceiverAccountName(userInfo.getUserName());
+		withdraw.setBankCode(userInfo.getBankCode());
 		boolean save = this.withdrawService.save(withdraw);
 		return R.status(save);
 	}

src/main/java/org/springblade/yeePay/listener/TransferOrderNotifyListener.java

@@ -194,6 +194,8 @@ public class TransferOrderNotifyListener {
         withdraw.setReceiveType("REAL_TIME");
         withdraw.setBankAccountNo(account.getReceiverAccountNo());
         withdraw.setBussinessId(userInfo.getBussinessId());
+        withdraw.setReceiverAccountName(userInfo.getUserName());
+        withdraw.setBankCode(userInfo.getBankCode());
         this.bussinessUserWithdrawService.save(withdraw);
         R<BigDecimal> remainR = this.bussinessService.queryBalance(userInfo.getMerchantNo());
         if(remainR.isSuccess()){