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

ace-common/pom.xml

@@ -112,7 +112,11 @@
             <artifactId>hutool-all</artifactId>
             <version>4.5.10</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5</version>
+        </dependency>
         <!-- swagger注解 -->
         <dependency>
             <groupId>io.swagger</groupId>

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/GlobalExceptionHandler.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.exception.auth.ClientTokenException;
 import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
 import com.github.wxiaoqi.security.common.exception.auth.UserTokenException;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.util.HttpRequestUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -24,7 +25,7 @@ import static org.springframework.http.HttpStatus.NOT_EXTENDED;
 /**
  * Created by ace on 2017/9/8.
  */
-@ControllerAdvice
+@ControllerAdvice("com.github.wxiaoqi.security")
 @ResponseBody
 public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
     private Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
@@ -66,6 +67,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
         if(0 == ex.getStatus()) {
             response.setStatus(500);
         }
+        HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + ex);
         return new BaseResponse(ex.getStatus(), ex.getMessage());
     }
 
@@ -73,6 +75,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
     public BaseResponse otherExceptionHandler(HttpServletResponse response, Exception ex) {
         response.setStatus(500);
         logger.error(ex.getMessage(),ex);
+        HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + ex);
         return new BaseResponse(CommonConstants.EX_OTHER_CODE, ex.getMessage());
     }
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java

@@ -4,6 +4,7 @@ package com.github.wxiaoqi.security.common.handler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.HttpRequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -28,9 +29,11 @@ public class PlatformExceptionHandler {
         Throwable cause = e.getCause();
         if(cause != null && cause.toString().contains("Exception")) {
             log.error(cause.getMessage(), e);
+            HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + e);
             return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
         }
         log.error("Server exception: ", e);
+        HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + e);
         return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
     }
 

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/HttpRequestUtil.java

