From 269985404f94b50d14099b83f3436d6d405c365d Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 15 Jul 2021 23:05:36 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java
index 9aefc8a..dbc9272 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java
@@ -223,7 +223,7 @@
@ResponseBody
public
AjaxResult getUserPro(@PathVariable String phone) {
- SysVipInfo vipInfo = vipInfoDao.selectByPhone(phone);
+ SysVipInfo vipInfo = vipInfoDao.selectByPhone(phone,HostInterceptor.getCompanyId());
if (vipInfo == null) {
throw new GlobleException("会员不存在");
@@ -237,7 +237,6 @@
queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
queryUse.setTaocanId(-1L);
queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- queryUse.setIsOver(Dictionary.FLAG_NO_N);
List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
List<ServiceProjVo> serviceProjVos = SysProjUseMapper.INSTANCE.entityListToProjVoList(projList);
@@ -275,7 +274,7 @@
public @ResponseBody
AjaxResult createServiceOrder(@RequestBody Onlinebooking onlinebooking) {
SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
- SysVipInfo vipInfo = vipInfoDao.selectByPhone(sysVipInfo.getPhone());
+ SysVipInfo vipInfo = vipInfoDao.selectByPhone(sysVipInfo.getPhone(),HostInterceptor.getCompanyId());
SysProjUse sysProjUse = projUseDao.selectById(Long.parseLong(onlinebooking.getProductId() + ""));
Date yyTime = DateUtil.stringToDate(onlinebooking.getTimeStr(), DateUtil.DATE_FORMAT_MM);
SysProjServices sysProjServices = new SysProjServices();
@@ -369,8 +368,7 @@
@ResponseBody
public AjaxResult findServiceOrderList(@RequestBody @Validated ErpServiceOrderListDto orderListDto) {
SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
- SysVipInfo vipInfo= vipInfoDao.selectByPhone(sysVipInfo.getPhone());
- orderListDto.setVipId(vipInfo.getId());
+ orderListDto.setVipId(sysVipInfo.getId());
List<ErpServiceOrderListVo> apiServiceOrderListInPage = projServicesDao.findWxServiceOrderList(orderListDto);
return AjaxResult.buildSuccessInstance(apiServiceOrderListInPage,"查询成功");
}
--
Gitblit v1.9.1