Merge branch 'developer'

Helius

2022-03-03 cf9bfc85093d4b7e5573422b8fd1a55c459b0d34

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

@@ -225,6 +225,13 @@
        if (vipInfo == null) {
            throw new GlobleException("会员不存在");
        }

        if (SysVipInfo.VALID_FLAG_N == vipInfo.getValidFlag()) {
            AjaxResult ajaxResult = AjaxResult.buildSuccessInstance(new ArrayList<>(), "获取成功");
            ajaxResult.putInMap("proj", new ServiceProductListVo());
            return ajaxResult;
        }

        ServiceProductListVo productListVo = new ServiceProductListVo();
        productListVo.setName(vipInfo.getVipName());
        productListVo.setVipId(vipInfo.getId());
@@ -366,6 +373,12 @@
    public AjaxResult findServiceOrderList(@RequestBody @Validated ErpServiceOrderListDto orderListDto) {
        SysVipInfo sysVipInfo = userCacheManager.getLoginUser();
        orderListDto.setVipId(sysVipInfo.getId());

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

        List<ErpServiceOrderListVo> apiServiceOrderListInPage = projServicesDao.findWxServiceOrderList(orderListDto);
        return AjaxResult.buildSuccessInstance(apiServiceOrderListInPage,"查询成功");
    }