Merge branch 'api' of http://120.27.238.55:7000/r/beauty-erp into api

Helius

2021-03-17 19aea3255126baa2387d4205747cdddff3e8d183

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

@@ -326,7 +326,7 @@

                }
            } else if ("赠送".equals(sysProjUse.getSource())) {
                if (orderItem!=null &&orderItem.getArrears() > 0) {
                if (orderItem!=null && orderItem.getArrears()!=null&&orderItem.getArrears() > 0) {
                    return new VerifyResult(true, shoppingGoods.getName() + "存在欠款" + orderItem.getArrears() + "元 , 不能消费赠送项目，订单编号[ " + sysOrderService.findById(orderItem.getOrderId()).getOrderNo() + " ] ");
                }
            }