bug修复

935090232@qq.com

2021-07-09 5ebd818a240239e22cb3a587e616991bf208d56b

bug修复

 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java

@@ -116,7 +116,6 @@
            }
        } else {
            queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
            queryUse.setIsOver(Dictionary.FLAG_NO_N);
        }

        queryUse.setQueryKey(serviceVipProjDto.getQueryKey());

 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java

@@ -191,7 +191,6 @@
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        queryUse.setTaocanId(-1L);
        queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
        queryUse.setIsOver(Dictionary.FLAG_NO_N);
        List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
        //切换到套餐查询条件
        queryUse.setTaocanId(null);

 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java

@@ -115,7 +115,6 @@
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        queryUse.setTaocanId(-1L);
        queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
        queryUse.setIsOver(Dictionary.FLAG_NO_N);
        List<SysProjUse> projList = projUseService.findInPage(queryUse, null);

        List<List<Object>> list = new ArrayList<>();

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -981,7 +981,6 @@
                    moneyCardUse.setGiftMoney(moneyCar.getReferencePice());
                    moneyCardUse.setRealMoney(moneyCar.getSealPice());
                    moneyCardUse.setGoodsId(moneyCar.getId());
                    moneyCardUse.setIsOver(Dictionary.FLAG_NO_N);
                    moneyCardUse.setOrderItemId(sysOrderItem.getId());
                    moneyCardUse.setSource(Dictionary.TAOCAN_SOURCE_GM);
                    moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
@@ -1739,7 +1738,6 @@

            if (Dictionary.SHOPPING_GOODS_TYPE_CZK.equals(item.getType())) {
                MoneyCardUse queryCardUse = new MoneyCardUse();
                queryCardUse.setIsOver(Dictionary.FLAG_NO_N);
                queryCardUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
                queryCardUse.setOrderItemId(item.getOldItemId());


 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java

@@ -237,7 +237,6 @@
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        queryUse.setTaocanId(-1L);
        queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
        queryUse.setIsOver(Dictionary.FLAG_NO_N);
        List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
        List<ServiceProjVo> serviceProjVos = SysProjUseMapper.INSTANCE.entityListToProjVoList(projList);


 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/print-order.html

@@ -130,7 +130,7 @@
            <div style="text-align: center;">

                <img style="width: 100%;" :src="shopInfo.qrcode" /><br>
                更多精彩请访问肽妍小程序<br>
                更多精彩请访问小程序<br>
            </div>
            &nbsp;<br>
            &nbsp;<br>

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/print-service.html

@@ -112,7 +112,7 @@
            <div style="text-align: center;">

                <img style="width: 100%;" :src="shopInfo.qrcode" /><br>
                更多精彩请访问肽妍小程序<br>
                更多精彩请访问小程序<br>
            </div>
            &nbsp;<br>
            &nbsp;<br>