From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java | 403 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 271 insertions(+), 132 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
index d3e876a..2385215 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
@@ -1,5 +1,6 @@
package com.matrix.system.shopXcx.api.action;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -8,8 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.matrix.component.redis.RedisUserLoginUtils;
-import com.matrix.core.exception.GlobleException;
+import com.matrix.system.common.init.UserCacheManager;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.activity.dao.ActivitySignAwardSetDao;
@@ -20,17 +20,17 @@
import com.matrix.system.activity.entity.ActivitySignReceiveRecord;
import com.matrix.system.activity.entity.ActivitySignRecord;
import com.matrix.system.activity.entity.ActivitySignWriteoff;
+import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.hive.bean.SysVipInfo;
+import com.matrix.system.score.entity.ScoreVipDetail;
+import com.matrix.system.score.service.ScoreVipDetailService;
import com.matrix.system.shopXcx.api.dto.SeeAwardTextDto;
import com.matrix.system.shopXcx.api.dto.SignAwardDto;
import com.matrix.system.shopXcx.api.service.WxShopLogisticsQueryService;
+import com.matrix.system.shopXcx.api.tools.WxShopCouponUtil;
import com.matrix.system.shopXcx.api.vo.*;
-import com.matrix.system.shopXcx.bean.ShopActivities;
-import com.matrix.system.shopXcx.bean.ShopDeliveryInfo;
-import com.matrix.system.shopXcx.bean.ShopLogisticsInfo;
-import com.matrix.system.shopXcx.dao.ShopActivitiesDao;
-import com.matrix.system.shopXcx.dao.ShopDeliveryInfoDao;
-import com.matrix.system.shopXcx.dao.ShopLogisticsInfoDao;
+import com.matrix.system.shopXcx.bean.*;
+import com.matrix.system.shopXcx.dao.*;
import com.matrix.system.shopXcx.vo.SalesOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -56,7 +56,7 @@
private ShopActivitiesDao shopActivitiesDao;
@Autowired
- private RedisUserLoginUtils redisUserLoginUtils;
+ private UserCacheManager userCacheManager;
@Autowired
private ActivitySignAwardSetDao activitySignAwardSetDao;
@@ -75,9 +75,19 @@
@Autowired
private ShopLogisticsInfoDao shopLogisticsInfoDao;
+ @Autowired
+ private ShopReceiveAddressDao shopReceiveAddressDao;
@Autowired
private WxShopLogisticsQueryService wxShopLogisticsQueryService;
+ @Autowired
+ private ScoreVipDetailService scoreVipDetailService;
+ @Autowired
+ private ShopCouponDao shopCouponDao;
+ @Autowired
+ private WxShopCouponUtil wxShopCouponUtil;
+ @Autowired
+ private ShopCouponRecordDao shopCouponRecordDao;
@ApiOperation(value = "获取签到基本信息", notes = "")
@ApiResponses({
@@ -86,7 +96,7 @@
@GetMapping(value = "/getSignBasicInfo")
public AjaxResult getSignBasicInfo() {
//获取登录人信息
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
Long companyId = loginUser.getCompanyId();
Long userId = loginUser.getId();
//获取签到活动的信息
@@ -167,7 +177,7 @@
@ResponseBody
public AjaxResult getSignRecord(@PathVariable("actId") long actId,@PathVariable("month") String dateStr) {
//获取登录人信息
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
Long companyId = loginUser.getCompanyId();
Long userId = loginUser.getId();
Date date = DateUtil.parse(dateStr);
@@ -183,7 +193,7 @@
ActivitySignRecordVo activitySignRecordVoNull = new ActivitySignRecordVo();
activitySignRecordVos.add(activitySignRecordVoNull);
}
- List<String> monthFullDays = getMonthFullDay(DateUtil.year(DateUtil.date()), DateUtil.month(DateUtil.date()) + 1);
+ List<String> monthFullDays = getMonthFullDay(DateUtil.year(dateTime), DateUtil.month(dateTime) + 1);
for(String monthFullDay : monthFullDays){
ActivitySignRecordVo activitySignRecordVo = new ActivitySignRecordVo();
activitySignRecordVo.setSignTime(monthFullDay);
@@ -253,7 +263,7 @@
@ResponseBody
@Transactional
public AjaxResult clickSign(@PathVariable("actId") long actId) {
- SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo user = userCacheManager.getLoginUser();
Long userId = user.getId();
Long companyId = user.getCompanyId();
/**
@@ -308,7 +318,7 @@
* 查询是否有签到奖品
* 日常奖励和自定义奖品
*/
- SignSuccessVo signSuccessVo = new SignSuccessVo();
+ List<SignSuccessVo> signSuccessVos = new ArrayList<>();
//日常奖励,新增奖品领取记录
QueryWrapper<ActivitySignAwardSet> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("award_rule",ActivitySignAwardSet.AWARDRULE_NORMAL);
@@ -329,9 +339,54 @@
activitySignReceiveRecord.setUpdateTime(new Date());
activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
+ SignSuccessVo signSuccessVo = new SignSuccessVo();
+ signSuccessVo.setType(1);
signSuccessVo.setScoreCnt(activitySignAwardSetNormal.getScoreCnt());
- signSuccessVo.setNormalAwardName(activitySignAwardSetNormal.getAwardName());
- signSuccessVo.setNormalAwardImg(activitySignAwardSetNormal.getIntroduceImg());
+ signSuccessVo.setAwardName(activitySignAwardSetNormal.getAwardName());
+ signSuccessVo.setAwardImg(activitySignAwardSetNormal.getIntroduceImg());
+ signSuccessVos.add(signSuccessVo);
+
+ //日常奖励积分，对应用户积分加减
+ int awardType = activitySignAwardSetNormal.getAwardType();
+ if(ActivitySignAwardSet.AWARDTYPE_SCORE == awardType){
+ int scoreCnt = activitySignAwardSetNormal.getScoreCnt();
+ if(scoreCnt > 0){
+ scoreVipDetailService.addScore(userId,null,null,scoreCnt,
+ activitySignReceiveRecord.getId(), ScoreVipDetail.SCORE_VIP_TYPE_JOIN_ACTIVE,"签到积分");
+ }
+ }
+ //获取优惠券
+ if(ActivitySignAwardSet.AWARDTYPE_COUPON == awardType){
+ //获取优惠券
+ int couponId = Integer.parseInt(activitySignAwardSetNormal.getCouponId());
+ ShopCoupon shopCoupon = shopCouponDao.selectById(couponId);
+ // 如果没有找到该优惠券
+ if (shopCoupon == null) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "没有找到该优惠券！");
+ }
+ // 如果优惠券有数量限制并且已经领完
+ if (shopCoupon.getMaxQuantity() >= 0 && (shopCoupon.getMaxQuantity() <= shopCoupon.getQuantityReceive())) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "优惠券已领完！");
+ }
+ boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(userId);
+ // 如果改券是新人专属且当前用户不是新人
+ if (AppConstance.COUPON_GET_LIMT_NEW.equals(shopCoupon.getGetLimit()) && !newPeople) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "该优惠券为新人专享优惠券！");
+ }
+ ShopCouponRecord insertRecord = new ShopCouponRecord();
+ insertRecord.setCreateBy(AppConstance.SYSTEM_USER);
+ insertRecord.setUpdateBy(AppConstance.SYSTEM_USER);
+ insertRecord.setCId(couponId);
+ insertRecord.setUserId(userId);
+ insertRecord.setIsUsing(2);
+ int i = shopCouponRecordDao.insert(insertRecord);
+ // 如果插入领取记录表失败
+ if (i < 0) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "优惠券领取失败！");
+ }
+ shopCoupon.setQuantityReceive(shopCoupon.getQuantityReceive() + 1);
+ shopCouponDao.updateByModel(shopCoupon);
+ }
}
//获取当前累计天数
int cumulativeDay = getCumulativeDay(actId, userId, date, 0);
@@ -341,108 +396,156 @@
queryWrapperCumulativeDay.eq("cumulative_day",cumulativeDay);
queryWrapperCumulativeDay.eq("company_id",companyId);
queryWrapperCumulativeDay.eq("activity_id",actId);
- ActivitySignAwardSet activitySignAwardSetCumulativeDay = activitySignAwardSetDao.selectOne(queryWrapperCumulativeDay);
- if(ObjectUtil.isNotEmpty(activitySignAwardSetCumulativeDay)) {
- //是否已领取
- Long id = activitySignAwardSetCumulativeDay.getId();
- QueryWrapper<ActivitySignReceiveRecord> queryWrapperActivitySignReceiveRecord = new QueryWrapper<>();
- queryWrapperActivitySignReceiveRecord.eq("award_id", id);
- queryWrapperActivitySignReceiveRecord.eq("company_id", companyId);
- queryWrapperActivitySignReceiveRecord.eq("activity_id", actId);
- queryWrapperActivitySignReceiveRecord.eq("user_id", userId);
- ActivitySignReceiveRecord activitySignReceiveRecordDone = activitySignReceiveRecordDao.selectOne(queryWrapperActivitySignReceiveRecord);
- if (ObjectUtil.isNotEmpty(activitySignReceiveRecordDone)) {
- String awardNameCumulativeDay = activitySignAwardSetCumulativeDay.getAwardName();
- AjaxResult ajaxResult = AjaxResult.buildSuccessInstance(awardNameCumulativeDay+"已经领取过了");
- ajaxResult.setData(signSuccessVo);
- return ajaxResult;
+// ActivitySignAwardSet activitySignAwardSetCumulativeDay = activitySignAwardSetDao.selectOne(queryWrapperCumulativeDay);
+ List<ActivitySignAwardSet> activitySignAwardSetCumulativeDays = activitySignAwardSetDao.selectList(queryWrapperCumulativeDay);
+ if(CollUtil.isNotEmpty(activitySignAwardSetCumulativeDays)){
+ for(ActivitySignAwardSet activitySignAwardSetCumulativeDay : activitySignAwardSetCumulativeDays){
+ if(ObjectUtil.isNotEmpty(activitySignAwardSetCumulativeDay)) {
+ //是否已领取
+ Long id = activitySignAwardSetCumulativeDay.getId();
+ QueryWrapper<ActivitySignReceiveRecord> queryWrapperActivitySignReceiveRecord = new QueryWrapper<>();
+ queryWrapperActivitySignReceiveRecord.eq("award_id", id);
+ queryWrapperActivitySignReceiveRecord.eq("company_id", companyId);
+ queryWrapperActivitySignReceiveRecord.eq("activity_id", actId);
+ queryWrapperActivitySignReceiveRecord.eq("user_id", userId);
+ ActivitySignReceiveRecord activitySignReceiveRecordDone = activitySignReceiveRecordDao.selectOne(queryWrapperActivitySignReceiveRecord);
+ if (ObjectUtil.isNotEmpty(activitySignReceiveRecordDone)) {
+ String awardNameCumulativeDay = activitySignAwardSetCumulativeDay.getAwardName();
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance(awardNameCumulativeDay+"已经领取过了");
+ ajaxResult.setData(signSuccessVos);
+ return ajaxResult;
+ }
+
+ SignSuccessVo signSuccessVo = new SignSuccessVo();
+ signSuccessVo.setType(2);
+ signSuccessVo.setAwardType(activitySignAwardSetCumulativeDay.getAwardType());
+ signSuccessVo.setAwardName(activitySignAwardSetCumulativeDay.getAwardName());
+ signSuccessVo.setAwardImg(activitySignAwardSetCumulativeDay.getIntroduceImg());
+ signSuccessVo.setAwardState(activitySignAwardSetCumulativeDay.getAwardState());
+ //新增奖品领取记录
+ ActivitySignReceiveRecord activitySignReceiveRecord = new ActivitySignReceiveRecord();
+ activitySignReceiveRecord.setUserId(userId);
+ activitySignReceiveRecord.setReceiveTime(date);
+ activitySignReceiveRecord.setAwardId(activitySignAwardSetCumulativeDay.getId());
+ activitySignReceiveRecord.setActivityId(actId);
+ activitySignReceiveRecord.setCompanyId(companyId);
+ activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
+ activitySignReceiveRecord.setCreateBy(user.getVipName());
+ activitySignReceiveRecord.setCreateTime(new Date());
+ activitySignReceiveRecord.setUpdateBy(user.getVipName());
+ activitySignReceiveRecord.setUpdateTime(new Date());
+ /**
+ * 奖项类型（1：自定义产品2：积分3：优惠券4：店铺商品）
+ *
+ * todo:4：店铺商品
+ */
+ //1：自定义产品
+ if(ActivitySignAwardSet.AWARDTYPE_CUSTOMIZE == activitySignAwardSetCumulativeDay.getAwardType()) {
+ activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_ING);
+ String randomString = StringUtils.getRandomString(8);
+ activitySignReceiveRecord.setWriteOffCode(randomString);
+
+ /**
+ * 获取对应奖品的领取方式（兑奖方式（1：线下兑换2：物流配送3：客服兑换）
+ */
+ signSuccessVo.setWriteOffCode(randomString);
+ signSuccessVo.setAwardWay(activitySignAwardSetCumulativeDay.getAwardWay());
+ //2：物流配送
+ signSuccessVo.setOperationTip(activitySignAwardSetCumulativeDay.getOperationTip());
+ //1：线下兑换
+ if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSetCumulativeDay.getAwardWay()) {
+ signSuccessVo.setIntroduceTip(activitySignAwardSetCumulativeDay.getIntroduceTip());
+ signSuccessVo.setPrizeAddress(activitySignAwardSetCumulativeDay.getPrizeAddress());
+ signSuccessVo.setPrizeStartTime(activitySignAwardSetCumulativeDay.getPrizeStartTime());
+ signSuccessVo.setPrizeEndTime(activitySignAwardSetCumulativeDay.getPrizeEndTime());
+ }
+ //3：客服兑换
+ if(ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSetCumulativeDay.getAwardWay()) {
+ signSuccessVo.setWechatImg(activitySignAwardSetCumulativeDay.getWechatImg());
+ signSuccessVo.setPrizeStartTime(activitySignAwardSetCumulativeDay.getPrizeStartTime());
+ signSuccessVo.setPrizeEndTime(activitySignAwardSetCumulativeDay.getPrizeEndTime());
+ }
+ }
+ //2：积分
+ if(ActivitySignAwardSet.AWARDTYPE_SCORE == activitySignAwardSetCumulativeDay.getAwardType()) {
+ signSuccessVo.setScoreCnt(activitySignAwardSetCumulativeDay.getScoreCnt());
+ }
+ //3：优惠券
+ if(ActivitySignAwardSet.AWARDTYPE_COUPON == activitySignAwardSetCumulativeDay.getAwardType()) {
+ signSuccessVo.setCouponName(activitySignAwardSetCumulativeDay.getCouponName());
+ //获取优惠券
+ int couponId = Integer.parseInt(activitySignAwardSetCumulativeDay.getCouponId());
+ ShopCoupon shopCoupon = shopCouponDao.selectById(couponId);
+ // 如果没有找到该优惠券
+ if (shopCoupon == null) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "没有找到该优惠券！");
+ }
+ // 如果优惠券有数量限制并且已经领完
+ if (shopCoupon.getMaxQuantity() >= 0 && (shopCoupon.getMaxQuantity() <= shopCoupon.getQuantityReceive())) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "优惠券已领完！");
+ }
+ boolean newPeople = wxShopCouponUtil.verifyIsNewPeople(userId);
+ // 如果改券是新人专属且当前用户不是新人
+ if (AppConstance.COUPON_GET_LIMT_NEW.equals(shopCoupon.getGetLimit()) && !newPeople) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "该优惠券为新人专享优惠券！");
+ }
+ ShopCouponRecord insertRecord = new ShopCouponRecord();
+ insertRecord.setCreateBy(AppConstance.SYSTEM_USER);
+ insertRecord.setUpdateBy(AppConstance.SYSTEM_USER);
+ insertRecord.setCId(couponId);
+ insertRecord.setUserId(userId);
+ insertRecord.setIsUsing(2);
+ int i = shopCouponRecordDao.insert(insertRecord);
+ // 如果插入领取记录表失败
+ if (i < 0) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "优惠券领取失败！");
+ }
+ shopCoupon.setQuantityReceive(shopCoupon.getQuantityReceive() + 1);
+ shopCouponDao.updateByModel(shopCoupon);
+ }
+ activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
+ //累计奖励积分，对应用户积分加减
+ if(ActivitySignAwardSet.AWARDTYPE_SCORE == activitySignAwardSetCumulativeDay.getAwardType()) {
+ int awardType = activitySignAwardSetCumulativeDay.getAwardType();
+ if(ActivitySignAwardSet.AWARDTYPE_SCORE == awardType){
+ int scoreCnt = activitySignAwardSetCumulativeDay.getScoreCnt();
+ if(scoreCnt > 0){
+ scoreVipDetailService.addScore(userId,null,null,scoreCnt,
+ activitySignReceiveRecord.getId(), ScoreVipDetail.SCORE_VIP_TYPE_JOIN_ACTIVE,"签到积分");
+ }
+ }
+ }
+ //生成核销记录
+ if(ActivitySignAwardSet.AWARDTYPE_CUSTOMIZE == activitySignAwardSetCumulativeDay.getAwardType()) {
+ ActivitySignWriteoff activitySignWriteoff = new ActivitySignWriteoff();
+ //线下兑换和客服兑换
+ if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSetCumulativeDay.getAwardWay()
+ || ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSetCumulativeDay.getAwardWay()) {
+ activitySignWriteoff.setWriteoffCode(activitySignReceiveRecord.getWriteOffCode());
+ }
+ activitySignWriteoff.setActId(actId);
+ activitySignWriteoff.setAwardId(activitySignAwardSetCumulativeDay.getId());
+ activitySignWriteoff.setWinTime(date);
+ if(ActivitySignAwardSet.AWARDWAY_TWO == activitySignAwardSetCumulativeDay.getAwardWay()) {
+ activitySignWriteoff.setState(ActivitySignWriteoff.STATE_TWO);
+ }else {
+ activitySignWriteoff.setState(ActivitySignWriteoff.STATE_ONE);
+ }
+ activitySignWriteoff.setUserId(userId);
+ activitySignWriteoff.setCompanyId(companyId);
+ activitySignWriteoff.setReceiveId(activitySignReceiveRecord.getId());
+ activitySignWriteoff.setCreateBy(user.getVipName());
+ activitySignWriteoff.setCreateTime(new Date());
+ activitySignWriteoff.setUpdateBy(user.getVipName());
+ activitySignWriteoff.setUpdateTime(new Date());
+ activitySignWriteoffDao.insert(activitySignWriteoff);
+ }
+ signSuccessVos.add(signSuccessVo);
+ }
}
- //新增奖品领取记录
- ActivitySignReceiveRecord activitySignReceiveRecord = new ActivitySignReceiveRecord();
- activitySignReceiveRecord.setUserId(userId);
- activitySignReceiveRecord.setReceiveTime(date);
- activitySignReceiveRecord.setAwardId(activitySignAwardSetCumulativeDay.getId());
- activitySignReceiveRecord.setActivityId(actId);
- activitySignReceiveRecord.setCompanyId(companyId);
- activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
- activitySignReceiveRecord.setCreateBy(user.getVipName());
- activitySignReceiveRecord.setCreateTime(new Date());
- activitySignReceiveRecord.setUpdateBy(user.getVipName());
- activitySignReceiveRecord.setUpdateTime(new Date());
- /**
- * 奖项类型（1：自定义产品2：积分3：优惠券4：店铺商品）
- *
- * todo:4：店铺商品
- */
- //1：自定义产品
- if(ActivitySignAwardSet.AWARDTYPE_CUSTOMIZE == activitySignAwardSetCumulativeDay.getAwardType()) {
- activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_ING);
- String randomString = StringUtils.getRandomString(8);
- activitySignReceiveRecord.setWriteOffCode(randomString);
-
- /**
- * 获取对应奖品的领取方式（兑奖方式（1：线下兑换2：物流配送3：客服兑换）
- */
- signSuccessVo.setWriteOffCode(randomString);
- signSuccessVo.setAwardType(activitySignAwardSetCumulativeDay.getAwardType());
- signSuccessVo.setAwardName(activitySignAwardSetCumulativeDay.getAwardName());
- signSuccessVo.setAwardImg(activitySignAwardSetCumulativeDay.getIntroduceImg());
- signSuccessVo.setAwardWay(activitySignAwardSetCumulativeDay.getAwardWay());
- signSuccessVo.setAwardState(activitySignAwardSetCumulativeDay.getAwardState());
- //2：物流配送
- signSuccessVo.setOperationTip(activitySignAwardSetCumulativeDay.getOperationTip());
- //1：线下兑换
- if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSetCumulativeDay.getAwardWay()) {
- signSuccessVo.setIntroduceTip(activitySignAwardSetCumulativeDay.getIntroduceTip());
- signSuccessVo.setPrizeAddress(activitySignAwardSetCumulativeDay.getPrizeAddress());
- signSuccessVo.setPrizeStartTime(activitySignAwardSetCumulativeDay.getPrizeStartTime());
- signSuccessVo.setPrizeEndTime(activitySignAwardSetCumulativeDay.getPrizeEndTime());
- }
- //3：客服兑换
- if(ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSetCumulativeDay.getAwardWay()) {
- signSuccessVo.setWechatImg(activitySignAwardSetCumulativeDay.getWechatImg());
- signSuccessVo.setPrizeStartTime(activitySignAwardSetCumulativeDay.getPrizeStartTime());
- signSuccessVo.setPrizeEndTime(activitySignAwardSetCumulativeDay.getPrizeEndTime());
- }
- }
- //2：积分
- if(ActivitySignAwardSet.AWARDTYPE_SCORE == activitySignAwardSetCumulativeDay.getAwardType()) {
- signSuccessVo.setScoreCnt(activitySignAwardSetCumulativeDay.getScoreCnt());
- }
- //3：优惠券
- if(ActivitySignAwardSet.AWARDTYPE_COUPON == activitySignAwardSetCumulativeDay.getAwardType()) {
- signSuccessVo.setCouponName(activitySignAwardSetCumulativeDay.getCouponName());
- }
- activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
- //生成核销记录
- if(ActivitySignAwardSet.AWARDTYPE_CUSTOMIZE == activitySignAwardSetCumulativeDay.getAwardType()) {
- ActivitySignWriteoff activitySignWriteoff = new ActivitySignWriteoff();
- //线下兑换和客服兑换
- if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSetCumulativeDay.getAwardWay()
- || ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSetCumulativeDay.getAwardWay()) {
- activitySignWriteoff.setWriteoffCode(activitySignReceiveRecord.getWriteOffCode());
- }
- activitySignWriteoff.setActId(actId);
- activitySignWriteoff.setAwardId(activitySignAwardSetCumulativeDay.getId());
- activitySignWriteoff.setWinTime(date);
- if(ActivitySignAwardSet.AWARDWAY_TWO == activitySignAwardSetCumulativeDay.getAwardWay()) {
- activitySignWriteoff.setState(ActivitySignWriteoff.STATE_TWO);
- }else {
- activitySignWriteoff.setState(ActivitySignWriteoff.STATE_ONE);
- }
- activitySignWriteoff.setUserId(userId);
- activitySignWriteoff.setCompanyId(companyId);
- activitySignWriteoff.setReceiveId(activitySignReceiveRecord.getId());
- activitySignWriteoff.setCreateBy(user.getVipName());
- activitySignWriteoff.setCreateTime(new Date());
- activitySignWriteoff.setUpdateBy(user.getVipName());
- activitySignWriteoff.setUpdateTime(new Date());
- activitySignWriteoffDao.insert(activitySignWriteoff);
- }
}
-
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("签到成功");
- ajaxResult.setData(signSuccessVo);
+ ajaxResult.setData(signSuccessVos);
return ajaxResult;
}
/**
@@ -461,7 +564,8 @@
DateTime offsetDay = DateUtil.offsetDay(date, -i);
return getCumulativeDay(actId,userId,offsetDay,i);
}
-
+
+
/**
* 获取累计的签到奖品
*
@@ -473,7 +577,7 @@
@ApiResponse(code = 200, message = "ok", response = SignAwardListVo.class)
})
public AjaxResult getSignAwardList(@RequestBody @Validated SignAwardDto signAwardDto) {
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
Page<SalesOrderVo> page=new Page<>(signAwardDto.getPageNum(),signAwardDto.getPageSize());
if(StringUtils.isBlank(signAwardDto.getSort())){
signAwardDto.setSort("create_time");
@@ -482,7 +586,7 @@
signAwardDto.setUserId(loginUser.getId());
signAwardDto.setCompanyId(loginUser.getCompanyId());
IPage<SignAwardListVo> signAwardListVos = activitySignReceiveRecordDao.selectSignAwardList(page,signAwardDto);
- AjaxResult result=AjaxResult.buildSuccessInstance(signAwardListVos.getRecords());
+ AjaxResult result=AjaxResult.buildSuccessInstance(signAwardListVos);
return result;
}
@@ -497,7 +601,7 @@
@ApiResponse(code = 200, message = "ok", response = SeeAwardTextVo.class)
})
public AjaxResult seeAwardText(@RequestBody @Validated SeeAwardTextDto seeAwardTextDto) {
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
seeAwardTextDto.setUserId(loginUser.getId());
seeAwardTextDto.setCompanyId(loginUser.getCompanyId());
SeeAwardTextVo seeAwardTextVO = activitySignReceiveRecordDao.selectSeeAwardTextVOById(seeAwardTextDto);
@@ -506,7 +610,7 @@
}
/**
- * 物流配送确认
+ * 物流配送信息查看
*
* @return
*/
@@ -516,23 +620,58 @@
@ApiResponse(code = 200, message = "ok", response = SeeAwardTextVo.class)
})
public AjaxResult logisticsInsure(@RequestBody @Validated SeeAwardTextDto seeAwardTextDto) {
- SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
+ SysVipInfo loginUser = userCacheManager.getLoginUser();
seeAwardTextDto.setUserId(loginUser.getId());
seeAwardTextDto.setCompanyId(loginUser.getCompanyId());
SeeAwardTextVo seeAwardTextVO = activitySignReceiveRecordDao.selectSeeAwardTextVOById(seeAwardTextDto);
+ if(ObjectUtil.isEmpty(seeAwardTextVO)){
+ return AjaxResult.buildFailInstance("奖品无法查看物流配送信息");
+ }
long receiveId = seeAwardTextVO.getId();
+
//获取核销记录的ID
ActivitySignWriteoff activitySignWriteoff = activitySignWriteoffDao.selectActivitySignWriteoffByUserIDAndReceiveId(loginUser.getId(),receiveId);
- Integer logisticsId = activitySignWriteoff.getLogisticsId();
- ShopDeliveryInfo shopDeliveryInfo = shopDeliveryInfoDao.selectById(logisticsId);
- if(ObjectUtil.isNotEmpty(shopDeliveryInfo)){
- //查看物流信息
- wxShopLogisticsQueryService.selectLogisticsInfo(shopDeliveryInfo);
- List<ShopLogisticsInfo> shopLogisticsInfos = shopLogisticsInfoDao.selectByDelieryId(shopDeliveryInfo.getId());
- seeAwardTextVO.setShopLogisticsInfos(shopLogisticsInfos);
+ if(ObjectUtil.isNotEmpty(activitySignWriteoff)){
+ Integer logisticsId = activitySignWriteoff.getLogisticsId();
+ ShopDeliveryInfo shopDeliveryInfo = shopDeliveryInfoDao.selectById(logisticsId);
+ if(ObjectUtil.isNotEmpty(shopDeliveryInfo)){
+ //查看物流信息
+ wxShopLogisticsQueryService.selectLogisticsInfo(shopDeliveryInfo);
+ List<ShopLogisticsInfo> shopLogisticsInfos = shopLogisticsInfoDao.selectByDelieryId(shopDeliveryInfo.getId());
+ seeAwardTextVO.setShopLogisticsInfos(shopLogisticsInfos);
+ }
}
AjaxResult result=AjaxResult.buildSuccessInstance(seeAwardTextVO);
return result;
+ }
+
+ /**
+ * 物流配送收货地址保存
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "物流配送收货地址保存", notes = "")
+ @GetMapping(value = "logisticsInsureAddress/{addressId}/{receiveId}")
+ @ResponseBody
+ public AjaxResult logisticsInsureAddress(@PathVariable("addressId") int addressId,@PathVariable("receiveId") long receiveId) {
+ ShopReceiveAddress shopReceiveAddress = shopReceiveAddressDao.selectById(addressId);
+ if(ObjectUtil.isEmpty(shopReceiveAddress)){
+ return AjaxResult.buildFailInstance("收货地址无效");
+ }
+ ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
+ //该奖品不是待领取状态
+ if (ActivitySignReceiveRecord.STATE_DONE == activitySignReceiveRecord.getState()
+ || ActivitySignReceiveRecord.STATE_FOUR == activitySignReceiveRecord.getState()
+ || ActivitySignReceiveRecord.STATE_FIVE == activitySignReceiveRecord.getState()) {
+ return AjaxResult.buildFailInstance("无法修改收货信息");
+ }
+ activitySignReceiveRecord.setConsigneeAddress(shopReceiveAddress.getAddrRegion()+"-"+shopReceiveAddress.getAddrDetailaddr()+"-"+shopReceiveAddress.getDormitory());
+ activitySignReceiveRecord.setConsignee(shopReceiveAddress.getAddrLiaisonman());
+ activitySignReceiveRecord.setConsigneePhone(shopReceiveAddress.getAddrTelephone());
+ activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_THREE);
+ activitySignReceiveRecordDao.updateById(activitySignReceiveRecord);
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, "设置成功！");
}
/**
@@ -542,13 +681,13 @@
* @return
*/
@ApiOperation(value = "物流配送确认收货", notes = "")
- @GetMapping(value = "logisticsInsureById/{awardId}")
+ @GetMapping(value = "logisticsInsureById/{receiveId}")
@ResponseBody
- public AjaxResult logisticsInsureById(@PathVariable("awardId") long awardId) {
- ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(awardId);
+ public AjaxResult logisticsInsureById(@PathVariable("receiveId") long receiveId) {
+ ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
//如果不是待收货状态
if (ActivitySignReceiveRecord.STATE_FOUR != activitySignReceiveRecord.getState()) {
- throw new GlobleException("该奖品不是待收货状态！");
+ return AjaxResult.buildFailInstance("该奖品不是待收货状态");
}
activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
activitySignReceiveRecordDao.updateById(activitySignReceiveRecord);
--
Gitblit v1.9.1