Merge remote-tracking branch 'origin/test' into test

src/main/java/com/sqx/modules/app/dao/UserMoneyDao.java

@@ -4,6 +4,7 @@ import com.sqx.modules.app.entity.UserMoney;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.math.BigDecimal;
 
@@ -20,4 +21,6 @@ public interface UserMoneyDao extends BaseMapper<UserMoney> {
     @Select("select sum(money) from user_money_details where user_id=#{userId} and classify=6 and content like '%额外奖励现金红包%'")
     BigDecimal sumMoney2(Long userId);
 
+    @Update("update user_money set amount=amount+#{money} where user_id=#{userId}")
+    Boolean incrMoney(@Param("money") String money, @Param("userId") Long userId);
 }

src/main/java/com/sqx/modules/job/task/TempCashOutTask.java

@@ -3,12 +3,17 @@ package com.sqx.modules.job.task;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sqx.modules.app.dao.UserMoneyDao;
+import com.sqx.modules.app.entity.UserMoney;
 import com.sqx.modules.pay.dao.CashOutDao;
 import com.sqx.modules.pay.entity.CashOut;
 import com.sqx.modules.pay.wuyou.BaseResp;
 import com.sqx.modules.pay.wuyou.WuyouPay;
+import com.sqx.modules.sys.dao.SysUserMoneyDao;
+import com.sqx.modules.sys.entity.SysUserMoney;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -24,6 +29,10 @@ public class TempCashOutTask{
     private WuyouPay wuyouPay;
 
     private Logger logger = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private UserMoneyDao userMoneyDao;
+    @Autowired
+    private SysUserMoneyDao sysUserMoneyDao;
 
     @Scheduled(cron = "0 0/8 * * * ? ")
     public void run() {
@@ -46,7 +55,21 @@ public class TempCashOutTask{
                     cashOut.setOutAt(DateUtil.now());
                     cashOutDao.update(cashOut, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId()));
                 }else if (baseResp.getStatus() != null && (baseResp.getStatus().equals(3) || baseResp.getStatus().equals(99999)) ){
+                    logger.info("提现失败, 返还余额, 用户: {}, {}, 金额: {}", cashOut.getUserId(), cashOut.getUserName(), cashOut.getMoney());
+                    if (cashOut.getUserType() != null && cashOut.getUserType().equals(2)) {
+                        SysUserMoney sysUserMoney = sysUserMoneyDao.selectOne(new LambdaQueryWrapper<SysUserMoney>().eq(SysUserMoney::getUserId, cashOut.getUserId()));
+                        if (sysUserMoney != null) {
+                            sysUserMoneyDao.incrMoney(cashOut.getMoney(), cashOut.getUserId());
+                        }
+                    }else {
+                        UserMoney userMoney = userMoneyDao.selectOne(new LambdaQueryWrapper<UserMoney>().eq(UserMoney::getUserId, cashOut.getUserId()));
+                        if (userMoney != null) {
+                            userMoneyDao.incrMoney(cashOut.getMoney(), cashOut.getUserId());
+                        }
+                    }
+
                     cashOut.setState(2);
+                    cashOut.setRefund(baseResp.getMsg());
                     cashOutDao.update(cashOut, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId()));
                 }
             }catch (Exception e) {

src/main/java/com/sqx/modules/sys/dao/SysUserMoneyDao.java

@@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sqx.modules.sys.entity.SysUserMoney;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 @Mapper
 public interface SysUserMoneyDao extends BaseMapper<SysUserMoney> {
 
     void updateSysMoney(@Param("type") Integer type, @Param("userId")Long userId, @Param("money") Double money);
 
+
+    @Update("update sys_user_money set money=money+#{money} where user_id=#{userId}")
+    Boolean incrMoney(@Param("money") String money, @Param("userId") Long userId);
 }
 

src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java

@@ -2,6 +2,8 @@ package com.sqx.modules.taskCenter.controller;
 
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -9,6 +11,10 @@ import com.sqx.common.annotation.Debounce;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.annotation.Login;
+import com.sqx.modules.app.entity.TbUserBlacklist;
+import com.sqx.modules.app.entity.UserInfo;
+import com.sqx.modules.app.mapper.TbUserBlacklistMapper;
+import com.sqx.modules.app.mapper.UserInfoMapper;
 import com.sqx.modules.taskCenter.entity.TaskCenter;
 import com.sqx.modules.taskCenter.entity.TaskCenterRecord;
 import com.sqx.modules.taskCenter.entity.TaskCenterReward;
@@ -32,6 +38,8 @@ import java.util.Objects;
 @Api(value = "任务中心", tags = {"任务中心"})
 @RequestMapping
 public class TaskCenterController {
+
+
     /**
      * 服务对象
      */
@@ -42,6 +50,10 @@ public class TaskCenterController {
     private TaskCenterRecordService recordService;
     @Autowired
     private TaskCenterRewardService taskRewardService;
+    @Autowired
+    private TbUserBlacklistMapper tbUserBlacklistMapper;
+    @Autowired
+    private UserInfoMapper userInfoMapper;
 
     @PostMapping("/taskCenter/insertTaskCenter")
     @ApiOperation("添加任务中心")
@@ -95,6 +107,16 @@ public class TaskCenterController {
     @ApiOperation("App 任务中心 领取")
     @Debounce(interval = 1000, value = "#userId")
     public Result taskReceive(@ApiIgnore @RequestAttribute("userId") Long userId, Long id) {
+        if (id != null && id == 19) {
+            UserInfo userInfo = userInfoMapper.selectOne(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getUserId, userId));
+            log.info("异常领取任务用户: {}", userInfo.getUserId() + userInfo.getCertName());
+            if (!StrUtil.isBlank(userInfo.getCertNo())) {
+                TbUserBlacklist userBlacklist = new TbUserBlacklist();
+                userBlacklist.setRealName(userInfo.getCertName());
+                userBlacklist.setIdCardNo(userInfo.getCertNo());
+                tbUserBlacklistMapper.insert(userBlacklist);
+            }
+        }
         return taskCenterService.taskReceive(userId, id);
     }