Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/entity/CompanyVO.java

@@ -401,7 +401,7 @@ public class CompanyVO extends PageInfo<CompanyVO> implements Serializable {
     @ApiModelProperty(value = "分享的截止日期时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime shareEndTime;
+    private LocalDateTime shareEndDate;
 
 
     /*

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -272,9 +272,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         UserLogin userLogin = userMapper.selectById(companyVO.getOwner());
 
         //  来源公司Id 分享的截止日期时间 是否超过 当前的日期时间 说明过期了，过期不加积分 240724
-        log.info("邀请分享的记录：原公司id：{},截止日期：{},当前时间：{},",companyVO.getCpIdFrom(),companyVO.getShareEndTime(),LocalDateTime.now());
-        if (companyVO.getCpIdFrom() != null && companyVO.getShareEndTime() != null
-                && companyVO.getShareEndTime().compareTo(LocalDateTime.now()) > 0) {
+        log.info("邀请分享的记录：原公司id：{},截止日期：{},当前时间：{},",companyVO.getCpIdFrom(),companyVO.getShareEndDate(),LocalDateTime.now());
+        if (companyVO.getCpIdFrom() != null && companyVO.getShareEndDate() != null
+                && companyVO.getShareEndDate().compareTo(LocalDateTime.now()) > 0) {
             // 积分策略 share_reg_integral	 分享注册积分
             List<IntegralTacticResponse> integralTacticResponses = integralTacticMapper.selectByCond(new IntegralTacticQuery());
             log.info("积分策略：{},",integralTacticResponses);
@@ -730,7 +730,11 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
      */
     public ResponseResultVO<Map<String, Object>> getCurrentDate(Map<String, Object> param) {
         Map<String, Object> res = new HashMap<>();
-        res.put("currentDate", LocalDate.now());
+        if (param.get("flgTime") !=null){
+            res.put("currentDate", LocalDateTime.now());
+        }else{
+            res.put("currentDate", LocalDate.now());
+        }
         return ResponseResultUtil.success(res);
     }
 }