From 1a987e34e395c32ec56937b2424c9f44308199a8 Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Wed, 07 Jul 2021 22:31:40 +0800 Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move --- zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java index e8101fd..30e5c28 100644 --- a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java @@ -1488,6 +1488,9 @@ for (MoneyCardUse moneyCardUse : moneyCardUses) { moneyCardUse.setIsVipCar("N"); + ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(moneyCardUse.getGoodsId()); + moneyCardUse.setCardName(shoppingGoods.getName()); + Integer vipId = null; if (moneyCardUse.getVipId() != null) { vipId = vipInfos.get(moneyCardUse.getVipId().toString()); -- Gitblit v1.9.1