1.优化

@@ -95,7 +95,15 @@ public class MemberServiceImpl implements MemberService {
         if(Objects.isNull(id) && StringUtils.isBlank(memberCode))
         if(Objects.isNull(id) && StringUtils.isBlank(memberCode))
             throw new BadRequestException(GlobeExceptionMsg.MEMBER_ID_AND_CODE_ARE_NULL);
             throw new BadRequestException(GlobeExceptionMsg.MEMBER_ID_AND_CODE_ARE_NULL);
 
 
-        return this.findByIdOrCode(id, memberCode);
+        if (StringUtils.isNotBlank(memberCode)) {
+            MemberDTO memberDTO = this.findByCode(memberCode);
+            return memberDTO;
+        } else if (Objects.nonNull(id)) {
+            MemberDTO memberDTO = this.findById(id);
+            return memberDTO;
+        }
+
+        return null;
     }
     }
 
 
     @Override
     @Override

 package com.topdraw.business.process.domian.member;
 package com.topdraw.business.process.domian.member;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
 /**
 /**
  * @author ：
  * @author ：
  * @description：
  * @description：
@@ -18,4 +22,7 @@ public class MemberOperationBean {
 
 
     private Integer vip;
     private Integer vip;
 
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime vipExpireTime;
+
 }
 }

@@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.Objects;
 import java.util.Objects;
 
 
 @Api("会员处理")
 @Api("会员处理")
@@ -33,19 +35,25 @@ public class MemberOperationController {
     private MemberOperationService memberOperationService;
     private MemberOperationService memberOperationService;
 
 
     @Log("手动修改vip")
     @Log("手动修改vip")
-    @RequestMapping(value = "/doUpdateVipByMemberId")
+    @RequestMapping(value = "/updateVipByMemberId")
     @ApiOperation("手动修改vip")
     @ApiOperation("手动修改vip")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultInfo doUpdateVipByMemberId(@Validated(value = {UpdateGroup.class}) @RequestBody MemberOperationBean resources) {
+    public ResultInfo updateVipByMemberId(@Validated(value = {UpdateGroup.class}) @RequestBody MemberOperationBean resources) {
         log.info("member ==>> doUpdateVipByCode ==>> param ==>> [{}]",resources);
         log.info("member ==>> doUpdateVipByCode ==>> param ==>> [{}]",resources);
-
+        Integer vip = resources.getVip();
+        LocalDateTime vipExpireTime = resources.getVipExpireTime();
         Long memberId = resources.getMemberId();
         Long memberId = resources.getMemberId();
         MemberDTO memberDTO = this.memberOperationService.findById(memberId);
         MemberDTO memberDTO = this.memberOperationService.findById(memberId);
 
 
         Member member = new Member();
         Member member = new Member();
         BeanUtils.copyProperties(memberDTO, member);
         BeanUtils.copyProperties(memberDTO, member);
+        if (Objects.nonNull(vip)) {
+            member.setVip(vip);
+        }
+        if (Objects.nonNull(vipExpireTime)) {
+            member.setVipExpireTime(vipExpireTime);
+        }
         this.memberOperationService.update(member);
         this.memberOperationService.update(member);
-        log.info("member ==>> doUpdateVipByCode ==>> result ==>> [{}]",resources);
         return ResultInfo.success();
         return ResultInfo.success();
     }
     }