fix

Helius

2021-07-12 3157990ecae78b357d26019aff2de2a572f0ddd3

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

@@ -1441,7 +1441,7 @@
                        serviceItem.setServicesId(newId);
                        Long beautyOldId = serviceItem.getId();
                        serviceItem.setId(null);
                        serviceItem.setExtract("数据迁移");
//                        serviceItem.setExtract("数据迁移");
                        sysBeauticianStateDao.insert(serviceItem);
                        beautyMaps.put(beautyOldId, serviceItem.getId());
                    }
@@ -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) {