parent: 0e03fcb5 | patch | commit | show whitespace
xiaoyong931011
2021-07-02 beef89c525654f04fe17936a2aeae59f1411a6a0 
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
1 files modified
5 ■■■■■ changed files
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java 5 ●●●●● patch | view | raw | blame | history 
 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java


@@ -357,9 +357,14 @@


            throw new RestException(-3, "暂不能确认收货");


        }




        if (ScoreOrder.ISFINISH_YES.equals(order.getIsFinish())) {


            scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DONE, userId);


        } else {


        scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);


    }




    }




    public void cancelOrder(Long id, String userId) {


        ScoreOrder order = scoreOrderMapper.selectByPrimaryKey(id);


        if (order == null) {