| | |
|---|
| | | AjaxResult result = AjaxResult.buildSuccessInstance("查询成功"); |
|---|
| | | |
|---|
| | | SysProjUse queryUse = new SysProjUse(); |
|---|
| | | if(Objects.nonNull(vipId)){ |
|---|
| | | queryUse.setVipId(vipId); |
|---|
| | | }else{ |
|---|
| | | SysVipInfo vipInfo = getCurrentVioInfo(); |
|---|
| | | queryUse.setVipId(vipInfo.getId()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | queryUse.setVipId(vipId); |
|---|
| | | queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM); |
|---|
| | | queryUse.setTaocanId(-1L); |
|---|
| | | queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX); |
|---|
| | |
|---|
| | | for (SysBeauticianState sysBeauticianState : beauticianStateList) { |
|---|
| | | if (sysBeauticianState.getProjUse().getTaocanId() != null) { |
|---|
| | | SysProjUse sysProjUse = projUseService.findById(sysBeauticianState.getProjUse().getTaocanId()); |
|---|
| | | sysBeauticianState.getProjInfo().setName(sysProjUse.getProjName()+"--"+sysBeauticianState.getProjInfo().getName()); |
|---|
| | | if(sysProjUse != null) { |
|---|
| | | sysBeauticianState.getProjInfo().setName(sysProjUse.getProjName() + "--" + sysBeauticianState.getProjInfo().getName()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
