parent: a0cd34ac | patch | commit | ignore whitespace
wzy
2021-07-07 1a987e34e395c32ec56937b2424c9f44308199a8 
Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
1 files modified
4 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java 4 ●●●●● patch | view | raw | blame | history 
 zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java


@@ -242,6 +242,7 @@


                    }


                }




                // sys_users 中 id 为 200 的无法找到


                Long staffId = sysVipInfo.getStaffId();


                if (staffId != null) {


                    Object o = sysUsersMap.get(staffId.toString());


@@ -1487,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());