From 75aa53c0b403f30a165c681587d8071a64036d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Wed, 19 Jul 2023 17:05:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/UserController.java | 16 ++++++ .../admin/system/service/Userservice.java | 57 ++++++++++++++----- .../admin/system/util/PrinterUtils.java | 2 +- .../admin/system/util/StringUtil.java | 2 + .../common/system/util/ExceptionUtil.java | 5 +- .../dao/TbPlussMerchantBaseInfoMapper.java | 2 + .../mapper/TbPlussCashAccountMapper.xml | 2 +- .../resources/mapper/TbPlussCashMapper.xml | 4 +- .../mapper/TbPlussMerchantBaseInfoMapper.xml | 5 ++ .../resources/mapper/TbPlussUserAppMapper.xml | 19 ++++--- 10 files changed, 86 insertions(+), 28 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 91fe76c..ac424e2 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 @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; /** * 登录相关接口 @@ -141,4 +142,19 @@ public class UserController { public RespBody getUserBalance(@RequestHeader("loginName") String loginName,@RequestHeader("token") String token,@RequestHeader("userId") String userId){ return userservice.getUserBalance(userId); } + + /** + * 提现 + * @param loginName + * @param token + * @param userId + * @param amount + * @return + */ + @RequestMapping("withdrawalProfit") + public RespBody withdrawalProfit(@RequestHeader("loginName") String loginName, @RequestHeader("token") String token, @RequestHeader("userId") String userId, + @RequestParam("amount") BigDecimal amount + ){ + return userservice.withdrawalProfit(userId, amount); + } } 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 1b5620b..0d8406a 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 @@ -7,15 +7,11 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.chaozhanggui.admin.system.util.RedisCst; import com.chaozhanggui.admin.system.util.RedisUtil; +import com.chaozhanggui.admin.system.util.StringUtil; import com.chaozhanggui.admin.system.util.TokenUtil; import com.chaozhanggui.common.system.config.RespBody; -import com.chaozhanggui.dao.system.dao.TbPlussCashAccountMapper; -import com.chaozhanggui.dao.system.dao.TbPlussCashMapper; -import com.chaozhanggui.dao.system.dao.TbPlussUserInfoMapper; -import com.chaozhanggui.dao.system.dao.TbPlussUserPromotionMapper; -import com.chaozhanggui.dao.system.entity.TbPlussCash; -import com.chaozhanggui.dao.system.entity.TbPlussUserInfo; -import com.chaozhanggui.dao.system.entity.TbPlussUserPromotion; +import com.chaozhanggui.dao.system.dao.*; +import com.chaozhanggui.dao.system.entity.*; import com.chaozhanggui.dao.system.model.CashStatus; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -24,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -50,6 +43,10 @@ public class Userservice { @Autowired TbPlussCashAccountMapper tbPlussCashAccountMapper; + + @Autowired + TbPlussMerchantBaseInfoMapper baseInfoMapper; + public RespBody doLogin(String loginName,String password,String userType,String ip) throws Exception { Boolean flag=false; @@ -305,6 +302,21 @@ public class Userservice { public RespBody withdrawalProfit(String userId,BigDecimal amount){ + + TbPlussUserInfo userInfo= userInfoMapper.selectByPrimaryKey(Long.valueOf(userId)); + + if(ObjectUtil.isEmpty(userInfo)){ + log.error("用户不存在"); + return new RespBody("000007"); + } + + TbPlussMerchantBaseInfo baseInfo= baseInfoMapper.selectByUserId(userId); + if(ObjectUtil.isEmpty(baseInfo)){ + log.error("商户信息不存在"); + return new RespBody("000031"); + } + + BigDecimal profit= tbPlussCashMapper.selectByUserId(userId); BigDecimal fronzenAmt=tbPlussCashMapper.selectCashFrozenAmountByUserId(userId); @@ -316,11 +328,30 @@ public class Userservice { return new RespBody("000029"); } + TbPlussCashAccount account= tbPlussCashAccountMapper.selectByUserId(userId); + if(ObjectUtil.isEmpty(account)){ + log.error("提现账户信息不完整"); + return new RespBody("000030"); + } + TbPlussCash cash=new TbPlussCash(); - - return null; + 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.setCashamt(amount); + cash.setCreatedt(new Date()); + cash.setCashnumber(StringUtil.getBillno()); + cash.setType(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); + return new RespBody("000000"); } diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/PrinterUtils.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/PrinterUtils.java index 9f9e7a9..8516a42 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/PrinterUtils.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/PrinterUtils.java @@ -53,7 +53,7 @@ public class PrinterUtils { private static String getPrintData(OilTicketsDTO oilTicketsDTO) { StringBuilder builder = new StringBuilder(); - builder.append("人口买卖
"); + builder.append("贩卖刘一帆
"); builder.append("买卖凭票
"); builder.append("
"); builder.append("人口出售地点:"); diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/StringUtil.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/StringUtil.java index 3694bd0..23230cc 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/StringUtil.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/util/StringUtil.java @@ -25,6 +25,8 @@ public class StringUtil extends StringUtils { return (intIn17 % 2) >= 1 ? "0" : "1"; } + + public static final String letterChar = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; public static String random6() { 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 4337549..63acace 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 @@ -45,15 +45,14 @@ public class ExceptionUtil { map.put("000027","提现已被拒绝"); map.put("000028","已被上级审核"); map.put("000029","可提余额不足"); + map.put("000030","提现账户信息不完整"); + map.put("000031","商户信息存在"); - - map.put("000030","账户状态异常"); - map.put("000031","账户余额不足"); map.put("000032","请求待接受"); map.put("000034","此用户已在黑名单中"); map.put("000035","此用户不在黑名单中"); diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantBaseInfoMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantBaseInfoMapper.java index 62412ee..c4ad74e 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantBaseInfoMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussMerchantBaseInfoMapper.java @@ -19,4 +19,6 @@ public interface TbPlussMerchantBaseInfoMapper { int updateByPrimaryKeySelective(TbPlussMerchantBaseInfo record); int updateByPrimaryKey(TbPlussMerchantBaseInfo record); + + TbPlussMerchantBaseInfo selectByUserId(String userId); } \ No newline at end of file diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussCashAccountMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussCashAccountMapper.xml index ae7bb79..01f1987 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussCashAccountMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussCashAccountMapper.xml @@ -106,6 +106,6 @@ \ 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 3d4105c..0af17e7 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussCashMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussCashMapper.xml @@ -319,10 +319,10 @@ \ No newline at end of file diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml index 67c907f..f2d82cd 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussMerchantBaseInfoMapper.xml @@ -586,4 +586,9 @@ validFlag = #{validflag,jdbcType=TINYINT} where id = #{id,jdbcType=INTEGER} + + \ 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 1c11446..26bb2e0 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml @@ -549,18 +549,21 @@ p.merchantCode, p.merchantName, p.orderNumber, - i.loginName, - u.type_code as typeCode, p.price, + u.loginName, + m.type_code AS typeCode, p.createDt, - u.current_fee as currentFee - FROM tb_pluss_merchant_profit p - LEFT JOIN tb_pluss_user_promotion u ON p.userId = u.user_id - left join tb_pluss_user_info i on p.userId=i.id + m.current_fee AS currentFee, + p.consumeFee + FROM + tb_pluss_merchant_profit p + LEFT JOIN tb_pluss_merchant_base_info b ON p.userId = b.userId + LEFT JOIN tb_pluss_user_promotion m ON p.userId = m.user_id + LEFT JOIN tb_pluss_user_info u ON p.userId = u.id WHERE - p.userId = #{userId} + p.merchantParentId = #{userId} AND p.price != 0 - + and p.orderNumber=#{orderNumber}