Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

 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()));