fix

wzy

2021-07-10 e5d8b92923059affb23b2b40a5d96baa3a9e889d

fix

 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) {

 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml

@@ -855,7 +855,7 @@
    <select id="selectById" resultMap="ShoppingGoodsMap">
        select
        *,
        (select TYPE_NAME from sys_goods_type b where b.id=goods_sort_id) goodsSortName,
        -- (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
        (select NAME from shopping_goods_category t where
        t.id=cate_id)
        cate_name