Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamLoginInfoVo.java

@@ -20,7 +20,7 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 14, value = "用户第三方账号信息")
     private List<AdamThirdPartInfoVo> thirdPartInfo;
     @ApiModelProperty(position = 15, value = "会员信息")
-    private AdamMemberSimpleVo memberSimpleVo;
+    private AdamMemberSimpleVo memberVo;
     @ApiModelProperty(position = 16, value = "用户会员信息")
     private AdamUserMemberVo userMemberVo;
 

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberVo.java

@@ -56,7 +56,7 @@ public class AdamMemberVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 21, value = "会员专属权益")
     private List<AdamMemberRightsVo> rightsVoList;
     @ApiModelProperty(position = 22, value = "用户会员信息")
-    private AdamUserMemberVo memberInfo;
+    private AdamUserMemberVo userMemberVo;
 
     private static final AdamMemberVo obj = new AdamMemberVo();
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
+import cn.hutool.core.text.UnicodeUtil;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderRefundsServiceImpl;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderTicketsAdminServiceImpl;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderRefundDao;
@@ -20,6 +22,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 /**
  * <p>
  * 后台单订单退款 服务实现类
@@ -180,7 +184,14 @@ public class KylinOrderRefundAdminController extends BaseController {
                 return error(res.getMessage());
             }
         } catch (Exception e) {
-            return error(e.getMessage());
+            String message = e.getMessage();
+            String[] msg = e.getMessage().split(" ");
+            if (msg.length>0 && null != msg[3]) {
+                String msgStr = UnicodeUtil.toString(msg[3]);
+                Map msgMap = JsonUtils.fromJson(msgStr.replace("[", "").replace("]", ""), Map.class);
+                message = msgMap.get("message").toString();
+            }
+            return error(message);
         }
     }
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -138,7 +138,7 @@ public class AdamLoginController {
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
         }
-        loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
+        loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         return ResponseDto.success(loginInfoVo);
@@ -167,7 +167,7 @@ public class AdamLoginController {
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
         }
-        loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
+        loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         return ResponseDto.success(AdamLoginInfoVo.getNew());
@@ -192,7 +192,7 @@ public class AdamLoginController {
             loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(uid));
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(uid));
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid));
-            loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
+            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         } else {// 新账号注册
             if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode()))
                 return ResponseDto.failure(ErrorMapping.get("10002"));
@@ -200,7 +200,7 @@ public class AdamLoginController {
             AdamUserInfoVo registerUserInfo = adamUserService.register(parameter);
             loginInfoVo.setUserInfo(registerUserInfo);
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
-            loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
+            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         }
         loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
         return ResponseDto.success(loginInfoVo);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
@@ -16,7 +15,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Date;
 
 @ApiSupport(order = 10030)
 @Api(tags = "会员信息")
@@ -52,7 +49,9 @@ public class AdamMemberController {
 
             memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId()));
 
-            memberVo.setMemberInfo(adamRdmService.getUserMemberVoByUid(CurrentUtil.getCurrentUid()));
+            if (CurrentUtil.isLogged()) {
+                memberVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(CurrentUtil.getCurrentUid()));
+            }
         }
         return ResponseDto.success(memberVo);
     }