From 81606f6165beeecf5b409da3a999b6610e85fc2c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Apr 2021 16:01:40 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java | 213 +++++++++++++++++++++++++++-------------------------
1 files changed, 110 insertions(+), 103 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 25ff5ae..143067a 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;
@@ -186,7 +187,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);
@@ -344,106 +345,110 @@
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(signSuccessVo);
+ return ajaxResult;
+ }
+ //新增奖品领取记录
+ 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);
+ }
+ }
}
- //新增奖品领取记录
- 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);
return ajaxResult;
@@ -485,7 +490,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;
}
@@ -509,7 +514,7 @@
}
/**
- * 物流配送确认
+ * 物流配送信息查看
*
* @return
*/
@@ -560,8 +565,10 @@
}
ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
//该奖品不是待领取状态
- if (ActivitySignReceiveRecord.STATE_ING != activitySignReceiveRecord.getState()) {
- return AjaxResult.buildFailInstance("该奖品不是待领取状态");
+ 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());
--
Gitblit v1.9.1