+package com.github.wxiaoqi.security.common.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.net.URLDecoder;
+
+@Slf4j
+public class HttpRequestUtil {
+
+
+
+    /**
+     * post请求
+     * @param url         url地址
+     * @return
+     */
+    public static String httpPost(String url){
+        //post请求返回结果
+        DefaultHttpClient httpClient = new DefaultHttpClient();
+        HttpPost method = new HttpPost(url);
+        String str = "";
+        try {
+            HttpResponse result = httpClient.execute(method);
+            url = URLDecoder.decode(url, "UTF-8");
+            /**请求发送成功，并得到响应**/
+            if (result.getStatusLine().getStatusCode() == 200) {
+                try {
+                    /**读取服务器返回过来的json字符串数据**/
+                    str = EntityUtils.toString(result.getEntity(),"UTF-8");
+                } catch (Exception e) {
+                    log.error("post请求提交失败:" + url, e);
+                }
+            }
+        } catch (IOException e) {
+            log.error("post请求提交失败:" + url, e);
+        }
+        return str;
+    }
+
+
+    /**
+     * 发送get请求
+     * @param url    路径
+     * @return
+     */
+    public static String httpGet(String url){
+        //get请求返回结果
+        String strResult = null;
+        try {
+            DefaultHttpClient client = new DefaultHttpClient();
+            //发送get请求
+            HttpGet request = new HttpGet(url);
+            HttpResponse response = client.execute(request);
+
+            /**请求发送成功，并得到响应**/
+            if (response.getStatusLine().getStatusCode() == org.apache.http.HttpStatus.SC_OK) {
+                /**读取服务器返回过来的json字符串数据**/
+                strResult = EntityUtils.toString(response.getEntity(),"UTF-8");
+            } else {
+                log.error("get请求提交失败:" + url);
+            }
+        } catch (IOException e) {
+            log.error("get请求提交失败:" + url, e);
+        }
+        return strResult;
+    }
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserRelationDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/12 9:20
+ */
+@Data
+public class UserRelationDTO {
+
+    @ApiModelProperty("用户ID")
+    private Integer userId;
+
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/WalletCathListDTO.java

@@ -55,4 +55,7 @@ public class WalletCathListDTO {
     private String accountNumber;
 
     private String accountName;
+
+    @ApiModelProperty(value = "线下提现方式 1:自动 2:手动")
+    private Integer offlineWay;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/MyWalletCath.java

@@ -130,4 +130,8 @@ public class MyWalletCath implements Serializable {
 
     @Column(name = "account_name")
     private String accountName;
+
+    @Column(name = "offline_way")
+    @ApiModelProperty(value = "线下提现方式 1:自动 2:手动")
+    private Integer offlineWay;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/support/aop/TokenAop.java

@@ -56,7 +56,6 @@ public class TokenAop {
     public Object token(ProceedingJoinPoint proceedingJoinPoint) throws  Throwable{
        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
        String token = request.getHeader(tokenHeader);
-       log.info("token【{}】",token);
        Object[] args = proceedingJoinPoint.getArgs();
        if (ArrayUtil.isEmpty(args)){
             //没有参数直接返回

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletCathAdminVo.java

@@ -51,4 +51,7 @@ public class WalletCathAdminVo {
     private String accountNumber;
 
     private String accountName;
+
+    @ApiModelProperty(value = "线下提现方式 1:自动 2:手动")
+    private Integer offlineWay;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletPageVo.java

 package com.github.wxiaoqi.security.admin.vo;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 
@@ -12,6 +14,8 @@ import java.math.BigDecimal;
  * @data 2019/7/12 9:20
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class WalletPageVo {
 
     private Integer id;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java

@@ -43,7 +43,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
     private AppUserLoginMapper appUserLoginMapper;
 
     @Autowired
-    private BaseUserMemberMapper baseUserMemberMapper;
+    private AppUserDetailBiz appUserDetailBiz;
 
     @Autowired
     private VehicleFeign vehicleFeign;
@@ -56,7 +56,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
      */
     public PageInfo<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) {
          PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
-        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
         PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
         if (pageInfo.getList()==null||pageInfo.getList().size()==0) {
             return  pageInfo;
@@ -85,6 +85,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
                     Long cityCode = Long.valueOf(appUserManageVo.getCityCode());
                     String crtyName = map.get(cityCode);
                     appUserManageVo.setCityName(crtyName);
+
                 }
 
             }
@@ -99,12 +100,10 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
      */
     public PageInfo<AppUserManageVo> findAllByQueryAndCity(AppUserManageDTO appUserManageDTO) {
         PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
-        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
         if (CollectionUtils.isEmpty(appUserManageVos)) {
             return  new PageInfo<AppUserManageVo>();
         }
-//        Set<Integer> usSet = appUserManageDTO.getCitySet();
-//        List<AppUserManageVo> results = appUserManageVos.parallelStream().filter(us -> usSet.contains(us.getCityCode())).collect(Collectors.toList());
         PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
         return getAppUserManageVoPageInfo(pageInfo);
     }
@@ -186,32 +185,12 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
 
     public AppUserManageVo findUserInfoById(Integer userId) {
         AppUserManageVo appUserManageVo = new AppUserManageVo();
-        AppUserManageDTO appUserManageDTO = new AppUserManageDTO();
-        appUserManageDTO.setUserId(userId);
-        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(userId);
         if (CollectionUtils.isEmpty(appUserManageVos)){
             return appUserManageVo;
         }
         return appUserManageVos.get(0);
     }
 
-    public PageInfo<AppUserManageVo> getAllAppUsers(AppUserManageDTO appUserManageDTO) {
-        PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
-        List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
-        PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
-        if (pageInfo.getList()==null||pageInfo.getList().size()==0) {
-            return  pageInfo;
-        }
-        return getAppUserManageVoPageInfo(pageInfo);
-    }
 
-    public PageInfo<AppUserManageVo> getAllAppUsersAndCity(AppUserManageDTO appUserManageDTO) {
-        PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
-        List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
-        if (CollectionUtils.isEmpty(appUserManageVos)) {
-            return  new PageInfo<AppUserManageVo>();
-        }
-        PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
-        return getAppUserManageVoPageInfo(pageInfo);
-    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelationTemp;
@@ -67,6 +68,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             return;
         }
        /* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
+
         if (appUserVo==null){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
             return;
@@ -123,6 +125,22 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
         }
         return  ObjectRestResponse.succ();
     }
+
+    //后台关系绑定
+    public  ObjectRestResponse  adminBindRelation(UserRelationDTO relationDTO){
+        String phone=relationDTO.getPhone();
+        Integer userId=relationDTO.getUserId();
+        if (StringUtils.isBlank(phone)||userId==null||userId==0){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+        }
+        AppUserLogin userLogin=appUserLoginBiz.checkeUserLogin(phone);
+        if (userLogin==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"该上级不存在");
+        }
+        Integer parentId=userLogin.getId();
+        getMyBiz().bindRelation(userId,parentId,1);
+        return  ObjectRestResponse.succ();
+    }
     //永久稳定关系
     public void foreverBind(Integer user_id ){
         AppUserRelation relation=getMyBiz().getRelationByUserId(user_id);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java

@@ -379,7 +379,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
     /**
      * 提现审核
      */
-    public ObjectRestResponse verifyCath(Integer cathId, String reason, Integer status) {
+    public ObjectRestResponse verifyCath(Integer cathId,String payMentNo,String reason, Integer status) {
         boolean isvalid = status == WithDrawStatusEnum.REJECT.getCode() && StringUtils.isBlank(reason) || cathId == null || cathId == 0;
         if (isvalid) {
             return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数不能为空");
@@ -399,20 +399,23 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
             BigDecimal realAmount = cath.getRealAmount();
             BigDecimal commission = cath.getCommission();
             if (status == WithDrawStatusEnum.AGREE.getCode()) {
-
-                HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-                String host = StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request));
-                FundPayVo fundPayVo = FundPayVo.builder()
-                        .amount(cath.getCathType() == 0 ? String.valueOf(cath.getRealAmount().multiply(new BigDecimal(100)).doubleValue()) : String.format("%.2f", cath.getRealAmount().doubleValue()))
-                        .payeeAccount(cath.getAccountNumber())
-                        .orderNo(cath.getOrderNo())
-                        .payerShowName("欣新房车网络科技（广东）股份有限公司")
-                        .remark("提现转账")
-                        .type(cath.getCathType())
-                        .creatIp(host)
-                        .build();
-                sendPayMessage(fundPayVo);
-                log.info("发送提现消息成功：【{}】", fundPayVo);
+                if(org.springframework.util.StringUtils.hasText(payMentNo)){
+                  withDrawProcess(cath.getOrderNo(),payMentNo,null,true);
+                }else {
+                    HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+                    String host = StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request));
+                    FundPayVo fundPayVo = FundPayVo.builder()
+                            .amount(cath.getCathType() == 0 ? String.valueOf(cath.getRealAmount().multiply(new BigDecimal(100)).doubleValue()) : String.format("%.2f", cath.getRealAmount().doubleValue()))
+                            .payeeAccount(cath.getAccountNumber())
+                            .orderNo(cath.getOrderNo())
+                            .payerShowName("欣新房车网络科技（广东）股份有限公司")
+                            .remark("提现转账")
+                            .type(cath.getCathType())
+                            .creatIp(host)
+                            .build();
+                    sendPayMessage(fundPayVo);
+                    log.info("发送提现消息成功：【{}】", fundPayVo);
+                }
             } else {
                 cath.setStauts(status);
                 cath.setReason(reason);
@@ -475,7 +478,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
                 detail.setUserId(myWalletCath.getUserId());
                 detail.setItype(1);
                 //设置提现单号
-                detail.setWithDrawOrderNo(orderNo);
+                detail.setWithDrawOrderNo(myWalletCath.getOrderNo());
                 detail.setCono(myWalletCath.getId().intValue());
                 detail.setBalance(myWalletCath.getBalance());
                 detail.setAmount(myWalletCath.getAmount());

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

@@ -14,7 +14,7 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
     //查询用户信息
      AppUserVo getUserInfo(@Param("userId") Integer userId);
 
-    List<AppUserManageVo> selectAppUserManage(AppUserManageDTO appUserManageDTO);
+    List<AppUserManageVo> selectAppUserManage(@Param("userId") Integer userId);
 
     void updateUserMemberStatusByUserId(@Param("userId") Integer userId,@Param("status") Integer status);
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserLoginMapper.java

@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
+import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -36,4 +37,6 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList
     List<Integer> findAppUser(@Param("phone") String phone,@Param("name") String name,@Param("memberIds") List<Integer> memberIds);
 
     List<UserBo> selectByUserIds(@Param("userIds") List<Integer> uids);
+
+    AppUserManageVo selectByParentId(@Param("parentId") Integer parentId);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -67,26 +67,10 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
     }
 
     /**
-     * 查询所有,获取具体信息
+     * 根据用户id获取用户详情
+     * @param userId
      * @return
      */
-    @PostMapping("/all")
-    public ObjectRestResponse<PageInfo<AppUserManageVo>> getAllAppUsers(@RequestBody AppUserManageDTO appUserManageDTO) throws Exception {
-        String token = userAuthConfig.getToken(request);
-        ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token);
-        User  user  = (User) objectRestResponse.getData();
-        if (user==null){
-            throw new BaseException("User error!");
-        }
-        if (ALL_PERMISSIONS.equals(user.getDataAll())) {
-            return ObjectRestResponse.succ(baseBiz.getAllAppUsers(appUserManageDTO));
-        }
-        ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany());
-        Set<Integer> cityList =  setObjectRestResponse.getData();
-        appUserManageDTO.setCitySet(cityList);
-        return  ObjectRestResponse.succ(baseBiz.getAllAppUsersAndCity(appUserManageDTO));
-    }
-
     @GetMapping("/user_info/{id}")
     public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){
          AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

@@ -3,29 +3,22 @@ package com.github.wxiaoqi.security.admin.rest;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.biz.*;
-import com.github.wxiaoqi.security.admin.entity.*;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
-import com.github.wxiaoqi.security.admin.vo.FrontUser;
-import com.github.wxiaoqi.security.admin.vo.MenuTree;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
-import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.util.process.SystemConfig;
-import io.swagger.models.auth.In;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * ${DESCRIPTION}
@@ -60,11 +53,11 @@ public class PublicController {
     ObjectRestResponse userinfoByToken(String token) throws Exception {
         String username = userAuthUtil.getInfoFromToken(token).getUniqueName();
         if (username == null) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE);
+            return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
         }
         User user = userBiz.getUserByUsername(username);
         if (user == null) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE);
+            return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
         }
         return new ObjectRestResponse<User>().rel(true).data(user);
     }
@@ -74,8 +67,7 @@ public class PublicController {
     ObjectRestResponse userDetailByToken(String token) throws Exception {
         String username = userAuthUtil.getInfoFromToken(token).getId();
         if (username == null) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE
-                    , new HashSet<String>() {{add("用户名不存在！");}});
+            return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
         }
         Integer userid = Integer.parseInt(username);
         return ObjectRestResponse.succ(getAppUserInfoById(userid));
@@ -85,8 +77,7 @@ public class PublicController {
     public @ResponseBody
     ObjectRestResponse<AppUserDTO> userDetailById(Integer id) throws Exception {
         if (id == null) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE
-                    , new HashSet<String>() {{add("用户名不存在！");}});
+            return ObjectRestResponse.paramIsEmpty();
         }
         return ObjectRestResponse.succ(getAppUserInfoById(id));
     }
@@ -96,13 +87,11 @@ public class PublicController {
     ObjectRestResponse<AppUserDTO> userDetailByUsername(String name) throws Exception {
         AppUserLogin appUserLogin;
         if (StrUtil.isBlank(name)) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE
-                    , new HashSet<String>() {{add("用户名不存在！");}});
+            return ObjectRestResponse.paramIsEmpty();
         }else {
             appUserLogin = appUserLoginBiz.selectOne(new AppUserLogin(){{setUsername(name);}});
             if(null == appUserLogin) {
-                throw new BaseException(ResultCode.NOTEXIST_CODE
-                        , new HashSet<String>() {{add("用户名不存在！");}});
+                return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
             }
         }
         return ObjectRestResponse.succ(getAppUserInfoById(appUserLogin.getId()));
@@ -113,8 +102,7 @@ public class PublicController {
         //获取用户基础信息
         AppUserVo userVo = detailBiz.getUserInfoById(userid);
         if (userVo == null) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE
-                    , new HashSet<String>() {{add("用户不存在！");}});
+           return null;
         }
         Integer id= userVo.getId();
         Integer positionId=userVo.getPositionId();
