From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesWithdrawalAction.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesWithdrawalAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesWithdrawalAction.java
index 817d16c..b60d8e3 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesWithdrawalAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesWithdrawalAction.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.matrix.biz.bean.BizUser;
-import com.matrix.biz.dao.BizUserDao;
+import com.matrix.system.hive.bean.SysVipInfo;
+import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
import com.matrix.core.constance.MatrixConstance;
@@ -42,7 +42,7 @@
private RedisUserLoginUtils redisUserLoginUtils;
@Autowired
- private BizUserDao bizUserDao;
+ private SysVipInfoDao sysVipInfoDao;
@Autowired
private ShopRevenueFlowDao revenueFlowDao;
@@ -62,9 +62,9 @@
@ApiResponse(code = 200, message = "ok", response = ShopRevenueFlow.class)
})
AjaxResult getInvitationuserList(@RequestBody @Validated RevenueFlowDto revenueFlowDto) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
Page<ShopRevenueFlow> page=new Page<>(revenueFlowDto.getPageNum(),revenueFlowDto.getPageSize());
- revenueFlowDto.setUserId(loginUser.getOpenId());
+ revenueFlowDto.setUserId(loginUser.getId());
IPage<ShopRevenueFlow> shopSalesmanApplyIPage = revenueFlowDao.selectRevenuFlowList(page, revenueFlowDto);
AjaxResult result=AjaxResult.buildSuccessInstance(shopSalesmanApplyIPage.getRecords());
return result;
@@ -78,8 +78,8 @@
})
@Transactional
AjaxResult withdrawalCash(@RequestBody @Validated WithdrawalCashDto withdrawalCashDto) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- loginUser=bizUserDao.selectById(loginUser.getUserId());
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ loginUser=sysVipInfoDao.selectById(loginUser.getId());
if(withdrawalCashDto.getAmount()<1){
return AjaxResult.buildFailInstance("最小提现金额为1元");
}else if(withdrawalCashDto.getAmount()>20000){
@@ -103,12 +103,12 @@
invitationRevenueFlow.setCreateTime(new Date());
invitationRevenueFlow.setUpdateTime(new Date());
invitationRevenueFlow.setAmount(-withdrawalCashDto.getAmount());
- invitationRevenueFlow.setUserId(loginUser.getOpenId());
+ invitationRevenueFlow.setUserId(loginUser.getId());
invitationRevenueFlow.setRevenueContent("提现");
shopRevenueFlowDao.insert(invitationRevenueFlow);
//扣除用户剩余提现金额
loginUser.setWithdrawalCash(loginUser.getWithdrawalCash()-withdrawalCashDto.getAmount());
- bizUserDao.updateByModel(loginUser);
+ sysVipInfoDao.update(loginUser);
redisUserLoginUtils.updateUserInfo(loginUser);
--
Gitblit v1.9.1