Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-21 75f1c8f7380994e032de7d32ca7890dff543aaa2

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

@@ -1550,7 +1550,7 @@
        sourceOrder.setIsHasRefund(SysOrder.IS_HAS_REFUND_Y);
//        sourceOrder.setStatu(Dictionary.ORDER_STATU_TK);
        sysOrderDao.update(sourceOrder);
        SysOrder oldOrder=sysOrderDao.selectById(   sysOrder.getOldOrderId());
        SysOrder oldOrder=sysOrderDao.selectById(sysOrder.getOldOrderId());

        sysOrder.setId(null);
        sysOrder.setStaffId(user.getSuId());