blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2021-02-05 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece 
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java


@@ -220,7 +220,7 @@


        sysOrder.setStaffId(source != null ? source.getStaffId() : user.getSuId());


        sysOrder.setCompanyId(source != null ? source.getCompanyId() : user.getCompanyId());




        sysOrder.setPayTime(new Date());




        if (sysOrder.getId() == null) {


            //新增订单


            sysOrder.setOrderNo(codeService.getOrderCode());


@@ -365,6 +365,10 @@


            AchieveNew achieveNew = new AchieveNew();


            achieveNew.setOrderId(id);


            achieveNewService.removeByModel(achieveNew);




            // 删除收款记录


            sysOrderFlowDao.deleteByOrderId(id);




            // 取消订单


            order.setStatu(Dictionary.ORDER_STATU_YQX);




@@ -582,6 +586,7 @@


            orderStatus = Dictionary.ORDER_STATU_TK;


        }


        // 更新收款状态


        sourceOrder.setPayTime(new Date());


        sourceOrder.setStatu(orderStatus);


        sourceOrder.setCardPay(cardPayTotal);


        sourceOrder.setCashPay(cashPayTotal);