diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml index 8814660..e035d12 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml @@ -202,10 +202,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" site_type = #{siteType}, site_name = #{siteName}, file_url = #{fileUrl}, - site_start_time = #{siteStartTime}, - site_end_time = #{siteEndTime}, - user_register_start_time = #{userRegisterStartTime}, - user_register_end_time = #{userRegisterEndTime}, + site_start_time = #{siteStartTime}, + site_end_time = #{siteEndTime}, + user_register_start_time = #{userRegisterStartTime}, + user_register_end_time = #{userRegisterEndTime}, open_type = #{openType}, push_type = #{pushType}, push_number = #{pushNumber}, diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java index 5c7dc50..16b6124 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java @@ -59,6 +59,7 @@ public class CtleaveMessageServiceImpl implements ICtleaveMeassageService { ctLeaveMessage.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId()); ctLeaveMessage.setUserImg(SecurityUtils.getLoginUser().getWxUserMember().getHeadimg()); ctLeaveMessage.setUserName(SecurityUtils.getLoginUser().getWxUserMember().getNickname()); + ctLeaveMessage.setUserPhone(SecurityUtils.getLoginUser().getWxUserMember().getMobile()); return ctLeaveMessageMapper.insertCtLeaveMessage(ctLeaveMessage); } } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java index efdc68e..b645d19 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java @@ -51,8 +51,10 @@ public class CtLeaveMessageController extends BaseController // List list = ctLeaveMessageService.selectCtLeaveMessageList(ctLeaveMessage); List list = ctLeaveMessageService.selectCtLeaveMessageByCondition(ctLeaveMessage); for (CtLeaveMessage leaveMessage: list) { + System.out.println("获取到用户id="+leaveMessage.getUserId()); if (Objects.nonNull(leaveMessage.getUserId())) { WxUserMember userMember = wxUserMemberService.selectWxUserMemberByIdInit(leaveMessage.getUserId()); + System.out.println("获取到用户="+userMember); leaveMessage.setWxUserMember(userMember); } } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SiteInfoController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SiteInfoController.java index 031ae86..011ea5b 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SiteInfoController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SiteInfoController.java @@ -2,9 +2,11 @@ package com.flossom.system.controller; import java.util.List; import java.io.IOException; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; import com.flossom.common.core.domain.entity.SiteInfo; +import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -12,7 +14,9 @@ import com.flossom.common.core.web.page.TableDataInfo; import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; +import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -45,6 +49,27 @@ public class SiteInfoController extends BaseController { startPage(); List list = siteInfoService.selectSiteInfoList(siteInfo); + for(SiteInfo site : list) { + if (StringUtils.isNotEmpty(site.getPushTimer())) { + List timeList = Lists.newArrayList(); + String[] pushTimer = site.getPushTimer().split(","); + if(pushTimer.length > 0) { + for (int i=0;i< pushTimer.length;i++) { + String time = pushTimer[i]; + if ("1".equals(time)) { + timeList.add("日"); + } else { + int tureDate = Integer.valueOf(time) - 1 ; + timeList.add(String.valueOf(tureDate)); + } + } + } + if (!CollectionUtils.isEmpty(timeList)) { + String collect = timeList.stream().map(String::valueOf).collect(Collectors.joining(",")); + site.setPushTimer(collect); + } + } + } return getDataTable(list); } diff --git a/flossom-ui/src/views/system/siteCarouselInfo/index.vue b/flossom-ui/src/views/system/siteCarouselInfo/index.vue index 5a94aaf..9ff8675 100644 --- a/flossom-ui/src/views/system/siteCarouselInfo/index.vue +++ b/flossom-ui/src/views/system/siteCarouselInfo/index.vue @@ -215,7 +215,7 @@ >
将文件拖到此处，或点击上传
-
请上传启动页介绍图片，建议尺寸为330px*460p
+
只能上传jpg/png图片，建议尺寸300px*400px
diff --git a/flossom-ui/src/views/system/siteInfo/index.vue b/flossom-ui/src/views/system/siteInfo/index.vue index 033fb60..c08b4bc 100644 --- a/flossom-ui/src/views/system/siteInfo/index.vue +++ b/flossom-ui/src/views/system/siteInfo/index.vue @@ -227,7 +227,7 @@ - + - + 0) { this.form.siteStartTime = this.form.startTime[0]; this.form.siteEndTime = this.form.startTime[1]; + } else { + this.form.siteStartTime = ""; + this.form.siteEndTime = ""; } if(this.form.registerTime && this.form.registerTime.length > 0) { this.form.userRegisterStartTime = this.form.registerTime[0]; this.form.userRegisterEndTime = this.form.registerTime[1]; + } else { + this.form.userRegisterStartTime = ""; + this.form.userRegisterEndTime = ""; } if(this.form.operate) { this.form.operate = 1;