|
|
|
@ -6,6 +6,8 @@ import com.aliyun.oss.OSS; |
|
|
|
import com.aliyun.oss.OSSClientBuilder; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.xkcoding.http.util.StringUtil; |
|
|
|
import jodd.util.ObjectUtil; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.jeecg.api.bean.FansPageBean; |
|
|
|
import org.jeecg.api.bean.PageBean; |
|
|
|
@ -34,6 +36,7 @@ import org.springframework.http.ResponseEntity; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.util.LinkedMultiValueMap; |
|
|
|
import org.springframework.util.MultiValueMap; |
|
|
|
import org.springframework.util.ObjectUtils; |
|
|
|
import org.springframework.web.client.RestTemplate; |
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
@ -104,6 +107,7 @@ public class AppletInfoServiceImpl implements AppletInfoService { |
|
|
|
List<BigDecimal> moneyList = commonMoneyLogMapper.selectObjs( |
|
|
|
new LambdaQueryWrapper<CommonMoneyLog>() |
|
|
|
.eq(CommonMoneyLog::getUserId, hanHaiMember.getId()) |
|
|
|
.eq(CommonMoneyLog::getType, 2) |
|
|
|
.select(CommonMoneyLog::getMoney) |
|
|
|
).stream() |
|
|
|
.filter(obj -> obj != null) |
|
|
|
@ -267,27 +271,37 @@ public class AppletInfoServiceImpl implements AppletInfoService { |
|
|
|
commonMoneyLog.setUserId(hanHaiMember.getId()); |
|
|
|
commonMoneyLog.setMoney(money); |
|
|
|
commonMoneyLog.setOldMoney(hanHaiMember.getMoney()); |
|
|
|
commonMoneyLog.setType(1); |
|
|
|
commonMoneyLog.setType(2);//提现类型 |
|
|
|
commonMoneyLog.setState(0); |
|
|
|
commonMoneyLog.setStatus("0"); |
|
|
|
commonMoneyLogService.save(commonMoneyLog); |
|
|
|
|
|
|
|
//修改用户余额 |
|
|
|
BigDecimal money1 = hanHaiMember.getMoney().subtract(money); |
|
|
|
hanHaiMember.setMoney(money1); |
|
|
|
hanHaiMemberService.updateById(hanHaiMember); |
|
|
|
|
|
|
|
return Result.OK("提现成功"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//流水记录带分页搜索 |
|
|
|
@Override |
|
|
|
public Result<?> getLogList(String token,String timeDate,PageBean pageBean){ |
|
|
|
public Result<?> getLogList(String token,String timeDate,PageBean pageBean, String type){ |
|
|
|
|
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|
Page<CommonMoneyLog> page = new Page<CommonMoneyLog>(pageBean.getPageNo(), pageBean.getPageSize()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Page<CommonMoneyLog> pageList = commonMoneyLogService.lambdaQuery() |
|
|
|
.eq(CommonMoneyLog::getUserId,hanHaiMember.getId()) |
|
|
|
// .eq(StringUtil.isNotEmpty(timeDate), CommonMoneyLog::getCreateTime, timeDate) |
|
|
|
.orderByDesc(CommonMoneyLog::getCreateTime) |
|
|
|
.eq(StringUtil.isNotEmpty(type), CommonMoneyLog::getType, type) |
|
|
|
.page(page); |
|
|
|
|
|
|
|
return Result.OK("流水记录查询成功",pageList); |
|
|
|
} |
|
|
|
|
|
|
|
@ -627,4 +641,19 @@ public class AppletInfoServiceImpl implements AppletInfoService { |
|
|
|
commonHelpService.save(commonHelp); |
|
|
|
return Result.OK("增加成功"); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result<?> requestMerchantTransfer(String token, String id) { |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|
CommonMoneyLog log = commonMoneyLogService.getById(id); |
|
|
|
|
|
|
|
if (ObjectUtils.isEmpty(log)){ |
|
|
|
return Result.error("提现不存在"); |
|
|
|
} |
|
|
|
log.setState(1); |
|
|
|
commonMoneyLogService.updateById(log); |
|
|
|
|
|
|
|
return Result.ok(); |
|
|
|
} |
|
|
|
} |
