czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
SongZhang 2024-08-20 14:47:50 +08:00
parent b388b3a044 049f52499e
commit 830271a838
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopUserServiceImpl.java
View File

@ -196,7 +196,7 @@ public class TbShopUserServiceImpl implements TbShopUserService {
public void modfiyAccount(Map<String, Object> map) { public void modfiyAccount(Map<String, Object> map) {
if(ObjectUtil.isNull(map)||ObjectUtil.isEmpty(map)||!map.containsKey("id")||!map.containsKey("type")||!map.containsKey("amount") if(ObjectUtil.isNull(map)||ObjectUtil.isEmpty(map)||!map.containsKey("id")||!map.containsKey("type")||!map.containsKey("amount")
||ObjectUtil.isEmpty(map.get("id"))||ObjectUtil.isNull(map.get("id"))||ObjectUtil.isNull(map.get("type"))||ObjectUtil.isEmpty(map.get("type")) ||ObjectUtil.isEmpty(map.get("id"))||ObjectUtil.isNull(map.get("id"))||ObjectUtil.isNull(map.get("type"))||ObjectUtil.isEmpty(map.get("type"))
||ObjectUtil.isEmpty(map.get("amount"))||ObjectUtil.isNull(map.get("amount")) ||ObjectUtil.isEmpty(map.get("amount"))||ObjectUtil.isNull(map.get("amount"))||!map.containsKey("operationType")||ObjectUtil.isEmpty(map.get("operationType"))||ObjectUtil.isNull(map.get("operationType"))
){ ){
throw new BadRequestException("参数错误"); throw new BadRequestException("参数错误");
@ -220,17 +220,18 @@ public class TbShopUserServiceImpl implements TbShopUserService {
throw new BadRequestException("账户余额不足，请输入正确的金额"); throw new BadRequestException("账户余额不足，请输入正确的金额");
} }
String operationType=map.get("operationType").toString();
String type=map.get("type").toString(); String type=map.get("type").toString();
TbShopUserFlow flow=new TbShopUserFlow(); TbShopUserFlow flow=new TbShopUserFlow();
if("in".equals(type)){ if("in".equals(operationType)){
flow.setType("+"); flow.setType("+");
flow.setBizName("充值退款"); flow.setBizName("inMoney".equals(type)?"充值退款":"消费退款");
flow.setBizCode("manualIn"); flow.setBizCode("inMoney".equals(type)?"inMoneyIn":"consumeIn");
tbShopUser.setAmount(tbShopUser.getAmount().add(amount)); tbShopUser.setAmount(tbShopUser.getAmount().add(amount));
}else if("out".equals(type)){ }else if("out".equals(operationType)){
flow.setBizCode("manualOut"); flow.setBizName("inMoney".equals(type)?"充值退款扣除":"消费扣除");
flow.setBizName("消费"); flow.setBizCode("inMoney".equals(type)?"inMoneyOut":"consumeOut");
flow.setType("-"); flow.setType("-");
tbShopUser.setAmount(tbShopUser.getAmount().subtract(amount)); tbShopUser.setAmount(tbShopUser.getAmount().subtract(amount));
}else { }else {