xiaoyong931011
2021-04-16 e4094cb5ca20c181856058fa99cbaedd85e58d12
20210416 签到
6 files added
3 files modified
38 ■■■■ changed files
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 18 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/jisumiaosha.png patch | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/meiriqiandao.png patch | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/shalonghuodong.png patch | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/signButton.png patch | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/signHead.png patch | view | raw | blame | history
zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html 16 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html 4 ●●●● patch | view | raw | blame | history
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);
            }
zq-erp/src/main/resources/static/images/sign/jisumiaosha.png
zq-erp/src/main/resources/static/images/sign/meiriqiandao.png
zq-erp/src/main/resources/static/images/sign/shalonghuodong.png
zq-erp/src/main/resources/static/images/sign/signButton.png
zq-erp/src/main/resources/static/images/sign/signHead.png
zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png
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 () {
        },
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: '',
            //字体颜色