Ver código fonte

fix: 消费服务
1.多钱包扣费时,消费明细的消费金额拆分为每个钱包的扣费金额,总数为实际消费金额

luo.yibo@datuai.com 1 ano atrás
pai
commit
d8bb41a0ae

+ 1 - 1
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/BaseBusiness.java

@@ -316,7 +316,7 @@ public class BaseBusiness {
             consumeDetailBo.setConsumeDate(bo.getConsumeDate());
             consumeDetailBo.setConsumeMoney(bo.getConsumeMoney());
             consumeDetailBo.setConsumeBalance(bo.getBalance());
-            // consumeDetailBo.setCardValue(bagVo.getBalance());
+            consumeDetailBo.setCardValue(bo.getBalance());
             // 设置卡片信息
             consumeDetailBo.setCardNo(cardVo.getCardNo());
             consumeDetailBo.setFactoryId(cardVo.getFactoryId());

+ 2 - 1
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/CheckBusiness.java

@@ -601,7 +601,8 @@ public class CheckBusiness {
                         doMoney = doMoney.subtract(balance);
                         sb.append(BagNameEnum.getMessage(Integer.parseInt(bagCode)));
                         doBagVos.add(bagVo);
-                        log.warn("[上传交易]-[扣费钱包]-[钱包代码:{},钱包余额:{},消费金额:{},扣款金额:{},姓名:{}]", bagCode, balance, consumeMoney,doMoney,userAccountVo.getRealName());
+                        log.warn("[上传交易]-[扣费钱包]-[钱包代码:{},钱包余额:{},消费金额:{},扣款金额:{},姓名:{}]", bagCode, balance, balance,
+                                 doMoney, userAccountVo.getRealName());
                     }
                 }
             }