7bdbb8ff5591a403bfe43bc599355c157fc1f00b..beef89c525654f04fe17936a2aeae59f1411a6a0
2021-07-02 xiaoyong931011
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
beef89 diff | tree
2021-07-02 xiaoyong931011
20210702 积分拨付
0e03fc diff | tree
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
@@ -174,8 +174,13 @@
    }
    public Long insureOrder(InsureOrderDto model) {
        long id = model.getId();
        ScoreOrder scoreOrderBefore = scoreOrderMapper.selectByPrimaryKey(id);
        ScoreOrder scoreOrder = new ScoreOrder();
        scoreOrder.setId(model.getId());
        if(ScoreOrder.STATUS_DOING == scoreOrderBefore.getStatus()){
            scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
        }
//        scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
        scoreOrder.setIsFinish(ScoreOrder.ISFINISH_YES);
        scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),","));