From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSalonAction.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSalonAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSalonAction.java
index ae9288b..d7a2403 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSalonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSalonAction.java
@@ -1,12 +1,12 @@
package com.matrix.system.shopXcx.api.action;
-import com.matrix.biz.bean.BizUser;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.LogUtil;
import com.matrix.system.common.interceptor.HostInterceptor;
+import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.shopXcx.api.vo.SalonVO;
import com.matrix.system.shopXcx.bean.ShopActivities;
@@ -24,7 +24,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -82,7 +81,7 @@
*/
@GetMapping(value = "/findSalonInfoById/{id}")
public AjaxResult findSalonInfoById(@PathVariable("id") Long id) {
- BizUser user = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
ShopActivities shopActivities = shopActivitiesDao.selectSalonActivityById(id);
ShopActivitiesSalonRecord salonRecord = shopActivitiesSalonRecordDao.selectSalonRecordByUserIdAndActId(user.getOpenId(), id);
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
@@ -105,7 +104,7 @@
@PostMapping(value = "/joinSalonActivity")
@Transactional
public AjaxResult joinSalonActivity(@RequestBody CreateSalonDTO salonDTO) {
- BizUser user = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
ShopActivities shopActivities = shopActivitiesDao.selectById(salonDTO.getActId());
if (shopActivities == null) {
@@ -128,7 +127,7 @@
ShopActivitiesSalonRecord salonRecord = new ShopActivitiesSalonRecord();
salonRecord.setActId(salonDTO.getActId());
- salonRecord.setUserId(user.getOpenId());
+ salonRecord.setUserId(user.getId());
salonRecord.setCreateBy(user.getNickName());
salonRecord.setUpdateBy(user.getNickName());
salonRecord.setStatus(ShopActivitiesSalonRecord.JOIN_STATUS_ING);
@@ -173,7 +172,7 @@
*/
@RequestMapping(value = "/findSalonListByUser")
public AjaxResult findSalonListByUser(@RequestBody SalonVO salonVO) {
- BizUser user = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
salonVO.setUserId(user.getOpenId());
List<ShopActivities> list = shopActivitiesDao.selectSalonActivityByUser(salonVO);
return AjaxResult.buildSuccessInstance(list);
--
Gitblit v1.9.1