@@ -136,15 +124,15 @@ public class PublicController {
 
     @RequestMapping(value = "/userinfo-by-uid", method = RequestMethod.GET)
     public @ResponseBody
-    ObjectRestResponse userinfoByUid(Integer uid) throws Exception {
+    ObjectRestResponse<User> userinfoByUid(Integer uid) throws Exception {
         if (uid == null||uid==0) {
-            throw new BaseException();
+            return ObjectRestResponse.paramIsEmpty();
         }
         User user = userBiz.getUserByUid(uid);
         if (user == null) {
-            throw new BaseException();
+            return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
         }
-        return new ObjectRestResponse<User>().rel(true).data(user);
+        return ObjectRestResponse.succ(user);
     }
 
     @GetMapping("/getByUserIds")

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminUserRelationController.java

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.AppUserRelationBiz;
+import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("relation/admin")
+public class AdminUserRelationController extends BaseController<AppUserRelationBiz,AppUserRelation> {
+
+
+    @RequestMapping(value = "/bind",method = RequestMethod.POST)
+    @ApiModelProperty("后台绑定")
+    public ObjectRestResponse bind(@RequestBody UserRelationDTO relationDTO){
+        try {
+        return baseBiz.adminBindRelation(relationDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BaseException(e);
+        }
+    }
+
+
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/WalletCathAdminController.java

@@ -38,9 +38,10 @@ public class WalletCathAdminController {
     public ObjectRestResponse  verifyCath(
             @RequestParam(value = "cathId",defaultValue = "0") Integer cathId,
             @RequestParam(value = "reason",defaultValue = "") String reason,
-            @RequestParam(value = "status",defaultValue = "1") Integer status){
+            @RequestParam(value = "status",defaultValue = "1") Integer status,
+            @RequestParam(value = "payMentNo",required = false) String payMentNo){
         try {
-            return  myWalletBiz.verifyCath(cathId,reason,status);
+            return  myWalletBiz.verifyCath(cathId,payMentNo,reason,status);
         }catch (Exception e) {
             throw new BaseException(e);
         }

ace-modules/ace-admin/src/main/resources/mapper/AppUserLoginMapper.xml

@@ -55,4 +55,9 @@
          INNER JOIN
          `app_user_detail` AS `aud` ON aud.userid=aul.id
     </select>
+
+    <select id="selectByParentId" resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
+       select IFNULL(d.realname, d.nickname) AS nameOfSuperior,l.username AS superiorMobileNumber
+       from app_user_login l left  join  app_user_detail d on  l.id = d.userid where l.isdel=0 and l.id =#{parentId}
+    </select>
 </mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/MyWalletCathMapper.xml

@@ -18,7 +18,8 @@
         wc.cono,
         wc.order_no AS `orderNo`,
         wc.account_number AS `accountNumber`,
-        wc.account_name AS `accountName`
+        wc.account_name AS `accountName`,
+        wc.offline_way AS `offlineWay`
         FROM
         (SELECT * FROM `my_wallet_cath` WHERE 1 = 1
         <if test="state != null">

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -77,7 +77,7 @@ public class MsgBiz {
         Query query = null;
         List<Msg> msgList = null;
         if (type != null) {
-            query = new Query(Criteria.where("body.type").is(type));
+            query = new Query(Criteria.where("body.type").is(type).and("visible").is(1));
             int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
             query.with(pageable);
             query.with(new Sort(Sort.Direction.DESC, "time"));
@@ -89,7 +89,7 @@ public class MsgBiz {
             List<Integer> ids = new ArrayList<>();
             ids.add(2);
             ids.add(4);
-            query = new Query(Criteria.where("body.type").in(ids));
+            query = new Query(Criteria.where("body.type").in(ids).and("visible").is(1));
             int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
             query.with(pageable);
             query.with(new Sort(Sort.Direction.DESC, "time"));
@@ -114,7 +114,7 @@ public class MsgBiz {
         List<Integer> ids = new ArrayList<>();
         ids.add(2);
         ids.add(4);
-        Query query = new Query(Criteria.where("body.type").in(ids).and("count.praise").gt(getNumber()));
+        Query query = new Query(Criteria.where("body.type").in(ids).and("count.praise").gt(getNumber()).and("visible").is(1));
         int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
         query.with(pageable);
         query.with(new Sort(Sort.Direction.DESC, "count.praise"));
@@ -134,7 +134,7 @@ public class MsgBiz {
         if (id == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        Query query = new Query(Criteria.where("id").is(new ObjectId(id)));
+        Query query = new Query(Criteria.where("id").is(new ObjectId(id)).and("visible").is(1));
         List<Msg> msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), userId);
         List<MsgVo> msgVoList = replaceMsgResult(msgList);
         if (msgVoList.size() > 0) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java

@@ -161,8 +161,13 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
         if(depositRefundRecord != null) {
             DepositRefundRecord newValue = new DepositRefundRecord();
             BeanUtil.copyProperties(depositRefundRecord, newValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-            newValue.setAmount(orderViolation.getPrice());
-            newValue.setRestAmount(depositRefundRecord.getTotalAmount().subtract(orderViolation.getPrice()));//减去违章金之后的押金
+            if (orderViolation.getPrice().doubleValue() > 0) {
+                newValue.setAmount(orderViolation.getPrice());
+                newValue.setRestAmount(depositRefundRecord.getRestAmount().subtract(orderViolation.getPrice()));//减去违章金之后的押金
+            } else {
+                newValue.setAmount(new BigDecimal(0));
+                newValue.setRestAmount(depositRefundRecord.getRestAmount());//减去违章金之后的押金
+            }
             newValue.setIscomplete(false);
             newValue.setId(null);
             mapper.insert(newValue);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java

@@ -15,7 +15,6 @@ import com.xxfc.platform.order.pojo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.aspectj.weaver.ast.Var;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -353,7 +353,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             if (response.getData() != null) {
                 orderVehicleCrosstownDto.setVehicleNumberPlat(response.getData().getNumberPlate());
             }
-
             return ObjectRestResponse.succ(oldValue.get(0));
         } else if (oldValue.size() <= 0) {
             orderVehicleCrosstownDto.setDeductionCost(amount);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -194,7 +194,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     orderPageVO.setMemberName(appUserVo.getMemberName());
                 }
 
-                if (dto.getType() == 1) {
+                if (dto.getType()!= null&&dto.getType() == 1) {
                     String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail();
                     ObjectMapper objectMapper = new ObjectMapper();
                     try {
@@ -247,7 +247,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
                             log.info("获取驾驶人信息失败！");
                             log.error(e.getMessage(), e);
                         }
-
                     }
 
                 }
@@ -326,7 +325,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
         for (OrderPageVO orderPageVO : pageDataVO.getData()) {
             if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
                 ObjectRestResponse<Vehicle> restResponse = vehicleFeign.get(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
-                log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
                 if (restResponse.getData() != null) {
                     orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
                     orderPageVO.setCode(restResponse.getData().getCode());

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -550,11 +550,19 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         model.setOutTradeNo(outTradeNo); // 预授权转支付商户订单号，为新的商户交易流水号；如果重试发起扣款，商户订单号不要变；
         model.setProductCode("PRE_AUTH_ONLINE"); // 固定值PRE_AUTH_ONLINE
         model.setAuthNo(serialNumber); // 填写预授权冻结交易号
-        model.setSubject(subject); // 解冻转支付标题，用于展示在支付宝账单中
+        if (StringUtils.isNotBlank(subject)) {
+            model.setSubject(subject); // 解冻转支付标题，用于展示在支付宝账单中
+        } else {
+            model.setSubject("订单费用");
+        }
         model.setTotalAmount(realAmount.toString()); // 结算支付金额
         model.setSellerId(SystemConfig.ALIPAY_PID); // 填写卖家支付宝账户pid
         model.setBuyerId(SystemConfig.ALIPAY_APPID); // 填写预授权用户uid，通过预授权冻结接口返回的payer_user_id字段获取
-        model.setBody(refundReason); // 可填写备注信息
+        if (StringUtils.isNotBlank(subject)) {
+            model.setBody(refundReason); // 可填写备注信息
+        } else {
+            model.setBody("订单费用");
+        }
         //如果需要从一笔授权中完成多笔订单支付，保持auth_no不变，不同订单根据outTradeNo进行标识，此时auth_confirm_mode不传或者传入NOT_COMPLETE；进行到最后一笔转支付时，auth_confirm_mode传入COMPLETE由支付宝完成剩余金额自动解冻，或者商户自行调用解冻接口将剩余金额解冻。
         model.setAuthConfirmMode("NOT_COMPLETE");//传入该值用户剩余金额不会自动解冻
         request.setBizModel(model);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/handler/WithDrawMqHandler.java

@@ -95,7 +95,12 @@ public class WithDrawMqHandler implements InitializingBean {
                 Long count = valueOperations.increment(orderNo);
                 if (count <= MAX_RETRY) {
                     //重新把消息放回队列
-                    basicNack(channel, message.getMessageProperties().getDeliveryTag(), false, true, pay_way);
+                   // basicNack(channel, message.getMessageProperties().getDeliveryTag(), false, true, pay_way);
+                    try {
+                        channel.basicRecover();
+                    }catch (IOException ex){
+
+                    }
                     return;
                 }
                 redisTemplate.delete(orderNo);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/SysRegionBiz.java

@@ -59,7 +59,7 @@ public class SysRegionBiz extends BaseBiz<SysRegionMapper, SysRegion> {
             }
 
         }
-        if(!hasCache){//从db读
+        if(!hasCache && ids != null){//从db读
             rs = mapper.getByIdList(ids);
         }
         return rs;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -256,7 +256,7 @@ public class VehicleActiveService {
                 bookVehicleVo.setBookEndDate(null);
                 bookVehicleVo.setUnbookStartDate(actualArrivalDate.toString(DATE_TIME_FORMATTER));
                 bookVehicleVo.setUnbookEndDate(arrivalDate.toString(DATE_TIME_FORMATTER));
-                bookVehicleVo.setRemark(bookVehicleVo.getRemark() + "  用户提前还车，取消剩余天数, 初始预定结束时间是，" + new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
+                bookVehicleVo.setRemark(bookVehicleVo.getRemark()==null?"": bookVehicleVo.getRemark()+ "  用户提前还车，取消剩余天数, 初始预定结束时间是，" + new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
                 vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
                 try {
                     Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
@@ -268,7 +268,7 @@ public class VehicleActiveService {
                     log.error(e.getMessage(), e);;
                 }
             } else if (actualArrivalDate.compareTo(arrivalDate) > 0) {//实际还车时间大于预计还车时间
-                vehicleBookRecord.setRemark(vehicleBookRecord.getRemark() + "  用户延期还车，实际占用日期");
+                vehicleBookRecord.setRemark(vehicleBookRecord.getRemark()==null?"": vehicleBookRecord.getRemark() + "  用户延期还车，实际占用日期");
             }
             updateBookRecordStatus(vehicleBookRecord, 2);
             departureLog.setMileageEnd(arrivalVo.getMileage());