Merge branch 'developer' into alpha

姜友瑶

2022-05-17 81e00cd2e26e387d8ab2077ccd982072d6eb865b

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxErpOrderAction.java

@@ -75,6 +75,12 @@
        SysVipInfo vipInfo = userCacheManager.getLoginUser();
        
        erpOrderListDto.setVipId(vipInfo.getId());

        SysVipInfo sysVipInfo = vipInfoDao.selectById(vipInfo.getId());
        if (sysVipInfo.getValidFlag() == SysVipInfo.VALID_FLAG_N) {
            return AjaxResult.buildSuccessInstance(new ArrayList<>(), "查询成功");
        }

        List<ErpOrderDetailVo> rows = sysOrderDao.selectErpOrderList(erpOrderListDto);
        rows.forEach(item -> {
            item.setItems(orderItemDao.selectErpOrderItemByOrderId(item.getOrderId()));