Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-07-02 a3e62581af85d8a7ecece3c446c499d12d3905dc

 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java

@@ -117,10 +117,10 @@
        if(ObjectUtil.isEmpty(scoreOrder)){
            return JsonResult.failMessage("订单不存在！");
        }
        Integer status = scoreOrder.getStatus();
        if(ScoreOrder.STATUS_DOING != status){
            return JsonResult.failMessage("当前订单不是已收货状态！");
        }
//        Integer status = scoreOrder.getStatus();
//        if(ScoreOrder.STATUS_DOING != status){
//            return JsonResult.failMessage("当前订单不是已收货状态！");
//        }
        List<String> voucherImgs = model.getVoucherImgs();
        if(CollUtil.isEmpty(voucherImgs)){
            return JsonResult.failMessage("凭证不能为空！");