Merge branch 'developer'

Helius

2022-05-31 5ec9991915648a20179481ec519510629f5d0cf3

Merge branch 'developer'

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

@@ -359,7 +359,7 @@

    private void buildAchieve(SysOrder pageOrder, SysOrderItem orderItem, AchieveNew achieveNew) {
        BusParameterSettings shopManageJjcpasConsume =null;
        if (Dictionary.ORDER_STATU_TK.equals(pageOrder.getStatu())) {
        if (SysOrder.ORDER_TYPE_REFUND == pageOrder.getOrderType()) {
            achieveNew.setId(null);
            achieveNew.setProjPercentage(0 - achieveNew.getProjPercentage());
            achieveNew.setGoodsCash(0 - achieveNew.getGoodsCash());

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

@@ -927,21 +927,26 @@

        // 充值卡订单欠款检测
        if (Dictionary.FLAG_NO_N.equals(moneyCardUse.getIsVipCar())) {
            SysOrder sysOrder = sysOrderDao.selectById(orderItemDao.selectById(moneyCardUse.getOrderItemId()).getOrderId());
            if (Dictionary.ORDER_STATU_QK.equals(sysOrder.getStatu())) {
                if (SysOrderFlow.IS_GIFT_Y.equals(flow.getIsGift())) {
                    throw new GlobleException("充值卡订单存在欠款，无法使用赠送余额支付");
                }
            SysOrderItem item = orderItemDao.selectById(moneyCardUse.getOrderItemId());
            if (item != null) {
                SysOrder sysOrder = sysOrderDao.selectById(item.getOrderId());
                if (sysOrder != null) {
                    if (Dictionary.ORDER_STATU_QK.equals(sysOrder.getStatu())) {
                        if (SysOrderFlow.IS_GIFT_Y.equals(flow.getIsGift())) {
                            throw new GlobleException("充值卡订单存在欠款，无法使用赠送余额支付");
                        }

                // 若该笔订单中，有多项明细，则充值卡直接无法支付； 若订单中，仅充值卡一项，则已付款和充值卡使用情况判断是否可使用
                List<SysOrderItem> items = orderItemDao.selectByOrderId(sysOrder.getId());
                if (items.size() > 1) {
                    throw new GlobleException("充值卡订单存在欠款，无法支付");
                } else {
                    double totalUse = moneyCardUseFlowDao.selectCardUseAmount(moneyCardUse.getId());
                    Double hasPay = sysOrder.getZkTotal() - sysOrder.getArrears();
                    if (hasPay < (totalUse + flow.getAmount().doubleValue())) {
                        throw new GlobleException("充值卡订单存在欠款，已支付金额不足");
                        // 若该笔订单中，有多项明细，则充值卡直接无法支付； 若订单中，仅充值卡一项，则已付款和充值卡使用情况判断是否可使用
                        List<SysOrderItem> items = orderItemDao.selectByOrderId(sysOrder.getId());
                        if (items.size() > 1) {
                            throw new GlobleException("充值卡订单存在欠款，无法支付");
                        } else {
                            double totalUse = moneyCardUseFlowDao.selectCardUseAmount(moneyCardUse.getId());
                            Double hasPay = sysOrder.getZkTotal() - sysOrder.getArrears();
                            if (hasPay < (totalUse + flow.getAmount().doubleValue())) {
                                throw new GlobleException("充值卡订单存在欠款，已支付金额不足");
                            }
                        }
                    }
                }
            }