From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopCouponServiceImpl.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopCouponServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopCouponServiceImpl.java
index 088d320..d2840d3 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopCouponServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopCouponServiceImpl.java
@@ -1,6 +1,6 @@
package com.matrix.system.shopXcx.api.service.impl;
-import com.matrix.biz.bean.BizUser;
+import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
@@ -61,9 +61,9 @@
List<CouponReceiveInfoVO> shopCoupons = new ArrayList<>();
- BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
//1.找到用户所有的优惠券
- List<CouponReceiveInfoVO> userAllCoupon = shopCouponRecordDao.selectMyCouponByStatus(companyId, bizUser.getOpenId(), AppConstance.MY_COUPON_NOT_USE,
+ List<CouponReceiveInfoVO> userAllCoupon = shopCouponRecordDao.selectMyCouponByStatus(companyId, sysVipInfo.getId(), AppConstance.MY_COUPON_NOT_USE,
null);
if (CollectionUtils.isNotEmpty(userAllCoupon)) {
//根据优惠力度排序，优惠力度大的先参与计算
@@ -150,14 +150,14 @@
*/
@Override
public AjaxResult getUsableCoupon(PaginationVO pageVo) {
- BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(bizUser.getOpenId());
- List<ShopCoupon> list = shopCouponDao.selectUsableCoupon(newPeople, bizUser.getOpenId(), pageVo);
+ SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(sysVipInfo.getId());
+ List<ShopCoupon> list = shopCouponDao.selectUsableCoupon(newPeople, sysVipInfo.getOpenId(), pageVo);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, list);
}
/**
- * 领取优惠券
+ *
*
* @param couponId
* @return
@@ -166,7 +166,7 @@
@Override
public AjaxResult receiveCoupon(Integer couponId) {
ShopCoupon shopCoupon = shopCouponDao.selectById(couponId);
- BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
// 如果没有找到该优惠券
if (shopCoupon == null) {
@@ -178,7 +178,7 @@
return new AjaxResult(AjaxResult.STATUS_FAIL, "优惠券已领完！");
}
- boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(bizUser.getOpenId());
+ boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(sysVipInfo.getId());
// 如果改券是新人专属且当前用户不是新人
if (AppConstance.COUPON_GET_LIMT_NEW.equals(shopCoupon.getGetLimit()) && !newPeople) {
@@ -186,7 +186,7 @@
}
ShopCouponRecord param = new ShopCouponRecord();
- param.setUserId(bizUser.getOpenId());
+ param.setUserId(sysVipInfo.getId());
param.setCId(couponId);
List<ShopCouponRecord> recordList = shopCouponRecordDao.selectByModel(param);
// 如果已经领取改优惠券
@@ -197,7 +197,7 @@
insertRecord.setCreateBy(AppConstance.SYSTEM_USER);
insertRecord.setUpdateBy(AppConstance.SYSTEM_USER);
insertRecord.setCId(couponId);
- insertRecord.setUserId(bizUser.getOpenId());
+ insertRecord.setUserId(sysVipInfo.getId());
insertRecord.setIsUsing(2);
int i = shopCouponRecordDao.insert(insertRecord);
// 如果插入领取记录表失败
@@ -219,14 +219,14 @@
*/
@Override
public AjaxResult getMyCouponInfoByStatus(Long companyId, Integer status, PaginationVO pageVo) {
- BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+ SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
// 如果查询使用或未使用状态的优惠券列表
if (AppConstance.MY_COUPON_USE.equals(status) || AppConstance.MY_COUPON_NOT_USE.equals(status)) {
- List<CouponReceiveInfoVO> list = shopCouponRecordDao.selectMyCouponByStatus(companyId,bizUser.getOpenId(), status,
+ List<CouponReceiveInfoVO> list = shopCouponRecordDao.selectMyCouponByStatus(companyId,sysVipInfo.getId(), status,
pageVo);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, list);
}
- List<CouponReceiveInfoVO> list = shopCouponRecordDao.selectMyPastCoupon(companyId,bizUser.getOpenId(), pageVo);
+ List<CouponReceiveInfoVO> list = shopCouponRecordDao.selectMyPastCoupon(companyId,sysVipInfo.getId(), pageVo);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, list);
}
@@ -256,8 +256,8 @@
attrIds.addAll(ids);
}
}
- BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- List<ShopCoupon> list = shopCouponDao.selectUsableCouponByProductInfo(bizUser.getOpenId(), productId,
+ SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ List<ShopCoupon> list = shopCouponDao.selectUsableCouponByProductInfo(sysVipInfo.getOpenId(), productId,
attrIds);
return list;
}
@@ -304,9 +304,9 @@
*/
@Override
public AjaxResult getCouponListByTag(String tag, Long companyId) {
- BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(bizUser.getOpenId());
- List<ShopCoupon> couponList = shopCouponDao.selectCouponListByTag(newPeople, bizUser.getOpenId(), tag,companyId);
+ SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(sysVipInfo.getId());
+ List<ShopCoupon> couponList = shopCouponDao.selectCouponListByTag(newPeople, sysVipInfo.getOpenId(), tag,companyId);
AjaxResult res = new AjaxResult(AjaxResult.STATUS_SUCCESS, couponList);
res.putInMap("isNewPeople", newPeople);
return res;
--
Gitblit v1.9.1