blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2021-03-08 9080f16e29363b99f7d9e659ceb7d236aa36bafa 
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java


@@ -535,7 +535,7 @@


            ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);


            flow.setFlowContent(goods.getName() + "等" + sourceOrder.getItems().size() + "件产品");


            // 若是退款，则取负数


            if (Dictionary.ORDER_STATU_TK.equals(sourceOrder.getStatu())) {


            if (SysOrder.ORDER_TYPE_REFUND==sourceOrder.getOrderType()) {


                flow.setFlowType(SysOrderFlow.FLOW_TYPE_REFUND);


                flow.setAmount(flow.getAmount().negate());


                flow.setOrderId(sourceOrder.getOldOrderId());


@@ -1276,7 +1276,10 @@


        sysOrder.setCompanyId(user.getCompanyId());


        sysOrder.setShopId(user.getShopId());


        sysOrder.setOrderType(SysOrder.ORDER_TYPE_REFUND);


        sysOrder.setOrderTime(new Date());


        sysOrder.setStatu(Dictionary.ORDER_STATU_YFK);


        Date now = new Date();


        sysOrder.setOrderTime(now);


        sysOrder.setPayTime(now);


        sysOrder.setOrderNo(codeService.getRefundOrderNo());


        sysOrder.setZkTotal(-sysOrder.getZkTotal());


        //新增订单