TASK:AiDA

src/main/java/com/ai/da/controller/AccountController.java

@@ -310,4 +310,18 @@ public class AccountController {
     public Response<AccountLoginVO> getAccountDetail() {
         return Response.success(accountService.getAccountDetail());
     }
+
+    @CrossOrigin
+    @GetMapping("/bindGoogle")
+    @ApiOperation(value = "绑定谷歌")
+    public Response<AccountLoginVO> bindGoogle(@RequestParam("credential") String credential) {
+        return Response.success(accountService.bindGoogle(credential));
+    }
+
+    @CrossOrigin
+    @GetMapping("/bindWeChat")
+    @ApiOperation(value = "绑定微信")
+    public Response<AccountLoginVO> bindWeChat(@RequestParam("code") String code) {
+        return Response.success(accountService.bindWeChat(code));
+    }
 }

src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java

@@ -67,4 +67,8 @@ public class ReDesignCollectionDTO {
     private String moodboardPosition;
 
     private String moodTemplateId;
+
+    private List<String> requestIdList;
+
+    private Integer designNum;
 }

src/main/java/com/ai/da/service/AccountService.java

@@ -208,4 +208,8 @@ public interface AccountService extends IService<Account> {
     AccountLoginVO parseWeChatCode(String code);
 
     AccountLoginVO getAccountDetail();
+
+    AccountLoginVO bindGoogle(String credential);
+
+    AccountLoginVO bindWeChat(String code);
 }

src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

@@ -1503,6 +1503,16 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         }
     }
 
+    public static void main(String[] args) {
+        List<String> a = new ArrayList<>();
+        a.add("1023316923@qq.com");
+        a.add("Malinyuquan@gmail.com");
+
+        if (a.contains("malinyuquan@gmail.com")) {
+            log.info("aaaaaaaaaaaaaaaaaaaaa");
+        }
+    }
+
     private static final String QUERY_PAID_CUSTOMER_EMAIL = "SELECT  distinct c.email " +
             "FROM `pmr_wc_order_stats` o " +
             "inner join `pmr_wc_customer_lookup` c " +
@@ -2400,8 +2410,21 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         response.setAvatar(minioUtil.getPreSignedUrl(avatar, CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
         response.setFolloweeCount(portfolioService.getFolloweeCount(account.getId()));
         response.setFollowerCount(portfolioService.getFollowerCount(account.getId()));
+        response.setSystemUser(1);
         //判断是否常用ip  不是则发邮件提示
 //        calculateExceptionIp(RequestInfoUtil.getIpAddress(request), account);
+
+
         return response;
     }
+
+    @Override
+    public AccountLoginVO bindGoogle(String credential) {
+        return null;
+    }
+
+    @Override
+    public AccountLoginVO bindWeChat(String code) {
+        return null;
+    }
 }

src/main/java/com/ai/da/service/impl/DesignServiceImpl.java

@@ -1562,8 +1562,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean receiveDesignResults(JSONObject responseJSONObject) {
-        String requestId = "UUID.randomUUID().toString()";
+//        String requestId = "UUID.randomUUID().toString()";
-//        String requestId = responseJSONObject.getString("requestId");
+        String requestId = responseJSONObject.getString("requestId");
         Map<String, Object> context;
         synchronized (designContext) {
             log.info(designContext.toString());