xiugai

src/main/java/cn/quantgroup/customer/rest/UserRest.java

@@ -184,7 +184,8 @@ public class UserRest {
      */
     @PostMapping(value = "/modify/account/status/disable")
     public JsonResult modifyAccountStatusDisable(@RequestParam(required = true) Long userId) {
-        MoResult<Boolean> result = userService.modifyAccountStatusDisable(userId);
+        //MoResult<Boolean> result = userService.modifyAccountStatusDisable(userId);
+        MoResult<Boolean> result = userService.modifyAccountStatusDisableNew(userId);
         if(!result.isSuccess()){
             return JsonResult.buildErrorStateResult(result.getMsg(),result.getData());
         }

src/main/java/cn/quantgroup/customer/service/IUserService.java

@@ -51,6 +51,12 @@ public interface IUserService extends UserDetailsService {
      * @return
      */
     MoResult<Boolean> modifyAccountStatusDisable(Long userId);
+    /**
+     * 注销账户新逻辑
+     * @param userId
+     * @return
+     */
+    MoResult<Boolean> modifyAccountStatusDisableNew(Long userId);
 
     /**
      * 激活账户

src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java

@@ -50,6 +50,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 
+import javax.lang.model.type.ErrorType;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
@@ -72,6 +73,10 @@ public class UserServiceImpl implements IUserService {
     private String kdspUrl;
     @Value("${kdsp-operation}")
     private String kdspOperationUrl;
+    //新修改注销账户逻辑
+    @Value("${vcc-talos.tjzimu.http}")
+    private String talosHttp;
+
 
 
 
@@ -712,7 +717,7 @@ public class UserServiceImpl implements IUserService {
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
     }
-
+    //旧逻辑
     @Override
     public MoResult<Boolean> modifyAccountStatusDisable(Long userId) {
         String url = sidecarUrl + "/middle_office/kefu/user/disable";
@@ -730,6 +735,54 @@ public class UserServiceImpl implements IUserService {
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
     }
+    //新逻辑
+    @Override
+    public MoResult<Boolean> modifyAccountStatusDisableNew(Long userId) {
+        //String url = sidecarUrl + "/middle_office/kefu/user/disable";
+        //修改为调用vcc_talos
+        //判断是否有在途业务
+        MoResult moResult = null;
+        try {
+            String url = talosHttp + "/api/inner/kdsp/hasBusiness";
+            Map<String, String> header = Maps.newHashMap();
+            header.put("Content-type", "application/x-www-form-urlencoded");
+            Map param = Maps.newHashMap();
+            param.put("userId", userId);
+            String result = httpService.get(url,header,param);
+            if(result!=null){
+                JSONObject jsonObject = JSONObject.parseObject(result);
+                //String dataStr = jsonObject.getString("data");
+                String businessCode = jsonObject.getString("businessCode");
+                //返回信息c
+                String msg = jsonObject.getString("msg");
+                if("0000".equals(businessCode) && StringUtils.isBlank(msg)){
+                    //如果不存在则调用用户中心去注销
+                    //调用用户中心
+                    Map param1 = Maps.newHashMap();
+                    param1.put("userId", userId.toString());
+                    String userUrl = userSysUrl + "/innerapi/user/disable";
+                    String userResult = httpService.post(userUrl, header, param1);
+                    JSONObject userJsonObject = JSONObject.parseObject(userResult);
+                    //String userDataStr = userJsonObject.getString("data");
+                    String userBusinessCode = userJsonObject.getString("businessCode");
+                    if("0000".equals(userBusinessCode)){
+                        moResult = GSON.fromJson(result, MoResult.class);
+                    }
+                }else{
+                    //如果存在则不能注销
+                    moResult = GSON.fromJson(result, MoResult.class);
+                }
+            }else{
+                moResult = GSON.fromJson("调用第三方接口报错", MoResult.class);
+            }
+            log.info("[user][modifyAccountStatusDisableNew] 请求业务系统返回值:{}", result);
+            return moResult;
+        } catch (Exception e) {
+            log.error("[user][modifyAccountStatusDisableNew] 网络通讯异常,userId:{},ex:{}", userId, ExceptionUtils.getStackTrace(e));
+            throw new BusinessException(ErrorCodeEnum.NET_ERROR);
+        }
+    }
+
 
     @Override
     public MoResult<Boolean> modifyAccountStatusActive(Long userId) {

src/main/java/cn/quantgroup/customer/util/FileToZip.java

@@ -186,7 +186,7 @@ public final class FileToZip {
     }
     public static void main(String[] args) throws Exception {
 
-        File deleteFile =new File("D:/tmp1/交易凭证\n");
+        File deleteFile =new File("D:/tmp1");
         deleteDirectory(deleteFile);
       /*  *//** 测试压缩方法1 *//*
          FileOutputStream fos1 = new FileOutputStream(new File("D:/交易凭证.zip"));