fix

wzy

2021-07-12 215f7ea77c797e0339eea9004e7261fc39486553

 zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java

@@ -1536,7 +1536,8 @@
            moneyCardUse.setIsVipCar("N");

            ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(moneyCardUse.getGoodsId());
            moneyCardUse.setCardName(shoppingGoods.getName());
            if (shoppingGoods != null)
            {            moneyCardUse.setCardName(shoppingGoods.getName());}

            Integer vipId = null;
            if (moneyCardUse.getVipId() != null) {
@@ -1699,6 +1700,9 @@
        for (SysBeauticianState state : sysBeauticianStates) {
            Long staffId = state.getStaffId();

            if (staffId == null) {
                continue;
            }
            Integer integer = shopStaff.get(staffId.toString());

            if (integer == null) {