Merge remote-tracking branch 'origin/master'

src/main/java/org/springblade/gateway/shop_gateway/controller/AppShopController.java

@@ -29,6 +29,7 @@ import org.springblade.ldt.shop.vo.ShopVO;
 import org.springblade.ldt.shop.wrapper.ShopWrapper;
 import org.springblade.ldt.user.entity.Member;
 import org.springblade.ldt.user.service.IMemberService;
+import org.springblade.yeePay.common.YeepayApiConstant;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -81,6 +82,7 @@ public class AppShopController {
 	@ApiOperation(value = "用户余额提现（结算）")
 	public R userBalanceWithdraw(@RequestBody WithdrawRec withdrawRec) {
 		withdrawRec.setType(WithdrawType.BALANCE_WITHDRAW);
+		withdrawRec.setReceiveType(YeepayApiConstant.receiveType.REAL_TIME.name());
 		return R.data(appShopService.userBalanceWithdraw(withdrawRec));
 	}
 
@@ -88,6 +90,7 @@ public class AppShopController {
 	@ApiOperation(value = "用户积分提现")
 	public R userPointWithdraw(@RequestBody WithdrawRec withdrawRec) {
 		withdrawRec.setType(WithdrawType.POINT_WITHDRAW);
+		withdrawRec.setReceiveType(YeepayApiConstant.receiveType.REAL_TIME.name());
 		return R.data(appShopService.userPointWithdraw(withdrawRec));
 	}
 
@@ -121,8 +124,16 @@ public class AppShopController {
 				.or()
 				.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name())));
 
+
+		BalanceAccountInfoVO balanceAccountInfoVO = appShopService.queryBalance(shopId);
+		//今日现金收益
+		BigDecimal todayBalance = Convert.toBigDecimal(balanceAccountInfoVO.getTodayNum());
+		//今日积分收益
+		BigDecimal todayPoint = this.getTodayPoint(shopId);
+		//渠道积分今日收益
+		BigDecimal todayChannel = this.getTodayCharge(shopId);
 		//今日营收
-		BigDecimal todayCharge = this.todayRevenue(shopId);
+		BigDecimal todayCharge = BigDecimal.ZERO.add(todayBalance).add(todayPoint).add(todayChannel);
 
 		return R.data(
 			IndexVO.builder()

src/main/java/org/springblade/payment/plugin/YeePayPlugin.java

@@ -293,6 +293,7 @@ public class YeePayPlugin implements Payment {
 			.tenantId(transferRec.getTenantId())
 			.withdrawRecId(transferRec.getWithdrawId())
 			.build();
+		PaymentCache.putSuccessParams(Convert.toStr(successParams.getWithdrawRecId()), successParams);
 
 		eventPublisher.publishEvent(new UserPointTransferWithdrawEvent(successParams));