From 1b874a4ac838146febd7f002e3cbc7547cd2cdf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Fri, 21 Jul 2023 17:24:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/UserController.java | 17 +++++++ .../admin/system/service/AgencyService.java | 15 +++++- .../admin/system/service/Userservice.java | 49 +++++++++++++------ .../admin/src/main/resources/application.yml | 2 +- .../common/system/util/ExceptionUtil.java | 4 +- .../dao/system/dao/TbPlussCashMapper.java | 4 ++ .../dao/TbPlussUserPromotionMapper.java | 2 + .../dao/system/entity/TbPlussCash.java | 13 +++++ .../resources/mapper/TbPlussCashMapper.xml | 22 +++++++-- .../resources/mapper/TbPlussUserAppMapper.xml | 1 + .../mapper/TbPlussUserPromotionMapper.xml | 5 ++ 11 files changed, 112 insertions(+), 22 deletions(-) diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/UserController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/UserController.java index ac424e2..8fcca3c 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/UserController.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/UserController.java @@ -108,6 +108,23 @@ public class UserController { return userservice.getOutFlow(userId, userName, merchantCode, status, pageNum, pageSize); } + /** + * 获取提现流水 + * @param loginName + * @param token + * @param userId + * @param status + * @param pageNum + * @param pageSize + * @return + */ + @GetMapping("getUserOutFlow") + public RespBody getUserOutFlow(@RequestHeader("loginName") String loginName,@RequestHeader("token") String token,@RequestHeader("userId") String userId + ,@RequestParam("status") String status,@RequestParam("pageNum") Integer pageNum + ,@RequestParam("pageSize") Integer pageSize + ){ + return userservice.getUserOutFlow(userId,status,pageNum,pageSize); + } /** * 提现审核 diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java index 54fc18b..505e08a 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java @@ -153,6 +153,19 @@ public class AgencyService { public RespBody queryCustormFlow(String userId,String userType,String agencyCode,String isExtend,Integer pageNum,Integer pageSize){ PageHelper.startPage(pageNum, pageSize); List> list=userPromotionMapper.selectOrderByUserIdOrAgecyCode(userId,userType,agencyCode,isExtend); + if(ObjectUtil.isNotEmpty(list)&&list.size()>0){ + list.stream().forEach(it->{ + String id= it.get("id")+""; + Map map=userPromotionMapper.selectPromotionByUserId(id); + if(ObjectUtil.isNotEmpty(map)&&map.size()>0){ + it.put("sumfansShareMoney",map.get("sumfansShareMoney")); + it.put("yestedayShareMoney",map.get("yestedayShareMoney")); + }else { + it.put("sumfansShareMoney",0); + it.put("yestedayShareMoney",0); + } + }); + } PageInfo pageInfo=new PageInfo(list); return new RespBody("000000",pageInfo); } @@ -292,7 +305,7 @@ public class AgencyService { if(ObjectUtil.isNotEmpty(userPromotion)){ it.setLoginName(userPromotion.getLoginName()); it.setTypeCode(userPromotion.getTypeCode()); - it.setCurrentFee(userPromotion.getCurrentFee().toString()); + it.setCurrentFee(String.format("%.2f",userPromotion.getCurrentFee())); } }); diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java index 6c8cbff..43f1fa9 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java @@ -182,6 +182,14 @@ public class Userservice { } + public RespBody getUserOutFlow(String userId,String status,Integer pageNum,Integer pageSize){ + PageHelper.startPage(pageNum, pageSize); + List list=tbPlussCashMapper.selectCashByUserId(userId,status); + PageInfo pageInfo=new PageInfo(list); + return new RespBody("000000",pageInfo); + } + + public RespBody modifyOutFlow(Integer id,String userId,String status) throws Exception{ if(ObjectUtil.isEmpty(id)||ObjectUtil.isEmpty(userId)||ObjectUtil.isEmpty(status)){ @@ -321,12 +329,17 @@ public class Userservice { return new RespBody("000007"); } - TbPlussMerchantBaseInfo baseInfo= baseInfoMapper.selectByUserId(userId); - if(ObjectUtil.isEmpty(baseInfo)){ - log.error("商户信息不存在"); - return new RespBody("000031"); + if(amount.compareTo(BigDecimal.TEN)<0){ + log.error("小于最小提现金额"); + return new RespBody("000032"); } +// TbPlussMerchantBaseInfo baseInfo= baseInfoMapper.selectByUserId(userId); +// if(ObjectUtil.isEmpty(baseInfo)){ +// log.error("商户信息不存在"); +// return new RespBody("000031"); +// } + BigDecimal profit= tbPlussCashMapper.selectByUserId(userId); @@ -339,29 +352,35 @@ public class Userservice { return new RespBody("000029"); } - TbPlussCashAccount account= tbPlussCashAccountMapper.selectByUserId(userId); - if(ObjectUtil.isEmpty(account)){ - log.error("提现账户信息不完整"); - return new RespBody("000030"); + TbPlussUserPromotion promotion= userPromotionMapper.selectByPrimaryKey(Integer.valueOf(userId)); + if(ObjectUtil.isEmpty(promotion)){ + log.error("用户不存在"); + return new RespBody("000007"); } +// TbPlussCashAccount account= tbPlussCashAccountMapper.selectByUserId(userId); +// if(ObjectUtil.isEmpty(account)){ +// log.error("提现账户信息不完整"); +// return new RespBody("000030"); +// } TbPlussCash cash=new TbPlussCash(); cash.setUserid(Integer.valueOf(userId)); cash.setUsername(userInfo.getTruename()); - cash.setMerchantcode(baseInfo.getMerchantcode()); - cash.setMerchantname(baseInfo.getMerchantname()); - cash.setAccountno(account.getAccountno()); - cash.setAccountname(account.getAccountname()); +// cash.setMerchantcode(baseInfo.getMerchantcode()); +// cash.setMerchantname(baseInfo.getMerchantname()); +// cash.setAccountno(account.getAccountno()); +// cash.setAccountname(account.getAccountname()); cash.setCashamt(amount); cash.setCreatedt(new Date()); cash.setCashnumber(StringUtil.getBillno()); cash.setType(1); + cash.setStatus(1); cash.setBaseservicecharge(BigDecimal.valueOf(3)); cash.setRatiocharge(cash.getCashamt().multiply(BigDecimal.valueOf(0.08))); - cash.setCashstatus(JSONUtil.toJsonStr(getCashMap(userId,new LinkedList<>()))); - tbPlussCashMapper.insert(cash); + cash.setCashstatus(JSONUtil.toJsonStr(getCashMap(promotion.getParentUserId(),new LinkedList<>()))); + tbPlussCashMapper.insertSelective(cash); return new RespBody("000000"); } @@ -369,7 +388,7 @@ public class Userservice { public LinkedList getCashMap(String userId, LinkedList list){ - TbPlussUserPromotion promotion=userPromotionMapper.selectUserProByUserId(userId); + TbPlussUserPromotion promotion=userPromotionMapper.selectByPrimaryKey(Integer.valueOf(userId)); if(ObjectUtil.isNotEmpty(promotion)&&"0".equals(promotion.getParentUserId())){ CashStatus cashStatus=new CashStatus(); cashStatus.setUserId(promotion.getUserId().toString()); diff --git a/newadmin/admin/src/main/resources/application.yml b/newadmin/admin/src/main/resources/application.yml index f0d1a3d..2e4558a 100644 --- a/newadmin/admin/src/main/resources/application.yml +++ b/newadmin/admin/src/main/resources/application.yml @@ -8,7 +8,7 @@ server: # 指定日志级别 把springboot的所有日志修改成为debug logging: level: - root: debug + root: info mybatis: configuration: map-underscore-to-camel-case: true diff --git a/newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/ExceptionUtil.java b/newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/ExceptionUtil.java index 63acace..4773495 100644 --- a/newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/ExceptionUtil.java +++ b/newadmin/common-api/src/main/java/com/chaozhanggui/common/system/util/ExceptionUtil.java @@ -46,14 +46,14 @@ public class ExceptionUtil { map.put("000028","已被上级审核"); map.put("000029","可提余额不足"); map.put("000030","提现账户信息不完整"); - map.put("000031","商户信息存在"); + map.put("000031","商户信息不存在"); + map.put("000032","小于最小提现金额"); - map.put("000032","请求待接受"); map.put("000034","此用户已在黑名单中"); map.put("000035","此用户不在黑名单中"); map.put("000036","多购物车结算禁止使用优惠券"); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussCashMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussCashMapper.java index 0652b09..ba7b35c 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussCashMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussCashMapper.java @@ -1,10 +1,12 @@ package com.chaozhanggui.dao.system.dao; import com.chaozhanggui.dao.system.entity.TbPlussCash; +import org.apache.ibatis.annotations.Param; import org.mapstruct.Mapper; import org.springframework.stereotype.Component; import java.math.BigDecimal; +import java.util.List; @Component @Mapper @@ -26,4 +28,6 @@ public interface TbPlussCashMapper { BigDecimal selectCashFrozenAmountByUserId(String userId); BigDecimal selectCashAmt(String userId); + + List selectCashByUserId(@Param("userId") String userId, @Param("status") String status); } \ No newline at end of file diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java index 182d10a..2a48fc6 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java @@ -51,4 +51,6 @@ public interface TbPlussUserPromotionMapper { TbPlussUserPromotion selectUserPromotionByUserId(@Param("userId") String userId,@Param("orderUserId") String orderUserId); + + Map selectPromotionByUserId(String userId); } \ No newline at end of file diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussCash.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussCash.java index 5de4e54..6f5a68e 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussCash.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/entity/TbPlussCash.java @@ -1,5 +1,7 @@ package com.chaozhanggui.dao.system.entity; +import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -7,6 +9,9 @@ import java.util.Date; public class TbPlussCash implements Serializable { private Integer id; + @TableField(exist = false) + private String loginName; + private Integer userid; private String username; @@ -246,4 +251,12 @@ public class TbPlussCash implements Serializable { public void setCashstatusnow(String cashstatusnow) { this.cashstatusnow = cashstatusnow == null ? null : cashstatusnow.trim(); } + + public String getLoginName() { + return loginName; + } + + public void setLoginName(String loginName) { + this.loginName = loginName; + } } \ No newline at end of file diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussCashMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussCashMapper.xml index 0af17e7..deee434 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussCashMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussCashMapper.xml @@ -315,14 +315,30 @@ + + \ No newline at end of file diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml index 60d934e..985b28f 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml @@ -548,6 +548,7 @@ + + \ No newline at end of file