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/WxReceiveAddressAction.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxReceiveAddressAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxReceiveAddressAction.java
index be633d2..ba7563a 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxReceiveAddressAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxReceiveAddressAction.java
@@ -2,7 +2,7 @@
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.biz.bean.BizUser;
+import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.system.common.constance.AppConstance;
@@ -37,7 +37,7 @@
@PostMapping(value = "/saveReceiveAddress")
public @ResponseBody
AjaxResult saveReceiveAddress(@RequestBody ShopReceiveAddress receiveAddress) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
receiveAddress.setCreateBy(loginUser.getOpenId());
receiveAddress.setUpdateBy(loginUser.getOpenId());
receiveAddress.setAddrUserid(loginUser.getOpenId());
@@ -94,7 +94,7 @@
@PostMapping("/findReceiveAddress")
@ResponseBody
public AjaxResult getByAddrUserId(@RequestBody ShopReceiveAddress receiveAddress) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
String userId = loginUser.getOpenId();
receiveAddress.setAddrUserid(userId);
List<ShopReceiveAddress> list = shopReceiveAddressDao.selectByModel(receiveAddress);
@@ -110,7 +110,7 @@
@PostMapping("/findAddrByAddrId/{addrId}")
@ResponseBody
public AjaxResult getByAddrId(@PathVariable("addrId") Integer addrId) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
String userId = loginUser.getOpenId();
ShopReceiveAddress params = new ShopReceiveAddress();
params.setAddrUserid(userId);
@@ -145,7 +145,7 @@
@PostMapping(value = "/updateReceiveAddress")
public @ResponseBody
AjaxResult updateReceiveAddress(@RequestBody ShopReceiveAddress receiveAddress) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
receiveAddress.setCreateBy(loginUser.getOpenId());
receiveAddress.setUpdateBy(loginUser.getOpenId());
receiveAddress.setAddrUserid(loginUser.getOpenId());
--
Gitblit v1.9.1