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

Helius

2021-08-25 7d713ee9213f4c4c88fbbea73a4e36c0b7801c92

 gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java

@@ -53,6 +53,17 @@
        String name = model.getAccount();
        model.setAccount(name);
        model.setAccountPhone(accountPhone);
        List<Integer> status = new ArrayList<>();
        if(CollUtil.isEmpty(model.getStatus())){
            status.add(1);
            status.add(2);
            status.add(3);
            status.add(4);
            status.add(5);
            status.add(6);
            model.setStatus(status);
        }

        List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
        if(CollUtil.isNotEmpty(maps)){
            for(QueryJhyOrderListVo queryJhyOrderListVo : maps){