1.优化

@@ -138,7 +138,7 @@ public class UserWeixinBuilder {
         userWeixin.setSourceDesc(StringUtils.isNotBlank(sourceDesc)?sourceId:"");
         userWeixin.setSourceDesc(StringUtils.isNotBlank(sourceDesc)?sourceId:"");
         userWeixin.setSourceUser(Objects.nonNull(sourceUser)?sourceUser:0L);
         userWeixin.setSourceUser(Objects.nonNull(sourceUser)?sourceUser:0L);
         userWeixin.setSourceEntity(StringUtils.isNotBlank(sourceEntity)?sourceEntity:"");
         userWeixin.setSourceEntity(StringUtils.isNotBlank(sourceEntity)?sourceEntity:"");
-        userWeixin.setAuthTime(TimestampUtil.now());
+//        userWeixin.setAuthTime(TimestampUtil.now());
         userWeixin.setCountry(StringUtils.isNotBlank(country)?country:"");
         userWeixin.setCountry(StringUtils.isNotBlank(country)?country:"");
         userWeixin.setProvince(StringUtils.isNotBlank(province)?province:"");
         userWeixin.setProvince(StringUtils.isNotBlank(province)?province:"");
         userWeixin.setCity(StringUtils.isNotBlank(city)?city:"");
         userWeixin.setCity(StringUtils.isNotBlank(city)?city:"");

+package com.topdraw.business.process.domian.weixin;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+/**
+ * @author ：
+ * @description：
+ * @function :
+ * @date ：Created in 2022/4/7 12:48
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/4/7 12:48
+ */
+@Data
+public class UserOperationBean {
+
+    private Long userId;
+
+    private Integer vip;
+
+    private Timestamp vipExpireTime;
+}

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.topdraw.annotation.AnonymousAccess;
 import com.topdraw.annotation.AnonymousAccess;
 import com.topdraw.business.module.common.validated.CreateGroup;
 import com.topdraw.business.module.common.validated.CreateGroup;
 import com.topdraw.business.module.common.validated.UpdateGroup;
 import com.topdraw.business.module.common.validated.UpdateGroup;
+import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.user.iptv.domain.UserTv;
 import com.topdraw.business.module.user.iptv.domain.UserTv;
@@ -15,6 +16,7 @@ import com.topdraw.business.module.user.weixin.domain.UserWeixin;
 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
 import com.topdraw.business.process.domian.weixin.*;
 import com.topdraw.business.process.domian.weixin.*;
 import com.topdraw.business.process.service.UserOperationService;
 import com.topdraw.business.process.service.UserOperationService;
+import com.topdraw.business.process.service.member.MemberOperationService;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.config.RedisKeyUtil;
 import com.topdraw.config.RedisKeyUtil;
 import com.topdraw.exception.BadRequestException;
 import com.topdraw.exception.BadRequestException;
@@ -30,6 +32,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -37,18 +40,22 @@ import org.springframework.web.bind.annotation.*;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
+import java.sql.Timestamp;
 import java.util.*;
 import java.util.*;
 
 
 @Api("账户处理")
 @Api("账户处理")
 @RestController
 @RestController
 @RequestMapping(value = "/uce/userOperation")
 @RequestMapping(value = "/uce/userOperation")
 @Slf4j
 @Slf4j
+@CrossOrigin
 public class UserOperationController {
 public class UserOperationController {
 
 
     @Autowired
     @Autowired
     private MemberService memberService;
     private MemberService memberService;
     @Autowired
     @Autowired
     private UserOperationService userOperationService;
     private UserOperationService userOperationService;
+    @Autowired
+    private MemberOperationService memberOperationService;
 
 
     @Autowired
     @Autowired
     private RedisUtils redisUtils;
     private RedisUtils redisUtils;
@@ -57,6 +64,43 @@ public class UserOperationController {
     private static final String UNSUBSCRIBE = "unsubscribe";
     private static final String UNSUBSCRIBE = "unsubscribe";
     private static final Integer SUBSCRIBE_STATUS = 1;
     private static final Integer SUBSCRIBE_STATUS = 1;
 
 
+    @PutMapping(value = "/updateWeixin")
+    @ApiOperation("修改UserWeixin")
+    @AnonymousAccess
+    public ResultInfo updateWeixin(@Validated @RequestBody UserWeixin resources) {
+        userOperationService.updateWeixin(resources);
+        return ResultInfo.success();
+    }
+
+    @RequestMapping(value = "/updateVipByUserId")
+    @ApiOperation("通过账号id修改vip")
+    @AnonymousAccess
+    public ResultInfo updateVipByUserId(@Validated(value = {UpdateGroup.class}) @RequestBody
+                                                    UserOperationBean resources) {
+        log.info("userOperation ==>> updateVipByUserId ==>> param ==>> [{}]",resources);
+
+        Integer vip = resources.getVip();
+        Timestamp vipExpireTime = resources.getVipExpireTime();
+        Long userId = resources.getUserId();
+        UserWeixinDTO userWeixinDTO = this.userOperationService.findById(userId);
+
+        Long memberId = userWeixinDTO.getMemberId();
+        MemberDTO memberDTO = this.memberService.findById(memberId);
+
+        Member member = new Member();
+        BeanUtils.copyProperties(memberDTO, member);
+        if (Objects.nonNull(vip)) {
+            member.setVip(vip);
+        }
+        if (Objects.nonNull(vipExpireTime)) {
+            member.setVipExpireTime(vipExpireTime);
+        }
+
+        this.memberOperationService.update(member);
+
+        return ResultInfo.success();
+    }
+
     @PostMapping(value = "/createWeixinUserAndCreateMember")
     @PostMapping(value = "/createWeixinUserAndCreateMember")
     @ApiOperation("新增小屏账户同时创建会员信息")
     @ApiOperation("新增小屏账户同时创建会员信息")
     @AnonymousAccess
     @AnonymousAccess

@@ -146,4 +146,17 @@ public interface UserOperationService {
      * @param weixinUnBindBean
      * @param weixinUnBindBean
      */
      */
     void minaUnbind(WeixinUnBindBean weixinUnBindBean);
     void minaUnbind(WeixinUnBindBean weixinUnBindBean);
+
+    /**
+     *
+     * @param userId
+     * @return
+     */
+    UserWeixinDTO findById(Long userId);
+
+    /**
+     *
+     * @param resources
+     */
+    UserWeixinDTO updateWeixin(UserWeixin resources);
 }
 }

@@ -1199,4 +1199,21 @@ public class UserOperationServiceImpl implements UserOperationService {
         tvUnBindBean.setPlatformAccount(platformAccount);
         tvUnBindBean.setPlatformAccount(platformAccount);
         this.tvUnbind(tvUnBindBean);
         this.tvUnbind(tvUnBindBean);
     }
     }
+
+    @Override
+    public UserWeixinDTO findById(Long userId) {
+        UserWeixinDTO userWeixinDTO = this.userWeixinService.findById(userId);
+        return userWeixinDTO;
+    }
+
+    @Override
+    public UserWeixinDTO updateWeixin(UserWeixin resources) {
+
+        UserWeixinDTO userWeixinDTO = this.userWeixinService.update(resources);
+
+        // 同步至iptv
+        ((UserOperationServiceImpl)AopContext.currentProxy()).asyncWeixin(userWeixinDTO);
+
+        return userWeixinDTO;
+    }
 }
 }