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/WxShoppingCartAction.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShoppingCartAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShoppingCartAction.java
index 4508e1c..3b17f08 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShoppingCartAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShoppingCartAction.java
@@ -1,6 +1,6 @@
package com.matrix.system.shopXcx.api.action;
-import com.matrix.biz.bean.BizUser;
+import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.constance.SystemMessageCode;
@@ -71,9 +71,8 @@
@PostMapping("/findShoppingCart")
@ResponseBody
public AjaxResult getShoppingCartByUserId(@RequestBody ShopShoppingCart shoppingCart) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- String userId = loginUser.getOpenId();
- List<ShopShoppingCart> list = shoppingCartDao.selectByCartUserId(shoppingCart.getShopId(),userId);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ List<ShopShoppingCart> list = shoppingCartDao.selectByCartUserId(shoppingCart.getShopId(),loginUser.getId());
List<ShopCartVo> shopCartVoList = shoppingCartService.buildShopCart(list);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, shopCartVoList, shopCartVoList.size());
ShopCartBillVo shopCartBill = shoppingCartService.buildShopCartBillVo(shopCartVoList);
@@ -105,8 +104,8 @@
public
@ResponseBody
AjaxResult getUserCartCount(@PathVariable("shopId") Long shopId) {
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- Integer userCartCount = shoppingCartDao.selectUserCartCount(shopId, loginUser.getOpenId());
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ Integer userCartCount = shoppingCartDao.selectUserCartCount(shopId, loginUser.getId());
if (userCartCount == null) {
userCartCount = 0;
}
@@ -131,10 +130,10 @@
shoppingCart.setCartProductId(sku.getpId());
- BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
shoppingCart.setCreateBy(loginUser.getOpenId());
shoppingCart.setUpdateBy(loginUser.getOpenId());
- shoppingCart.setCartUserId(loginUser.getOpenId());
+ shoppingCart.setCartUserId(loginUser.getId());
shoppingCart.setCompanyId(HostInterceptor.getCompanyId());
ShopShoppingCart shoppCartLimt = shoppingCartDao.selectBuyLimit(shoppingCart.getCartProductId(),
shoppingCart.getCartSkuId());
@@ -161,7 +160,7 @@
ShopShoppingCart shopShoppingCart = new ShopShoppingCart();
shopShoppingCart.setCartProductId(cartProductId);
shopShoppingCart.setCartSkuId(cartSkuId);
- shopShoppingCart.setCartUserId(loginUser.getOpenId());
+ shopShoppingCart.setCartUserId(loginUser.getId());
shopShoppingCart.setShopId(shoppingCart.getShopId());
List<ShopShoppingCart> shopShoppingCarts = shoppingCartDao.selectByModel(shopShoppingCart);
int i = 0;
@@ -194,7 +193,7 @@
return new AjaxResult(AjaxResult.STATUS_FAIL, "保存失败");
}
int userCartCount = shoppingCartDao.selectUserCartCount(shoppingCart.getShopId(),
- loginUser.getOpenId());
+ loginUser.getId());
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, "保存成功");
result.putInMap("userCartCount", userCartCount);
return result;
@@ -278,7 +277,7 @@
@ResponseBody
public AjaxResult updateCartAllSelected(@PathVariable("isSelected") Integer isSelected,
@PathVariable("shopId") Long shopId) {
- BizUser user = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
shoppingCartDao.updateAllSelected(user.getOpenId(), shopId, isSelected);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "修改成功");
}
--
Gitblit v1.9.1