Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-20 c161f76f78fead2519b8a66ab30d6e7389deead1

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java

@@ -108,6 +108,13 @@
         *      获取当前月份的天数
         */
        List<ActivitySignRecordVo> activitySignRecordVos = new ArrayList<>();
        //获取当前月的第一天是星期几
        DateTime dateTime = DateUtil.beginOfMonth(DateUtil.date());
        int i = DateUtil.dayOfWeek(dateTime);
        for(int j = 1;j<i;j++){
            ActivitySignRecordVo activitySignRecordVoNull = new ActivitySignRecordVo();
            activitySignRecordVos.add(activitySignRecordVoNull);
        }
        List<String> monthFullDays = getMonthFullDay(DateUtil.year(DateUtil.date()), DateUtil.month(DateUtil.date()) + 1);
        for(String monthFullDay : monthFullDays){
            ActivitySignRecordVo activitySignRecordVo = new ActivitySignRecordVo();
@@ -256,7 +263,8 @@
           activitySignReceiveRecord.setUpdateBy(user.getVipName());
           activitySignReceiveRecord.setUpdateTime(new Date());
           activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
        	

            signSuccessVo.setScoreCnt(activitySignAwardSetNormal.getScoreCnt());
           signSuccessVo.setNormalAwardName(activitySignAwardSetNormal.getAwardName());
           signSuccessVo.setNormalAwardImg(activitySignAwardSetNormal.getIntroduceImg());
        }