From f58cca364b731eac2d60a440ffaa804be3cd43fd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 六月 2023 10:32:28 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 4e56ccb..10b742e 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -353,7 +353,7 @@
@RequestMapping(value = "/commission/list")
@ResponseBody
public Object commissionList(String name,String phone,Integer status) {
- EntityWrapper<TDriver> wrapper = tDriverService.getCommissionPageList(name,phone,status);
+ Wrapper<TDriver> wrapper = tDriverService.getCommissionPageList(name,phone,status);
List<TDriver> tDrivers = tDriverService.selectList(wrapper);
List<TDriverCommissionResp> commissionResp = tDriverService.getTDriverCommissionResp(tDrivers);
for (TDriverCommissionResp tDriverCommissionResp : commissionResp) {
@@ -497,7 +497,7 @@
tDriverService.updateById(tDriver);
//增加积分奖励
- if(approvalStatus == 2){
+ if(approvalStatus == 2 && null != tDriver.getInviterId()){
TSystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<TSystemConfig>().eq("type", 4));
Integer num7 = JSON.parseObject(systemConfig.getContent()).getInteger("num7");
TDriver tDriver1 = tDriverService.selectById(tDriver.getInviterId());
@@ -598,8 +598,6 @@
@ResponseBody
public Object rechargeBalance(Integer id, String money) {
TDriver tDriver = tDriverService.selectById(id);
- tDriver.setBackgroundBalance(new BigDecimal(money).add(tDriver.getBackgroundBalance()));
- tDriverService.updateById(tDriver);
// 添加充值记录
TRechargeRecord tRechargeRecord = new TRechargeRecord();
@@ -614,6 +612,20 @@
Integer id1 = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
tRechargeRecord.setAgentId(id1);
tRechargeRecordService.insert(tRechargeRecord);
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setUserId(id);
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setChangeType(10);
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setExplain("平台充值");
+ accountChangeDetail.setOldData(tDriver.getBalance().add(tDriver.getBackgroundBalance()).add(tDriver.getCouponBalance()).add(tDriver.getCommission()).doubleValue());
+ tDriver.setBackgroundBalance(new BigDecimal(money).add(tDriver.getBackgroundBalance()));
+ tDriverService.updateById(tDriver);
+ accountChangeDetail.setNewData(tDriver.getBalance().add(tDriver.getBackgroundBalance()).add(tDriver.getCouponBalance()).add(tDriver.getCommission()).doubleValue());
+ accountChangeDetail.setType(1);
+ accountChangeDetailMapper.insert(accountChangeDetail);
return SUCCESS_TIP;
}
@@ -836,7 +848,7 @@
String fileName = "CommissionInfo"+time1+".xls";
String[] title = new String[] {"姓名","手机号","所属代理商","推广人数","关联人数",
"累计获得佣金","可提现佣金","已提现金额","状态"};
- EntityWrapper<TDriver> wrapper = tDriverService.getCommissionPageList(name,phone,status);
+ Wrapper<TDriver> wrapper = tDriverService.getCommissionPageList(name,phone,status);
// wrapper.ne("isException",2);
// 是否异常
List<TDriver> list = tDriverService.selectList(wrapper);
--
Gitblit v1.7.1