Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-17 be3c5ac348599e722864bb16670ccef5e134e8ba

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -216,6 +216,8 @@
        queryWrapper.like(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
        queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
        queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Goodsorder::getStatus,Constants.ONE);
        queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
        queryWrapper.orderByDesc(Goodsorder::getPayDate);
        return  queryWrapper;
    }