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

This commit is contained in:
2024-08-27 15:58:45 +08:00
5 changed files with 71 additions and 60 deletions

View File

@@ -230,11 +230,11 @@ public class TbShopUserServiceImpl implements TbShopUserService {
if("in".equals(operationType)){
flow.setType("+");
flow.setBizName("inMoney".equals(type)?"充值退款":"消费退款");
flow.setBizName("inMoney".equals(type)?"充值":"消费退款");
flow.setBizCode("inMoney".equals(type)?"inMoneyIn":"consumeIn");
tbShopUser.setAmount(tbShopUser.getAmount().add(amount));
}else if("out".equals(operationType)){
flow.setBizName("inMoney".equals(type)?"充值退款扣除":"消费扣除");
flow.setBizName("inMoney".equals(type)?"充值退款":"消费");
flow.setBizCode("inMoney".equals(type)?"inMoneyOut":"consumeOut");
flow.setType("-");
tbShopUser.setAmount(tbShopUser.getAmount().subtract(amount));