modify

wzy

2021-01-13 2ca19d805dcbe5f0796067c1a91fbb890804e1eb

modify

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java

@@ -167,6 +167,19 @@

    private String type;

    /**
     * 原有订单ID 退款时使用
     */
    private Long oldOrderId;

    public Long getOldOrderId() {
        return oldOrderId;
    }

    public void setOldOrderId(Long oldOrderId) {
        this.oldOrderId = oldOrderId;
    }

    public List<SysOrderFlow> getFlows() {
        return flows;
    }

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

@@ -486,7 +486,12 @@
            ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);
            flow.setFlowContent(goods.getName() + "等" + sourceOrder.getItems().size() + "件产品");

            if (Dictionary.ORDER_STATU_TK.equals(sourceOrder.getStatu())) {
                flow.setOrderId(sourceOrder.getOldOrderId());
            } else {
            flow.setOrderId(sourceOrder.getId());
            }

            flow.setVipId(sourceOrder.getVipId());
            flow.setFlowType(SysOrderFlow.FLOW_TYPE_BUY);
            // 若使用储值卡付款
@@ -1227,7 +1232,56 @@
    @Override
    public void refundOrderMoney(SysOrder pageOrder) {

        // 插入订单流水
        changeOrderStatu(pageOrder);

        for (SysOrderItem item : pageOrder.getItems()) {

            SysProjUse queryProjUse = new SysProjUse();
            queryProjUse.setIsOver(Dictionary.FLAG_NO_N);
            queryProjUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
            queryProjUse.setOrderItemId(item.getId());
            // 修改项目信息
            if (Dictionary.SHOPPING_GOODS_TYPE_XM.equals(item.getType()) && Dictionary.SHOPPING_GOODS_TYPE_JJCP.equals(item.getType())) {
                SysProjUse sysProjUse = sysProjUseDao.selectByModel(queryProjUse).get(0);

                int sub = sysProjUse.getSurplusCount() - item.getCount();
                sysProjUse.setSurplusCount(sub);
                if (sub <= 0) {
                    sysProjUse.setIsOver(Dictionary.FLAG_YES_Y);
                    sysProjUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
                }
                sysProjUseDao.update(sysProjUse);
            }

            if (Dictionary.SHOPPING_GOODS_TYPE_TC.equals(item.getType())) {
                queryProjUse.setTaocanId(-1L);
                SysProjUse sysProjUse = sysProjUseDao.selectByModel(queryProjUse).get(0);
                sysProjUse.setIsOver(Dictionary.FLAG_YES_Y);
                sysProjUse.setStatus(Dictionary.TAOCAN_STATUS_WX);

                sysProjUseDao.update(sysProjUse);
            }

            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.getId());

                MoneyCardUse moneyCardUse = moneyCardUseDao.selectByModel(queryCardUse).get(0);
                moneyCardUse.setIsOver(Dictionary.FLAG_YES_Y);
                moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_WX);
                moneyCardUseDao.update(moneyCardUse);
            }

            // TODO 综合卡退款
            if (Dictionary.SHOPPING_GOODS_TYPE_ZHK.equals(item.getType())) {

            }

        }

        // 设置会员充值卡使用情况
        addMoneyCardUse(pageOrder);


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

@@ -916,12 +916,12 @@
                                    this.$message.warning("请输入" + item.type + "的付款金额");
                                    return false;
                                }
                                flow.amount = item.money;
                                flow.amount = parseFloat(item.money);
                                if (item.type == '储值卡'){
                                    flow.isGift = item.isGift;
                                    flow.cardId = item.id;
                                }
                                total += item.money;
                                total += parseFloat(item.money);
                                flows.push(flow)
                            })
                            if (total != _this.order.payMoney) {