bug优化

flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml

@@ -202,10 +202,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="siteType != null">site_type = #{siteType},</if>
             <if test="siteName != null">site_name = #{siteName},</if>
             <if test="fileUrl != null">file_url = #{fileUrl},</if>
-            <if test="siteStartTime != null">site_start_time = #{siteStartTime},</if>
-            <if test="siteEndTime != null">site_end_time = #{siteEndTime},</if>
-            <if test="userRegisterStartTime != null">user_register_start_time = #{userRegisterStartTime},</if>
-            <if test="userRegisterEndTime != null">user_register_end_time = #{userRegisterEndTime},</if>
+            site_start_time = #{siteStartTime},
+            site_end_time = #{siteEndTime},
+            user_register_start_time = #{userRegisterStartTime},
+            user_register_end_time = #{userRegisterEndTime},
             <if test="openType != null">open_type = #{openType},</if>
             <if test="pushType != null">push_type = #{pushType},</if>
             <if test="pushNumber != null">push_number = #{pushNumber},</if>

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);
     }
 }

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java

@@ -51,8 +51,10 @@ public class CtLeaveMessageController extends BaseController
 //        List<CtLeaveMessage> list = ctLeaveMessageService.selectCtLeaveMessageList(ctLeaveMessage);
         List<CtLeaveMessage> 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);
             }
         }

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<SiteInfo> list = siteInfoService.selectSiteInfoList(siteInfo);
+        for(SiteInfo site : list) {
+            if (StringUtils.isNotEmpty(site.getPushTimer())) {
+                List<String> 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);
     }
 

flossom-ui/src/views/system/siteCarouselInfo/index.vue

@@ -215,7 +215,7 @@
           >
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <div class="el-upload__tip" slot="tip">请上传启动页介绍图片，建议尺寸为330px*460p</div>
+            <div class="el-upload__tip" slot="tip">只能上传jpg/png图片，建议尺寸300px*400px</div>
           </el-upload>
         </el-form-item>
         <el-form-item label="标题" prop="siteName">

flossom-ui/src/views/system/siteInfo/index.vue

@@ -227,7 +227,7 @@
         <el-form-item label="标题" prop="siteName">
           <el-input v-model="form.siteName" placeholder="请输入标题" style="width: 80%" maxlength="21"/>
         </el-form-item>
-        <el-form-item label="开启时间" prop="siteStartTime">
+        <el-form-item label="开启时间" prop="startTime">
           <el-date-picker
             v-model="form.startTime"
             type="datetimerange"
@@ -238,7 +238,7 @@
             end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="用户注册时间" prop="userRegisterStartTime" label-width="100px">
+        <el-form-item label="用户注册时间" prop="registerTime" label-width="100px">
           <el-date-picker
             v-model="form.registerTime"
             type="datetimerange"
@@ -705,10 +705,16 @@ export default {
           if(this.form.startTime && this.form.startTime.length > 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;