1、增加发票消息推送处理

citu-module-member/citu-module-member-biz/pom.xml

@@ -52,6 +52,12 @@
             <version>${revision}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>menduner-im-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <!-- 业务组件 -->
         <dependency>
             <groupId>com.citu</groupId>

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/admin/invoice/vo/AdminInvoiceListPageReqVO.java

@@ -32,6 +32,9 @@ public class AdminInvoiceListPageReqVO extends PageParam {
     @Schema(description = "用户编号", example = "10764")
     private Long userId;
 
+    @Schema(description = "企业编号", example = "10764")
+    private Long enterpriseId;
+
     @Schema(description = "发票状态 0.开票中  1.已开票  2.拒绝开票")
     private Integer statue;
 

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceListPageReqVO.java

@@ -29,6 +29,9 @@ public class InvoiceListPageReqVO extends PageParam {
     @Schema(description = "用户编号", example = "10764")
     private Long userId;
 
+    @Schema(description = "企业编号", example = "10764")
+    private Long enterpriseId;
+
     @Schema(description = "发票状态 0.开票中  1.已开票  2.拒绝开票")
     private Integer statue;
 

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceListRespVO.java

@@ -39,6 +39,10 @@ public class InvoiceListRespVO {
     @ExcelProperty("用户编号")
     private Long userId;
 
+    @Schema(description = "企业编号", example = "10764")
+    @ExcelProperty("企业编号")
+    private Long enterpriseId;
+
     @Schema(description = "发票状态 0.开票中  1.已开票  2.拒绝开票")
     @ExcelProperty("发票状态 0.开票中   1.已开票  2.拒绝开票")
     private Integer status;

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceListSaveReqVO.java

@@ -1,9 +1,7 @@
 package com.citu.module.member.controller.app.invoice.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 发票清单新增/修改 Request VO")
 @Data
@@ -38,7 +36,6 @@ public class InvoiceListSaveReqVO {
     private Long payOrderId;
 
 
-
     /**
      * 单位地址
      */
@@ -48,17 +45,17 @@ public class InvoiceListSaveReqVO {
     /**
      * 单位电话
      */
-    private String        enterprisePhone;
+    private String enterprisePhone;
 
     /**
-     *企业开户行名称
+     * 企业开户行名称
      */
     private String enterpriseBankTitle;
 
     /**
-     *银行基本户账号
+     * 银行基本户账号
      */
-    private String        enterpriseBankNo;
+    private String enterpriseBankNo;
 
 
     private Integer type;

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceTitlePageReqVO.java

@@ -33,6 +33,9 @@ public class InvoiceTitlePageReqVO extends PageParam {
     @Schema(description = "用户编号", example = "18709")
     private Long userId;
 
+    @Schema(description = "企业编号", example = "10764")
+    private Long enterpriseId;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceTitleRespVO.java

@@ -1,12 +1,11 @@
 package com.citu.module.member.controller.app.invoice.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 发票抬头 Response VO")
 @Data
@@ -41,6 +40,10 @@ public class InvoiceTitleRespVO {
     @ExcelProperty("用户编号")
     private Long userId;
 
+    @Schema(description = "企业编号", example = "10764")
+    @ExcelProperty("企业编号")
+    private Long enterpriseId;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
@@ -49,23 +52,22 @@ public class InvoiceTitleRespVO {
     /**
      * 单位地址
      */
-
     private String enterpriseAddress;
 
     /**
      * 单位电话
      */
-    private String        enterprisePhone;
+    private String enterprisePhone;
 
     /**
-     *企业开户行名称
+     * 企业开户行名称
      */
     private String enterpriseBankTitle;
 
     /**
-     *银行基本户账号
+     * 银行基本户账号
      */
-    private String        enterpriseBankNo;
+    private String enterpriseBankNo;
 
 
     /**

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/invoice/vo/InvoiceTitleSaveReqVO.java

@@ -31,6 +31,9 @@ public class InvoiceTitleSaveReqVO {
     @NotNull(message = "用户编号不能为空")
     private Long userId;
 
+    @Schema(description = "企业编号", example = "10764")
+    private Long enterpriseId;
+
     private Integer type;
 
 

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/dal/dataobject/invoice/InvoiceListDO.java

@@ -51,6 +51,10 @@ public class InvoiceListDO extends BaseDO {
      * 用户编号
      */
     private Long userId;
+    /**
+     * 企业编号
+     */
+    private Long enterpriseId;
     /**
      * 发票状态 0.开票中  1.已开票  2.拒绝开票
      */

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/dal/dataobject/invoice/InvoiceTitleDO.java

@@ -51,7 +51,10 @@ public class InvoiceTitleDO extends BaseDO {
      * 用户编号
      */
     private Long userId;
-
+    /**
+     * 企业编号
+     */
+    private Long enterpriseId;
     /**
      * 单位地址
      */

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/framework/rpc/config/RpcConfiguration.java

@@ -1,7 +1,9 @@
 package com.citu.module.member.framework.rpc.config;
 
+import com.citu.module.menduner.im.api.ImMessageApi;
 import com.citu.module.pay.api.order.PayOrderApi;
 import com.citu.module.system.api.logger.LoginLogApi;
+import com.citu.module.system.api.notify.NotifyMessageSendApi;
 import com.citu.module.system.api.sms.SmsCodeApi;
 import com.citu.module.system.api.social.SocialClientApi;
 import com.citu.module.system.api.social.SocialUserApi;
@@ -9,6 +11,13 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {PayOrderApi.class,SmsCodeApi.class, LoginLogApi.class, SocialUserApi.class, SocialClientApi.class})
+@EnableFeignClients(clients = {PayOrderApi.class,
+        SmsCodeApi.class,
+        LoginLogApi.class,
+        SocialUserApi.class,
+        SocialClientApi.class,
+        NotifyMessageSendApi.class,
+        ImMessageApi.class
+})
 public class RpcConfiguration {
 }

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/invoice/InvoiceListServiceImpl.java

@@ -1,5 +1,6 @@
 package com.citu.module.member.service.invoice;
 
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.citu.framework.common.pojo.PageResult;
@@ -11,15 +12,25 @@ import com.citu.module.member.controller.app.invoice.vo.InvoiceListPageReqVO;
 import com.citu.module.member.controller.app.invoice.vo.InvoiceListSaveReqVO;
 import com.citu.module.member.dal.dataobject.invoice.InvoiceListDO;
 import com.citu.module.member.dal.mysql.invoice.InvoiceListMapper;
+import com.citu.module.menduner.common.CommonConstants;
+import com.citu.module.menduner.im.api.ImCollectMessageReqVo;
+import com.citu.module.menduner.im.api.ImCollectUserReqVo;
+import com.citu.module.menduner.im.api.ImMessageApi;
 import com.citu.module.pay.api.order.PayOrderApi;
 import com.citu.module.pay.api.order.dto.PayOrderBaseRespDTO;
+import com.citu.module.system.api.notify.NotifyMessageSendApi;
+import com.citu.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.member.enums.ErrorCodeConstants.*;
+import static com.citu.module.menduner.common.CommonConstants.*;
 
 ;
 
@@ -38,6 +49,11 @@ public class InvoiceListServiceImpl implements InvoiceListService {
     @Resource
     private PayOrderApi payOrderApi;
 
+    @Resource
+    private NotifyMessageSendApi notifyMessageSendApi;
+
+    @Resource
+    private ImMessageApi imMessageApi;
 
     @Override
     public Long createInvoiceList(InvoiceListSaveReqVO createReqVO) {
@@ -61,10 +77,24 @@ public class InvoiceListServiceImpl implements InvoiceListService {
         // 插入
         InvoiceListDO invoiceList = BeanUtils.toBean(createReqVO, InvoiceListDO.class);
         invoiceList.setUserId(loginUserId);
+        invoiceList.setEnterpriseId(SecurityFrameworkUtils.getLoginUserDataId());
         invoiceList.setStatus(0);
         invoiceList.setPrice(data.getPrice());
         invoiceListMapper.insert(invoiceList);
-        // 返回
+        // 发送系统通知
+        NotifySendSingleToUserReqDTO reqDTO =  new NotifySendSingleToUserReqDTO()
+                .setTemplateCode(NOTIFY_SYS_INVOICE)
+                .setTemplateParams(
+                        MapUtil.<String, Object>builder()
+                                .put("1", invoiceList.getPrice()/100)
+                                .put("2",  invoiceList.getTitle())
+                                .build()
+                );
+        for (Long userId : CommonConstants.notifySysUserId) {
+            reqDTO.setUserId(userId);
+            notifyMessageSendApi.sendSingleMessageToAdmin(reqDTO);
+        }
+
         return invoiceList.getId();
     }
 
@@ -99,6 +129,7 @@ public class InvoiceListServiceImpl implements InvoiceListService {
     @Override
     public PageResult<InvoiceListDO> getInvoiceListPage(InvoiceListPageReqVO pageReqVO) {
         pageReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setEnterpriseId(SecurityFrameworkUtils.getLoginUserDataId());
         return invoiceListMapper.selectPage(pageReqVO);
     }
 
@@ -121,6 +152,18 @@ public class InvoiceListServiceImpl implements InvoiceListService {
         int update = invoiceListMapper.update(null, new LambdaUpdateWrapper<InvoiceListDO>()
                 .eq(InvoiceListDO::getId, reqVo.getId()).set(InvoiceListDO::getFileUrl, reqVo.getFileUrl()).set(InvoiceListDO::getStatus, reqVo.getStatus()));
 
+        if (update > 0) {
+            // 发送im系统消息
+            ImCollectMessageReqVo imCollectMessageReqVo = new ImCollectMessageReqVo();
+            List<ImCollectUserReqVo> userVoList = new ArrayList<>();
+            ImCollectUserReqVo userVo = new ImCollectUserReqVo();
+            userVo.setUserId(invoiceListDO.getUserId());
+            userVo.setEnterpriseId(invoiceListDO.getEnterpriseId());
+            userVoList.add(userVo);
+            imCollectMessageReqVo.setUserVoList(userVoList);
+            imCollectMessageReqVo.setMessage(IM_SYS_ENTERPRISE_INVOICE_TEMPLATE);
+            imMessageApi.systemMessage(imCollectMessageReqVo);
+        }
         return update;
     }
 

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/invoice/InvoiceTitleServiceImpl.java

@@ -32,6 +32,7 @@ public class InvoiceTitleServiceImpl implements InvoiceTitleService {
         // 插入
         InvoiceTitleDO invoiceTitle = BeanUtils.toBean(createReqVO, InvoiceTitleDO.class);
         invoiceTitle.setUserId(SecurityFrameworkUtils.getLoginUserId());
+        invoiceTitle.setEnterpriseId(SecurityFrameworkUtils.getLoginUserDataId());
         invoiceTitleMapper.insert(invoiceTitle);
         // 返回
         return invoiceTitle.getId();
@@ -44,7 +45,7 @@ public class InvoiceTitleServiceImpl implements InvoiceTitleService {
         // 更新
         InvoiceTitleDO updateObj = BeanUtils.toBean(updateReqVO, InvoiceTitleDO.class);
         updateObj.setUserId(SecurityFrameworkUtils.getLoginUserId());
-
+        updateObj.setEnterpriseId(SecurityFrameworkUtils.getLoginUserDataId());
         invoiceTitleMapper.updateById(updateObj);
     }
 
@@ -70,6 +71,7 @@ public class InvoiceTitleServiceImpl implements InvoiceTitleService {
     @Override
     public PageResult<InvoiceTitleDO> getInvoiceTitlePage(InvoiceTitlePageReqVO pageReqVO) {
         pageReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setEnterpriseId(SecurityFrameworkUtils.getLoginUserDataId());
         return invoiceTitleMapper.selectPage(pageReqVO);
     }
 

citu-module-member/citu-module-member-biz/src/main/resources/application-local.yaml

@@ -64,7 +64,7 @@ spring:
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
-    host: 127.0.0.1 # 地址
+    host: 192.168.3.80 # 地址
     port: 6379 # 端口
     database: 0 # 数据库索引
 #    password: 123456 # 密码，建议生产环境开启

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/CommonConstants.java → menduner/menduner-common/src/main/java/com/citu/module/menduner/common/CommonConstants.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.enums;
+package com.citu.module.menduner.common;
 
 import java.util.ArrayList;
 import java.util.HashMap;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/resume/AppPersonAdvantageSaveReqVO.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank;
 @Schema(description = "menduner 人才简历-人才优势 Request VO")
 public class AppPersonAdvantageSaveReqVO {
 
-    @NotBlank(message = "{1_100_001_002}")
+//    @NotBlank(message = "{1_100_001_002}")
     @Schema(description = "人才优势", example = "我是人才优势")
     private String content;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeEnterpriseAuthServiceImpl.java

@@ -16,7 +16,7 @@ import com.citu.module.menduner.system.controller.app.common.auth.vo.AppMdeAuthL
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
-import com.citu.module.menduner.system.enums.CommonConstants;
+import com.citu.module.menduner.common.CommonConstants;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.enterprise.register.EnterpriseRegisterService;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java

@@ -43,7 +43,7 @@ import java.util.ArrayList;
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getTerminal;
-import static com.citu.module.menduner.system.enums.CommonConstants.NOTIFY_SYS_ENTERPRISE_REGISTER;
+import static com.citu.module.menduner.common.CommonConstants.NOTIFY_SYS_ENTERPRISE_REGISTER;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 
 /**

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/interview/InterviewInviteServiceImpl.java

@@ -40,6 +40,7 @@ import com.citu.module.pay.enums.wallet.PayWalletBizTypeEnum;
 import com.citu.module.system.api.social.dto.SocialWxaSubscribeMessageSendReqDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -55,7 +56,7 @@ import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exce
 import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY3;
 import static com.citu.framework.common.util.validation.ValidationUtils.isMobile;
 import static com.citu.module.menduner.common.util.TimeUtils.generateDateTimeRange;
-import static com.citu.module.menduner.system.enums.CommonConstants.*;
+import static com.citu.module.menduner.common.CommonConstants.*;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -285,19 +286,23 @@ public class InterviewInviteServiceImpl implements InterviewInviteService {
         interviewInvite.setInviteUserId(userId);
         JobAdvertisedDO job = jobAdvertisedService.getJobAdvertised(interviewInvite.getJobId());
         EnterpriseDO enterprise = enterpriseService.getEnterprise(interviewInvite.getEnterpriseId());
+        EnterpriseUserContactRespVO contactRespVO = userBindService
+                .getContact(interviewInvite.getEnterpriseId(), interviewInvite.getInviteUserId());
         // 构建消息体
         SocialWxaSubscribeMessageSendReqDTO reqDTO =
                 messageUtils.buildWxSubscribeMessage(reqVO.getUserId(), WX_SUBSCRIBE_INTERVIEW_REMIND_TEMPLATE);
+
         reqDTO = messageUtils.buildWxSubscribeMessageByInterview(reqDTO,
                 job.getName(),
                 interviewInvite.getTime().format(DateTimeFormatter.ofPattern(FORMAT_YEAR_MONTH_DAY3)),
-                interviewInvite.getInvitePhone(),
+                null==contactRespVO?enterprise.getName():contactRespVO.getName(),
                 interviewInvite.getAddress(),
-                interviewInvite.getRemark()
+                StringUtils.hasText(interviewInvite.getRemark())?interviewInvite.getRemark():"面试邀请,请点击查看详情！"
         );
         if (null == reqVO.getId()) {
             mapper.insert(interviewInvite);
             // 发送给求职者
+
             messageUtils.sendSystemImAndWxSubscribeMessage(reqVO.getUserId(),
                     null,
                     StrUtil.format(IM_SYS_INTERVIEW_INVITE_TEMPLATE,

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobCvRelServiceImpl.java

@@ -44,7 +44,7 @@ import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exce
 import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY3;
 import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.citu.module.menduner.common.util.TimeUtils.generateDateTimeRange;
-import static com.citu.module.menduner.system.enums.CommonConstants.*;
+import static com.citu.module.menduner.common.CommonConstants.*;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 import static com.citu.module.menduner.system.util.RecruitAnalysisUtils.packBarCount;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/ResumeServiceImpl.java

@@ -15,6 +15,7 @@ import com.citu.module.menduner.system.service.person.info.PersonInfoService;
 import com.citu.module.menduner.system.service.trainexp.TrainExpService;
 import com.citu.module.menduner.system.service.workexp.WorkExpService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -51,39 +52,53 @@ public class ResumeServiceImpl implements ResumeService {
         // 基本信息
         personInfoService.saveInfo(reqVO.getPerson());
         // 人才优势
-        personInfoService.saveAdvantage(reqVO.getAdvantage());
+        if(null != reqVO.getAdvantage()) {
+            personInfoService.saveAdvantage(reqVO.getAdvantage());
+        }
         // 人才标签
-        personInfoService.updateTag(reqVO.getTag());
-        if (reqVO.getAvatar().contains("base64")) {
-            // base64编码
-            // 截取, 之后的所有
-            int index = reqVO.getAvatar().indexOf(", ");
-            byte[] data = Base64Decoder.decode(reqVO.getAvatar().substring(index + 1));
-            // 转为图片地址保存
-            Long userId = LoginUserContext.getUserId();
-            String path = "person/" + userId + "/";
-            String name = reqVO.getAvatar()
-                    .substring(reqVO.getAvatar().length() - 10).replaceAll("/", "") + ".jpg";
-            reqVO.setAvatar(fileApi.createFile(reqVO.getPerson().getName(), path + name, data));
+        if(null!= reqVO.getTag()) {
+            personInfoService.updateTag(reqVO.getTag());
+        }
+        if(null!= reqVO.getAvatar()) {
+            if (reqVO.getAvatar().contains("base64")) {
+                // base64编码
+                // 截取, 之后的所有
+                int index = reqVO.getAvatar().indexOf(",");
+                byte[] data = Base64Decoder.decode(reqVO.getAvatar().substring(index + 1));
+                // 转为图片地址保存
+                Long userId = LoginUserContext.getUserId();
+                String path = "person/" + userId + "/";
+                String name = reqVO.getAvatar()
+                        .substring(reqVO.getAvatar().length() - 10).replaceAll("/", "") + ".jpg";
+                reqVO.setAvatar(fileApi.createFile(reqVO.getPerson().getName(), path + name, data));
+            }
+            // 头像
+            personInfoService.uploadAvatar(reqVO.getAvatar());
         }
-        // 头像
-        personInfoService.uploadAvatar(reqVO.getAvatar());
 
-        for (AppJobInterestedSaveReqVO interestedSaveReqVO : reqVO.getJobInterested()) {
-            // 求职意向
-            jobInterestedService.saveJobInterested(interestedSaveReqVO);
+        if(null != reqVO.getJobInterested()) {
+            for (AppJobInterestedSaveReqVO interestedSaveReqVO : reqVO.getJobInterested()) {
+                // 求职意向
+                jobInterestedService.saveJobInterested(interestedSaveReqVO);
+            }
         }
-        for (AppEduExpSaveReqVO expSaveReqVO : reqVO.getEduExp()) {
-            // 教育经历
-            eduExpService.saveEduExp(expSaveReqVO);
+        if(null != reqVO.getEduExp()) {
+            for (AppEduExpSaveReqVO expSaveReqVO : reqVO.getEduExp()) {
+                // 教育经历
+                eduExpService.saveEduExp(expSaveReqVO);
+            }
         }
-        for (AppWorkExpSaveReqVO expSaveReqVO : reqVO.getWorkExp()) {
-            // 工作经历
-            workExpService.saveWorkExp(expSaveReqVO);
+        if(null != reqVO.getWorkExp()) {
+            for (AppWorkExpSaveReqVO expSaveReqVO : reqVO.getWorkExp()) {
+                // 工作经历
+                workExpService.saveWorkExp(expSaveReqVO);
+            }
         }
-        for (AppTrainExpSaveReqVO trainSaveReqVO : reqVO.getTrainExp()) {
-            // 培训经历
-            trainExpService.saveTrainExp(trainSaveReqVO);
+        if(null != reqVO.getTrainExp()) {
+            for (AppTrainExpSaveReqVO trainSaveReqVO : reqVO.getTrainExp()) {
+                // 培训经历
+                trainExpService.saveTrainExp(trainSaveReqVO);
+            }
         }
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/redeem/RedeemServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.CommonConstants.NOTIFY_SYS_POINT_REDEEM;
+import static com.citu.module.menduner.common.CommonConstants.NOTIFY_SYS_POINT_REDEEM;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_REQUEST_ILLEGAL;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.REDEEM_NOT_EXISTS;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/task/EnterpriseEmailNoticeTask.java

@@ -6,7 +6,7 @@ import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseEntitlementDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
-import com.citu.module.menduner.system.enums.CommonConstants;
+import com.citu.module.menduner.common.CommonConstants;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.enterprise.vip.EnterpriseEntitlementService;
 import com.citu.module.system.api.mail.MailSendApi;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/util/MessageUtils.java

@@ -4,7 +4,7 @@ import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.module.menduner.im.api.ImCollectMessageReqVo;
 import com.citu.module.menduner.im.api.ImCollectUserReqVo;
 import com.citu.module.menduner.im.api.ImMessageApi;
-import com.citu.module.menduner.system.enums.CommonConstants;
+import com.citu.module.menduner.common.CommonConstants;
 import com.citu.module.system.api.notify.NotifyMessageSendApi;
 import com.citu.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
 import com.citu.module.system.api.social.SocialClientApi;
@@ -16,7 +16,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.citu.module.menduner.system.enums.CommonConstants.WX_SUBSCRIBE_TEMPLATE_PAGE;
+import static com.citu.module.menduner.common.CommonConstants.WX_SUBSCRIBE_TEMPLATE_PAGE;
 
 /**
  * 消息通知

menduner/menduner-system-biz/src/main/resources/application-local.yaml

@@ -64,7 +64,7 @@ spring:
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
-    host: 192.168.3.80 # 地址
+    host: 127.0.0.1 # 地址
     port: 6379 # 端口
     database: 1 # 数据库索引
 #    password: 123456 # 密码，建议生产环境开启