From a3cddf45e9c7c590e8fe034e951189c49548f29f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Apr 2021 16:58:56 +0800
Subject: [PATCH] 20210421 签到
---
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java
index f2700b3..ebd77b1 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java
@@ -114,6 +114,8 @@
Integer logisticsId = activitySignWriteoffLogistics.getLogisticsId();
ShopDeliveryInfo shopDeliveryInfo = shopDeliveryInfoDao.selectById(logisticsId);
if(ObjectUtil.isNotEmpty(shopDeliveryInfo)){
+ signWriteoffVo.setLogisticsNum(shopDeliveryInfo.getWaybillNo());
+ signWriteoffVo.setLogisticsCompany(shopDeliveryInfo.getLogisticsCompany());
//查看物流信息
wxShopLogisticsQueryService.selectLogisticsInfo(shopDeliveryInfo);
List<ShopLogisticsInfo> shopLogisticsInfos = shopLogisticsInfoDao.selectByDelieryId(shopDeliveryInfo.getId());
@@ -143,11 +145,15 @@
String writeOffCode = writeoffCodeSubmitDto.getWriteOffCode();
/**
* 验证核销码是不是匹配
+ * 只能核销一次
* 更新核销记录
* 更新领取记录
*/
//验证核销码是不是匹配
ActivitySignWriteoff activitySignWriteoff = activitySignWriteoffDao.selectById(writeoffId);
+ if(ActivitySignWriteoff.STATE_ONE != activitySignWriteoff.getState()){
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "兑奖码已失效");
+ }
if(ObjectUtil.isNotEmpty(activitySignWriteoff)) {
String writeoffCodeReal = activitySignWriteoff.getWriteoffCode();
if(!writeoffCodeReal.equals(writeOffCode)) {
@@ -157,7 +163,8 @@
//线下兑换失效
Long awardId = activitySignWriteoff.getAwardId();
ActivitySignAwardSet activitySignAwardSet = activitySignAwardSetDao.selectById(awardId);
- if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSet.getAwardWay()){
+ if(ActivitySignAwardSet.AWARDWAY_ONE == activitySignAwardSet.getAwardWay()
+ || ActivitySignAwardSet.AWARDWAY_THREE == activitySignAwardSet.getAwardWay()){
Date prizeStartTime = activitySignAwardSet.getPrizeStartTime();
if(DateUtil.date().getTime() < prizeStartTime.getTime()){
return new AjaxResult(AjaxResult.STATUS_FAIL, "兑奖还没开始呢！");
--
Gitblit v1.9.1