blame | history | patch | commit | commitdiff | ignore whitespace
Helius
2021-04-19 815b7f21921c620e7605c461a3c4b4bbc4a26494 
 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);


           }