From e4094cb5ca20c181856058fa99cbaedd85e58d12 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Apr 2021 14:24:23 +0800
Subject: [PATCH] 20210416 签到
---
zq-erp/src/main/resources/static/images/sign/meiriqiandao.png | 0
zq-erp/src/main/resources/static/images/sign/signButton.png | 0
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java | 18 +++++++++---------
zq-erp/src/main/resources/static/images/sign/signHead.png | 0
zq-erp/src/main/resources/static/images/sign/jisumiaosha.png | 0
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html | 16 ++++++++--------
zq-erp/src/main/resources/static/images/sign/shalonghuodong.png | 0
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html | 4 ++--
zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png | 0
9 files changed, 19 insertions(+), 19 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 1e81b08..e027a03 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
@@ -113,7 +113,7 @@
@ApiResponse(code = 200, message = "ok", response = SignSuccessVo.class)
})
- @GetMapping(value = "/clickSign")
+ @GetMapping(value = "/clickSign/{actId}")
@ResponseBody
@Transactional
public AjaxResult clickSign(@PathVariable("actId") long actId) {
@@ -152,9 +152,9 @@
ActivitySignRecord activitySignRecordOld = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,offsetDay);
ActivitySignRecord activitySignRecordAdd = new ActivitySignRecord();
activitySignRecordAdd.setCompanyId(companyId);
- activitySignRecordAdd.setCreateBy(user.getName());
+ activitySignRecordAdd.setCreateBy(user.getVipName());
activitySignRecordAdd.setCreateTime(new Date());
- activitySignRecordAdd.setUpdateBy(user.getName());
+ activitySignRecordAdd.setUpdateBy(user.getVipName());
activitySignRecordAdd.setUpdateTime(new Date());
activitySignRecordAdd.setActivityId(actId);
activitySignRecordAdd.setSignTime(date);
@@ -187,9 +187,9 @@
activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
activitySignReceiveRecord.setActivityId(actId);
activitySignReceiveRecord.setCompanyId(companyId);
- activitySignReceiveRecord.setCreateBy(user.getName());
+ activitySignReceiveRecord.setCreateBy(user.getVipName());
activitySignReceiveRecord.setCreateTime(new Date());
- activitySignReceiveRecord.setUpdateBy(user.getName());
+ activitySignReceiveRecord.setUpdateBy(user.getVipName());
activitySignReceiveRecord.setUpdateTime(new Date());
activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
@@ -228,9 +228,9 @@
activitySignReceiveRecord.setActivityId(actId);
activitySignReceiveRecord.setCompanyId(companyId);
activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
- activitySignReceiveRecord.setCreateBy(user.getName());
+ activitySignReceiveRecord.setCreateBy(user.getVipName());
activitySignReceiveRecord.setCreateTime(new Date());
- activitySignReceiveRecord.setUpdateBy(user.getName());
+ activitySignReceiveRecord.setUpdateBy(user.getVipName());
activitySignReceiveRecord.setUpdateTime(new Date());
/**
* 奖项类型（1：自定义产品2：积分3：优惠券4：店铺商品）
@@ -296,9 +296,9 @@
activitySignWriteoff.setUserId(userId);
activitySignWriteoff.setCompanyId(companyId);
activitySignWriteoff.setReceiveId(activitySignReceiveRecord.getId());
- activitySignWriteoff.setCreateBy(user.getName());
+ activitySignWriteoff.setCreateBy(user.getVipName());
activitySignWriteoff.setCreateTime(new Date());
- activitySignWriteoff.setUpdateBy(user.getName());
+ activitySignWriteoff.setUpdateBy(user.getVipName());
activitySignWriteoff.setUpdateTime(new Date());
activitySignWriteoffDao.insert(activitySignWriteoff);
}
diff --git a/zq-erp/src/main/resources/static/images/sign/jisumiaosha.png b/zq-erp/src/main/resources/static/images/sign/jisumiaosha.png
new file mode 100644
index 0000000..f690d6f
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/jisumiaosha.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/meiriqiandao.png b/zq-erp/src/main/resources/static/images/sign/meiriqiandao.png
new file mode 100644
index 0000000..b338432
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/meiriqiandao.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/shalonghuodong.png b/zq-erp/src/main/resources/static/images/sign/shalonghuodong.png
new file mode 100644
index 0000000..19e4579
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/shalonghuodong.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/signButton.png b/zq-erp/src/main/resources/static/images/sign/signButton.png
new file mode 100644
index 0000000..3021259
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/signButton.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/signHead.png b/zq-erp/src/main/resources/static/images/sign/signHead.png
new file mode 100644
index 0000000..9e31b32
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/signHead.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png b/zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png
new file mode 100644
index 0000000..83dfcd5
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png
Binary files differ
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
index d1658b5..da643c9 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
@@ -56,7 +56,7 @@
<el-row>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="imageUrlqd" class="image">
+ <img src="../../images/sign/meiriqiandao.png" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">每日签到</span>
<div class="bottom clearfix">
@@ -67,7 +67,7 @@
</el-col>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="imageUrlpt" class="image">
+ <img src="../../images/sign/tiantianpingtuan.png" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">拼团</span>
<div class="bottom clearfix">
@@ -78,7 +78,7 @@
</el-col>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="imageUrlms" class="image">
+ <img src="../../images/sign/jisumiaosha.png" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">秒杀</span>
<div class="bottom clearfix">
@@ -89,7 +89,7 @@
</el-col>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="imageUrlsl" class="image">
+ <img src="../../images/sign/shalonghuodong.png" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">沙龙</span>
<div class="bottom clearfix">
@@ -116,10 +116,10 @@
var app = new Vue({
el: '#app',
data: {
- imageUrlqd: basePath + "/image/meiriqiandao.png",
- imageUrlms: basePath + "/image/jisumiaosha.png",
- imageUrlpt: basePath + "/image/tiantianpingtuan.png",
- imageUrlsl: basePath + "/image/shalonghuodong.png",
+ imageUrlqd: "../../images/sign/meiriqiandao.png",
+ imageUrlms: "../../images/sign/jisumiaosha.png",
+ imageUrlpt: "../../images/sign/tiantianpingtuan.png",
+ imageUrlsl: "../../images/sign/shalonghuodong.png",
},
created: function () {
},
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
index eba3a4c..2f29dca 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
@@ -616,8 +616,8 @@
//标题图片
imageUrlTitle: '',
- imageUrlHead: basePath + "/image/signHead.png",
- imageUrlButton: basePath + "/image/signButton.png",
+ imageUrlHead: "../../images/sign/signHead.png",
+ imageUrlButton: "../../images/sign/signButton.png",
imageUrlState: '',
//字体颜色
--
Gitblit v1.9.1