Skip to content

C
cloud-platform
Commit f6ac079c authored by 周健威's avatar 周健威
Browse files
Options

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

parents d6c5a390 b1e85572
Hide whitespace changes
Inline Side-by-side
Showing with 379 additions and 328 deletions
ace-common/pom.xml
View file @ f6ac079c
...@@ -112,7 +112,11 @@ ...@@ -112,7 +112,11 @@
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
<version>4.5.10</version> <version>4.5.10</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5</version>
</dependency>
<!-- swagger注解 --> <!-- swagger注解 -->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/GlobalExceptionHandler.java
View file @ f6ac079c
...@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.exception.auth.ClientTokenException; ...@@ -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.UserInvalidException;
import com.github.wxiaoqi.security.common.exception.auth.UserTokenException; import com.github.wxiaoqi.security.common.exception.auth.UserTokenException;
import com.github.wxiaoqi.security.common.msg.BaseResponse; import com.github.wxiaoqi.security.common.msg.BaseResponse;
import com.github.wxiaoqi.security.common.util.HttpRequestUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
...@@ -24,7 +25,7 @@ import static org.springframework.http.HttpStatus.NOT_EXTENDED; ...@@ -24,7 +25,7 @@ import static org.springframework.http.HttpStatus.NOT_EXTENDED;
/** /**
* Created by ace on 2017/9/8. * Created by ace on 2017/9/8.
*/ */
@ControllerAdvice @ControllerAdvice("com.github.wxiaoqi.security")
@ResponseBody @ResponseBody
public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
private Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class); private Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
...@@ -66,6 +67,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { ...@@ -66,6 +67,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
if(0 == ex.getStatus()) { if(0 == ex.getStatus()) {
response.setStatus(500); 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()); return new BaseResponse(ex.getStatus(), ex.getMessage());
} }
...@@ -73,6 +75,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { ...@@ -73,6 +75,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
public BaseResponse otherExceptionHandler(HttpServletResponse response, Exception ex) { public BaseResponse otherExceptionHandler(HttpServletResponse response, Exception ex) {
response.setStatus(500); response.setStatus(500);
logger.error(ex.getMessage(),ex); 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()); return new BaseResponse(CommonConstants.EX_OTHER_CODE, ex.getMessage());
} }
} }
ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java
View file @ f6ac079c
...@@ -4,6 +4,7 @@ package com.github.wxiaoqi.security.common.handler; ...@@ -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.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.BaseResponse; import com.github.wxiaoqi.security.common.msg.BaseResponse;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.HttpRequestUtil;
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.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
...@@ -28,9 +29,11 @@ public class PlatformExceptionHandler { ...@@ -28,9 +29,11 @@ public class PlatformExceptionHandler {
Throwable cause = e.getCause(); Throwable cause = e.getCause();
if(cause != null && cause.toString().contains("Exception")) { if(cause != null && cause.toString().contains("Exception")) {
log.error(cause.getMessage(), e); 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()); return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
} }
log.error("Server exception: ", e); 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()); return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
} }
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/util/HttpRequestUtil.java 0 → 100644
View file @ f6ac079c
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 0 → 100644
View file @ f6ac079c
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
View file @ f6ac079c
...@@ -55,4 +55,7 @@ public class WalletCathListDTO { ...@@ -55,4 +55,7 @@ public class WalletCathListDTO {
private String accountNumber; private String accountNumber;
private String accountName; 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
View file @ f6ac079c
...@@ -130,4 +130,8 @@ public class MyWalletCath implements Serializable { ...@@ -130,4 +130,8 @@ public class MyWalletCath implements Serializable {
@Column(name = "account_name") @Column(name = "account_name")
private String accountName; 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
View file @ f6ac079c
...@@ -56,7 +56,6 @@ public class TokenAop { ...@@ -56,7 +56,6 @@ public class TokenAop {
public Object token(ProceedingJoinPoint proceedingJoinPoint) throws Throwable{ public Object token(ProceedingJoinPoint proceedingJoinPoint) throws Throwable{
HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
String token = request.getHeader(tokenHeader); String token = request.getHeader(tokenHeader);
log.info("token【{}】",token);
Object[] args = proceedingJoinPoint.getArgs(); Object[] args = proceedingJoinPoint.getArgs();
if (ArrayUtil.isEmpty(args)){ if (ArrayUtil.isEmpty(args)){
//没有参数直接返回 //没有参数直接返回
......
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletCathAdminVo.java
View file @ f6ac079c
...@@ -51,4 +51,7 @@ public class WalletCathAdminVo { ...@@ -51,4 +51,7 @@ public class WalletCathAdminVo {
private String accountNumber; private String accountNumber;
private String accountName; 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
View file @ f6ac079c
package com.github.wxiaoqi.security.admin.vo; package com.github.wxiaoqi.security.admin.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -12,6 +14,8 @@ import java.math.BigDecimal; ...@@ -12,6 +14,8 @@ import java.math.BigDecimal;
* @data 2019/7/12 9:20 * @data 2019/7/12 9:20
*/ */
@Data @Data
@AllArgsConstructor
@NoArgsConstructor
public class WalletPageVo { public class WalletPageVo {
private Integer id; private Integer id;
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java
View file @ f6ac079c
...@@ -43,7 +43,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -43,7 +43,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
private AppUserLoginMapper appUserLoginMapper; private AppUserLoginMapper appUserLoginMapper;
@Autowired @Autowired
private BaseUserMemberMapper baseUserMemberMapper; private AppUserDetailBiz appUserDetailBiz;
@Autowired @Autowired
private VehicleFeign vehicleFeign; private VehicleFeign vehicleFeign;
...@@ -56,7 +56,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -56,7 +56,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
*/ */
public PageInfo<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) { public PageInfo<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) {
PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit()); PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO); List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos); PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
if (pageInfo.getList()==null||pageInfo.getList().size()==0) { if (pageInfo.getList()==null||pageInfo.getList().size()==0) {
return pageInfo; return pageInfo;
...@@ -85,6 +85,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -85,6 +85,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
Long cityCode = Long.valueOf(appUserManageVo.getCityCode()); Long cityCode = Long.valueOf(appUserManageVo.getCityCode());
String crtyName = map.get(cityCode); String crtyName = map.get(cityCode);
appUserManageVo.setCityName(crtyName); appUserManageVo.setCityName(crtyName);
} }
} }
...@@ -99,12 +100,10 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -99,12 +100,10 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
*/ */
public PageInfo<AppUserManageVo> findAllByQueryAndCity(AppUserManageDTO appUserManageDTO) { public PageInfo<AppUserManageVo> findAllByQueryAndCity(AppUserManageDTO appUserManageDTO) {
PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit()); PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO); List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
if (CollectionUtils.isEmpty(appUserManageVos)) { if (CollectionUtils.isEmpty(appUserManageVos)) {
return new PageInfo<AppUserManageVo>(); 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); PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
return getAppUserManageVoPageInfo(pageInfo); return getAppUserManageVoPageInfo(pageInfo);
} }
...@@ -186,32 +185,12 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -186,32 +185,12 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
public AppUserManageVo findUserInfoById(Integer userId) { public AppUserManageVo findUserInfoById(Integer userId) {
AppUserManageVo appUserManageVo = new AppUserManageVo(); AppUserManageVo appUserManageVo = new AppUserManageVo();
AppUserManageDTO appUserManageDTO = new AppUserManageDTO(); List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(userId);
appUserManageDTO.setUserId(userId);
List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
if (CollectionUtils.isEmpty(appUserManageVos)){ if (CollectionUtils.isEmpty(appUserManageVos)){
return appUserManageVo; return appUserManageVo;
} }
return appUserManageVos.get(0); 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
View file @ f6ac079c
...@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz; ...@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.biz;
import com.ace.cache.annotation.Cache; import com.ace.cache.annotation.Cache;
import com.ace.cache.annotation.CacheClear; 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.AppUserDetail;
import com.github.wxiaoqi.security.admin.entity.AppUserLogin; import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
import com.github.wxiaoqi.security.admin.entity.AppUserRelationTemp; import com.github.wxiaoqi.security.admin.entity.AppUserRelationTemp;
...@@ -67,6 +68,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel ...@@ -67,6 +68,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
return; return;
} }
/* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId); /* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
if (appUserVo==null){ if (appUserVo==null){
log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在"); log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
return; return;
...@@ -123,6 +125,22 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel ...@@ -123,6 +125,22 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
} }
return ObjectRestResponse.succ(); 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 ){ public void foreverBind(Integer user_id ){
AppUserRelation relation=getMyBiz().getRelationByUserId(user_id); AppUserRelation relation=getMyBiz().getRelationByUserId(user_id);
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java
View file @ f6ac079c
...@@ -379,7 +379,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In ...@@ -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; boolean isvalid = status == WithDrawStatusEnum.REJECT.getCode() && StringUtils.isBlank(reason) || cathId == null || cathId == 0;
if (isvalid) { if (isvalid) {
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数不能为空"); return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数不能为空");
...@@ -399,20 +399,23 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In ...@@ -399,20 +399,23 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
BigDecimal realAmount = cath.getRealAmount(); BigDecimal realAmount = cath.getRealAmount();
BigDecimal commission = cath.getCommission(); BigDecimal commission = cath.getCommission();
if (status == WithDrawStatusEnum.AGREE.getCode()) { if (status == WithDrawStatusEnum.AGREE.getCode()) {
if(org.springframework.util.StringUtils.hasText(payMentNo)){
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); withDrawProcess(cath.getOrderNo(),payMentNo,null,true);
String host = StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request)); }else {
FundPayVo fundPayVo = FundPayVo.builder() HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
.amount(cath.getCathType() == 0 ? String.valueOf(cath.getRealAmount().multiply(new BigDecimal(100)).doubleValue()) : String.format("%.2f", cath.getRealAmount().doubleValue())) String host = StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request));
.payeeAccount(cath.getAccountNumber()) FundPayVo fundPayVo = FundPayVo.builder()
.orderNo(cath.getOrderNo()) .amount(cath.getCathType() == 0 ? String.valueOf(cath.getRealAmount().multiply(new BigDecimal(100)).doubleValue()) : String.format("%.2f", cath.getRealAmount().doubleValue()))
.payerShowName("欣新房车网络科技（广东）股份有限公司") .payeeAccount(cath.getAccountNumber())
.remark("提现转账") .orderNo(cath.getOrderNo())
.type(cath.getCathType()) .payerShowName("欣新房车网络科技（广东）股份有限公司")
.creatIp(host) .remark("提现转账")
.build(); .type(cath.getCathType())
sendPayMessage(fundPayVo); .creatIp(host)
log.info("发送提现消息成功：【{}】", fundPayVo); .build();
sendPayMessage(fundPayVo);
log.info("发送提现消息成功：【{}】", fundPayVo);
}
} else { } else {
cath.setStauts(status); cath.setStauts(status);
cath.setReason(reason); cath.setReason(reason);
...@@ -475,7 +478,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In ...@@ -475,7 +478,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
detail.setUserId(myWalletCath.getUserId()); detail.setUserId(myWalletCath.getUserId());
detail.setItype(1); detail.setItype(1);
//设置提现单号 //设置提现单号
detail.setWithDrawOrderNo(orderNo); detail.setWithDrawOrderNo(myWalletCath.getOrderNo());
detail.setCono(myWalletCath.getId().intValue()); detail.setCono(myWalletCath.getId().intValue());
detail.setBalance(myWalletCath.getBalance()); detail.setBalance(myWalletCath.getBalance());
detail.setAmount(myWalletCath.getAmount()); detail.setAmount(myWalletCath.getAmount());
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java
View file @ f6ac079c
...@@ -14,7 +14,7 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> { ...@@ -14,7 +14,7 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
//查询用户信息 //查询用户信息
AppUserVo getUserInfo(@Param("userId") Integer userId); 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); 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
View file @ f6ac079c
...@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.mapper; ...@@ -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.bo.UserBo;
import com.github.wxiaoqi.security.admin.entity.AppUserLogin; import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
import com.github.wxiaoqi.security.admin.entity.AppUserManage; 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.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;
...@@ -36,4 +37,6 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList ...@@ -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<Integer> findAppUser(@Param("phone") String phone,@Param("name") String name,@Param("memberIds") List<Integer> memberIds);
List<UserBo> selectByUserIds(@Param("userIds") List<Integer> uids); 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
View file @ f6ac079c
...@@ -67,26 +67,10 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap ...@@ -67,26 +67,10 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
} }
/** /**
* 查询所有,获取具体信息 * 根据用户id获取用户详情
* @param userId
* @return * @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}") @GetMapping("/user_info/{id}")
public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){ public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){
AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId); AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java
View file @ f6ac079c
...@@ -3,29 +3,22 @@ package com.github.wxiaoqi.security.admin.rest; ...@@ -3,29 +3,22 @@ package com.github.wxiaoqi.security.admin.rest;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.wxiaoqi.security.admin.biz.*; 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.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.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.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.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.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.ResultCode;
import com.github.wxiaoqi.security.common.util.process.SystemConfig;
import io.swagger.models.auth.In;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.*; import java.util.ArrayList;
import java.util.List;
/** /**
* ${DESCRIPTION} * ${DESCRIPTION}
...@@ -60,11 +53,11 @@ public class PublicController { ...@@ -60,11 +53,11 @@ public class PublicController {
ObjectRestResponse userinfoByToken(String token) throws Exception { ObjectRestResponse userinfoByToken(String token) throws Exception {
String username = userAuthUtil.getInfoFromToken(token).getUniqueName(); String username = userAuthUtil.getInfoFromToken(token).getUniqueName();
if (username == null) { 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); User user = userBiz.getUserByUsername(username);
if (user == null) { 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); return new ObjectRestResponse<User>().rel(true).data(user);
} }
...@@ -74,8 +67,7 @@ public class PublicController { ...@@ -74,8 +67,7 @@ public class PublicController {
ObjectRestResponse userDetailByToken(String token) throws Exception { ObjectRestResponse userDetailByToken(String token) throws Exception {
String username = userAuthUtil.getInfoFromToken(token).getId(); String username = userAuthUtil.getInfoFromToken(token).getId();
if (username == null) { if (username == null) {
throw new BaseException(ResultCode.NOTEXIST_CODE return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
, new HashSet<String>() {{add("用户名不存在！");}});
} }
Integer userid = Integer.parseInt(username); Integer userid = Integer.parseInt(username);
return ObjectRestResponse.succ(getAppUserInfoById(userid)); return ObjectRestResponse.succ(getAppUserInfoById(userid));
...@@ -85,8 +77,7 @@ public class PublicController { ...@@ -85,8 +77,7 @@ public class PublicController {
public @ResponseBody public @ResponseBody
ObjectRestResponse<AppUserDTO> userDetailById(Integer id) throws Exception { ObjectRestResponse<AppUserDTO> userDetailById(Integer id) throws Exception {
if (id == null) { if (id == null) {
throw new BaseException(ResultCode.NOTEXIST_CODE return ObjectRestResponse.paramIsEmpty();
, new HashSet<String>() {{add("用户名不存在！");}});
} }
return ObjectRestResponse.succ(getAppUserInfoById(id)); return ObjectRestResponse.succ(getAppUserInfoById(id));
} }
...@@ -96,13 +87,11 @@ public class PublicController { ...@@ -96,13 +87,11 @@ public class PublicController {
ObjectRestResponse<AppUserDTO> userDetailByUsername(String name) throws Exception { ObjectRestResponse<AppUserDTO> userDetailByUsername(String name) throws Exception {
AppUserLogin appUserLogin; AppUserLogin appUserLogin;
if (StrUtil.isBlank(name)) { if (StrUtil.isBlank(name)) {
throw new BaseException(ResultCode.NOTEXIST_CODE return ObjectRestResponse.paramIsEmpty();
, new HashSet<String>() {{add("用户名不存在！");}});
}else { }else {
appUserLogin = appUserLoginBiz.selectOne(new AppUserLogin(){{setUsername(name);}}); appUserLogin = appUserLoginBiz.selectOne(new AppUserLogin(){{setUsername(name);}});
if(null == appUserLogin) { if(null == appUserLogin) {
throw new BaseException(ResultCode.NOTEXIST_CODE return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
, new HashSet<String>() {{add("用户名不存在！");}});
} }
} }
return ObjectRestResponse.succ(getAppUserInfoById(appUserLogin.getId())); return ObjectRestResponse.succ(getAppUserInfoById(appUserLogin.getId()));
...@@ -113,8 +102,7 @@ public class PublicController { ...@@ -113,8 +102,7 @@ public class PublicController {
//获取用户基础信息 //获取用户基础信息
AppUserVo userVo = detailBiz.getUserInfoById(userid); AppUserVo userVo = detailBiz.getUserInfoById(userid);
if (userVo == null) { if (userVo == null) {
throw new BaseException(ResultCode.NOTEXIST_CODE return null;
, new HashSet<String>() {{add("用户不存在！");}});
} }
Integer id= userVo.getId(); Integer id= userVo.getId();
Integer positionId=userVo.getPositionId(); Integer positionId=userVo.getPositionId();
...@@ -136,15 +124,15 @@ public class PublicController { ...@@ -136,15 +124,15 @@ public class PublicController {
@RequestMapping(value = "/userinfo-by-uid", method = RequestMethod.GET) @RequestMapping(value = "/userinfo-by-uid", method = RequestMethod.GET)
public @ResponseBody public @ResponseBody
ObjectRestResponse userinfoByUid(Integer uid) throws Exception { ObjectRestResponse<User> userinfoByUid(Integer uid) throws Exception {
if (uid == null||uid==0) { if (uid == null||uid==0) {
throw new BaseException(); return ObjectRestResponse.paramIsEmpty();
} }
User user = userBiz.getUserByUid(uid); User user = userBiz.getUserByUid(uid);
if (user == null) { 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") @GetMapping("/getByUserIds")
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminUserRelationController.java 0 → 100644
View file @ f6ac079c
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
View file @ f6ac079c
...@@ -38,9 +38,10 @@ public class WalletCathAdminController { ...@@ -38,9 +38,10 @@ public class WalletCathAdminController {
public ObjectRestResponse verifyCath( public ObjectRestResponse verifyCath(
@RequestParam(value = "cathId",defaultValue = "0") Integer cathId, @RequestParam(value = "cathId",defaultValue = "0") Integer cathId,
@RequestParam(value = "reason",defaultValue = "") String reason, @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 { try {
return myWalletBiz.verifyCath(cathId,reason,status); return myWalletBiz.verifyCath(cathId,payMentNo,reason,status);
}catch (Exception e) { }catch (Exception e) {
throw new BaseException(e); throw new BaseException(e);
} }
......
ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
View file @ f6ac079c
...@@ -49,21 +49,22 @@ ...@@ -49,21 +49,22 @@
<!-- 获取用户信息 --> <!-- 获取用户信息 -->
<select id="getUserVo" resultMap="AppUserVoMap"> <select id="getUserVo" resultMap="AppUserVoMap">
select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name as jobTitle,buml.name as memberName from app_user_login l select
left join app_user_detail d l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name as
on d.userid = l.id jobTitle,buml.name as memberName from app_user_login l
left join base_user_member bum left join app_user_detail d
on bum.user_id=l.id on d.userid = l.id
left join (select level, name from base_user_member_level level where isdel = 0) buml left join base_user_member bum
on bum.member_level = buml.level on bum.user_id=l.id
left join (select id, name from app_user_position where is_del=0) p left join (select level, name from base_user_member_level level where isdel = 0) buml
on d.position_id=p.id on bum.member_level = buml.level
where left join (select id, name from app_user_position where is_del=0) p
d.userid in on d.position_id=p.id
where
<foreach collection="list" item="userId" index="index" open="(" separator="," close=")" > d.userid in
#{userId} <foreach collection="list" item="userId" index="index" open="(" separator="," close=")">
</foreach> #{userId}
</foreach>
</select> </select>
...@@ -76,97 +77,117 @@ ...@@ -76,97 +77,117 @@
</select> </select>
<select id="selectAppUserManage" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO" <select id="selectAppUserManage" parameterType="Integer"
resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo"> resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
select SELECT
l.id As userid, l.id AS userid,
l.username,
l.certification_status AS certificationStatus,
l.id_number AS idNumber,
l.createtime,
l.last_time AS lastTime,
l. STATUS,
d.channel,
d.is_member,
d.realname,
d.nickname,
d.source,
d.province_code AS provinceCode,
d.city_code AS cityCode,
d.sex,
d.headimgurl,
d.email,
m.valid_time AS validTime,
m.buy_count AS buyCount,
m.total_number AS totalNumber,
m.rent_free_days AS rentFreeDays,
m.crt_time AS timeOfMembership,
m.recent_recharge AS recentRecharge,
ml. NAME AS memberName,
aup. NAME AS `positionName`,
ul.username AS inviter,
IFNULL(pd.realname, pd.nickname) AS nameOfSuperior,
pl.username AS superiorMobileNumber
FROM
app_user_login l
LEFT JOIN app_user_detail d ON d.userid = l.id
LEFT JOIN app_user_login ul ON ul.id = d.inviter_account
LEFT JOIN base_user_member m ON d.userid = m.user_id
LEFT JOIN
(
SELECT
LEVEL,
NAME
FROM
base_user_member_level
WHERE
isdel = 0
) ml ON m.member_level = ml. LEVEL
LEFT JOIN app_user_position aup ON aup.id = d.position_id
LEFT JOIN
(
SELECT
user_id,
parent_id
FROM
app_user_relation
WHERE
is_del = 0
) r ON l.id = r.user_id
LEFT JOIN app_user_login pl ON r.parent_id = pl.id
LEFT JOIN app_user_detail pd ON pl.id = pd.userid
WHERE
l.id = #{userId}
</select>
<update id="updateUserMemberStatusByUserId">
update `app_user_detail` set `is_member`={status} where `userid`=#{userId}
</update>
<update id="updateUserPositionByUserId">
update `app_user_detail` set `position_id`=#{positionId} where `userid`=#{userId}
</update>
<select id="selectAppUser" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO"
resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
SELECT
l.id AS userid,
l.username, l.username,
l.certification_status as certificationStatus,
l.id_number as idNumber,
l.createtime,
l.last_time as lastTime,
l.status,
d.channel, d.channel,
d.is_member,
d.realname,
d.nickname,
d.source, d.source,
d.province_code as provinceCode, d.realname,
d.city_code as cityCode, ml. NAME AS memberName,
d.sex, aup. NAME AS positionName,
d.headimgurl, m.crt_time AS timeOfMembership,
d.email, m.total_number AS totalNumber,
m.member_level as memberLevel, m.rent_free_days AS rentFreeDays,
m.valid_time as validTime, IFNULL(pd.realname, pd.nickname) AS nameOfSuperior,
m.buy_count as buyCount, pl.username AS superiorMobileNumber
m.total_number as totalNumber, FROM
m.rent_free_days as rentFreeDays,
m.crt_time as timeOfMembership,
m.recent_recharge as recentRecharge,
m.name as memberName,
ul.username as inviter,
aup.name as `positionName`,
p.nameOfSuperior,
p.username AS superiorMobileNumber,
p.parent_id as parentId
from
app_user_login l app_user_login l
inner join LEFT JOIN app_user_detail d ON d.userid = l.id
(select * from app_user_detail where 1=1 LEFT JOIN base_user_member m ON d.userid = m.user_id
<if test="postionState != null"> LEFT JOIN (
<choose>
<when test="postionState == 6">
and `position_id`=#{postionState}
</when>
<otherwise>
and <![CDATA[`position_id`<>6]]>
</otherwise>
</choose>
</if>
) d
on
d.userid = l.id
left join
app_user_login ul
on
ul.id=d.inviter_account
left join
(
select
b.*,
ml.name
from
base_user_member b
left join
base_user_member_level ml
on
ml.level = b.member_level
where
ml.isdel=0
) m
on
l.id = m.user_id
left join
`app_user_position` as aup
on aup.id = d.position_id
left join (
SELECT SELECT
r.user_id, LEVEL,
r.parent_id, NAME
l.username, FROM
IFNULL(d.realname,d.nickname) as nameOfSuperior base_user_member_level
WHERE
isdel = 0
) ml ON m.member_level = ml. LEVEL
LEFT JOIN app_user_position aup ON aup.id = d.position_id
LEFT JOIN (
SELECT
user_id,
parent_id
FROM FROM
app_user_relation r app_user_relation
LEFT JOIN app_user_login l ON r.parent_id = l.id WHERE
LEFT JOIN app_user_detail d ON l.id = d.userid is_del = 0
) r ON l.id = r.user_id
LEFT JOIN app_user_login pl ON r.parent_id = pl.id
LEFT JOIN app_user_detail pd ON pl.id = pd.userid
WHERE WHERE
l.isdel = 0 l.isdel = 0
AND
r.is_del = 0
) p
on
l.id=p.user_id
where l.isdel = 0
<if test="mobile !=null and mobile !='' "> <if test="mobile !=null and mobile !='' ">
and l.username like CONCAT('%',#{mobile},'%') and l.username like CONCAT('%',#{mobile},'%')
</if> </if>
...@@ -192,139 +213,26 @@ ...@@ -192,139 +213,26 @@
<if test="userId!=null"> <if test="userId!=null">
and l.id=#{userId} and l.id=#{userId}
</if> </if>
<if test="realName !=null and realName != ''">
and d.realname like CONCAT('%',#{realName},'%')
</if>
<if test="citySet != null ">
and d.city_code in
<foreach collection="citySet" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
order by l.id ASC
</select>
<update id="updateUserMemberStatusByUserId">
update `app_user_detail` set `is_member`={status} where `userid`=#{userId}
</update>
<update id="updateUserPositionByUserId">
update `app_user_detail` set `position_id`=#{positionId} where `userid`=#{userId}
</update>
<select id="selectAppUser" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO"
resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
select
l.id As userid,
l.username,
d.channel,
d.is_member,
d.realname,
d.source,
d.province_code as provinceCode,
d.city_code as cityCode,
d.sex,
d.headimgurl,
d.email,
m.member_level as memberLevel,
m.valid_time as validTime,
m.buy_count as buyCount,
m.total_number as totalNumber,
m.rent_free_days as rentFreeDays,
m.crt_time as timeOfMembership,
m.recent_recharge as recentRecharge,
m.name as memberName,
aup.name as `positionName`,
p.nameOfSuperior,
p.username AS superiorMobileNumber,
p.parent_id as parentId
from
app_user_login l
inner join
(select * from app_user_detail where 1=1
<if test="postionState != null"> <if test="postionState != null">
<choose> <choose>
<when test="postionState == 6"> <when test="postionState == 6">
and `position_id`=#{postionState} and d.position_id =#{postionState}
</when> </when>
<otherwise> <otherwise>
and <![CDATA[`position_id`<>6]]> and <![CDATA[d.`position_id`<>6]]>
</otherwise> </otherwise>
</choose> </choose>
</if> </if>
) d <if test="realName !=null and realName != ''">
on and d.realname like CONCAT('%',#{realName},'%')
d.userid = l.id
left join
app_user_login ul
on
ul.id=d.inviter_account
left join
(
select
b.*,
ml.name
from
base_user_member b
left join
base_user_member_level ml
on
ml.level = b.member_level
where ml.isdel = 0
) m
on
l.id = m.user_id
left join
`app_user_position` as aup
on aup.id = d.position_id
left join (
SELECT
r.user_id,
r.parent_id,
l.username,
IFNULL(d.realname,d.nickname) as nameOfSuperior
FROM
app_user_relation r
LEFT JOIN app_user_login l ON r.parent_id = l.id
LEFT JOIN app_user_detail d ON l.id = d.userid
WHERE
l.isdel = 0
AND
r.is_del = 0
) p
on
l.id=p.user_id
where l.isdel = 0
<if test="mobile !=null and mobile !='' ">
and l.username like CONCAT('%',#{mobile},'%')
</if>
<if test="channel !=null ">
and d.channel=#{channel}
</if>
<if test="memberLevel !=null and memberLevel != -1">
and m.member_level = #{memberLevel}
</if>
<if test="memberLevel == -1">
and m.member_level in (select level from base_user_member_level)
</if>
<if test="registrationTimeBegin !=null ">
and l.createtime &gt;= #{registrationTimeBegin}
</if>
<if test="registrationTimeEnd !=null ">
and l.createtime &lt;= #{registrationTimeEnd}
</if>
<if test="source !=null ">
and d.source = #{source}
</if>
<if test="userId!=null">
and l.id=#{userId}
</if> </if>
<if test="citySet != null "> <if test="citySet != null ">
and d.city_code in and d.city_code in
<foreach collection="citySet" item="item" index="index" open="(" separator="," close=")" > <foreach collection="citySet" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
order by l.id ASC order by l.id ASC
</select> </select>
</mapper> </mapper>
\ No newline at end of file
ace-modules/ace-admin/src/main/resources/mapper/AppUserLoginMapper.xml
View file @ f6ac079c
...@@ -55,4 +55,9 @@ ...@@ -55,4 +55,9 @@
INNER JOIN INNER JOIN
`app_user_detail` AS `aud` ON aud.userid=aul.id `app_user_detail` AS `aud` ON aud.userid=aul.id
</select> </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> </mapper>
\ No newline at end of file
ace-modules/ace-admin/src/main/resources/mapper/MyWalletCathMapper.xml
View file @ f6ac079c
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
wc.cono, wc.cono,
wc.order_no AS `orderNo`, wc.order_no AS `orderNo`,
wc.account_number AS `accountNumber`, wc.account_number AS `accountNumber`,
wc.account_name AS `accountName` wc.account_name AS `accountName`,
wc.offline_way AS `offlineWay`
FROM FROM
(SELECT * FROM `my_wallet_cath` WHERE 1 = 1 (SELECT * FROM `my_wallet_cath` WHERE 1 = 1
<if test="state != null"> <if test="state != null">
......
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java
View file @ f6ac079c
...@@ -77,7 +77,7 @@ public class MsgBiz { ...@@ -77,7 +77,7 @@ public class MsgBiz {
Query query = null; Query query = null;
List<Msg> msgList = null; List<Msg> msgList = null;
if (type != 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(); int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
query.with(pageable); query.with(pageable);
query.with(new Sort(Sort.Direction.DESC, "time")); query.with(new Sort(Sort.Direction.DESC, "time"));
...@@ -89,7 +89,7 @@ public class MsgBiz { ...@@ -89,7 +89,7 @@ public class MsgBiz {
List<Integer> ids = new ArrayList<>(); List<Integer> ids = new ArrayList<>();
ids.add(2); ids.add(2);
ids.add(4); 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(); int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
query.with(pageable); query.with(pageable);
query.with(new Sort(Sort.Direction.DESC, "time")); query.with(new Sort(Sort.Direction.DESC, "time"));
...@@ -114,7 +114,7 @@ public class MsgBiz { ...@@ -114,7 +114,7 @@ public class MsgBiz {
List<Integer> ids = new ArrayList<>(); List<Integer> ids = new ArrayList<>();
ids.add(2); ids.add(2);
ids.add(4); 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(); int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
query.with(pageable); query.with(pageable);
query.with(new Sort(Sort.Direction.DESC, "count.praise")); query.with(new Sort(Sort.Direction.DESC, "count.praise"));
...@@ -134,7 +134,7 @@ public class MsgBiz { ...@@ -134,7 +134,7 @@ public class MsgBiz {
if (id == null) { if (id == null) {
return ObjectRestResponse.paramIsEmpty(); 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<Msg> msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), userId);
List<MsgVo> msgVoList = replaceMsgResult(msgList); List<MsgVo> msgVoList = replaceMsgResult(msgList);
if (msgVoList.size() > 0) { if (msgVoList.size() > 0) {
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java
View file @ f6ac079c
...@@ -161,8 +161,13 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp ...@@ -161,8 +161,13 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
if(depositRefundRecord != null) { if(depositRefundRecord != null) {
DepositRefundRecord newValue = new DepositRefundRecord(); DepositRefundRecord newValue = new DepositRefundRecord();
BeanUtil.copyProperties(depositRefundRecord, newValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true)); BeanUtil.copyProperties(depositRefundRecord, newValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
newValue.setAmount(orderViolation.getPrice()); if (orderViolation.getPrice().doubleValue() > 0) {
newValue.setRestAmount(depositRefundRecord.getTotalAmount().subtract(orderViolation.getPrice()));//减去违章金之后的押金 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.setIscomplete(false);
newValue.setId(null); newValue.setId(null);
mapper.insert(newValue); mapper.insert(newValue);
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java
View file @ f6ac079c
...@@ -15,7 +15,6 @@ import com.xxfc.platform.order.pojo.*; ...@@ -15,7 +15,6 @@ import com.xxfc.platform.order.pojo.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.aspectj.weaver.ast.Var;
import org.assertj.core.util.Lists; import org.assertj.core.util.Lists;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
View file @ f6ac079c
...@@ -353,7 +353,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp ...@@ -353,7 +353,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
if (response.getData() != null) { if (response.getData() != null) {
orderVehicleCrosstownDto.setVehicleNumberPlat(response.getData().getNumberPlate()); orderVehicleCrosstownDto.setVehicleNumberPlat(response.getData().getNumberPlate());
} }
return ObjectRestResponse.succ(oldValue.get(0)); return ObjectRestResponse.succ(oldValue.get(0));
} else if (oldValue.size() <= 0) { } else if (oldValue.size() <= 0) {
orderVehicleCrosstownDto.setDeductionCost(amount); orderVehicleCrosstownDto.setDeductionCost(amount);
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @ f6ac079c
...@@ -194,7 +194,7 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -194,7 +194,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
orderPageVO.setMemberName(appUserVo.getMemberName()); orderPageVO.setMemberName(appUserVo.getMemberName());
} }
if (dto.getType() == 1) { if (dto.getType()!= null&&dto.getType() == 1) {
String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail(); String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail();
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
try { try {
...@@ -247,7 +247,6 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -247,7 +247,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
log.info("获取驾驶人信息失败！"); log.info("获取驾驶人信息失败！");
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }
} }
...@@ -326,7 +325,6 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -326,7 +325,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
for (OrderPageVO orderPageVO : pageDataVO.getData()) { for (OrderPageVO orderPageVO : pageDataVO.getData()) {
if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) { if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
ObjectRestResponse<Vehicle> restResponse = vehicleFeign.get(orderPageVO.getOrderRentVehicleDetail().getVehicleId()); ObjectRestResponse<Vehicle> restResponse = vehicleFeign.get(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
if (restResponse.getData() != null) { if (restResponse.getData() != null) {
orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate()); orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
orderPageVO.setCode(restResponse.getData().getCode()); orderPageVO.setCode(restResponse.getData().getCode());
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
View file @ f6ac079c
...@@ -550,11 +550,19 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{ ...@@ -550,11 +550,19 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
model.setOutTradeNo(outTradeNo); // 预授权转支付商户订单号，为新的商户交易流水号；如果重试发起扣款，商户订单号不要变； model.setOutTradeNo(outTradeNo); // 预授权转支付商户订单号，为新的商户交易流水号；如果重试发起扣款，商户订单号不要变；
model.setProductCode("PRE_AUTH_ONLINE"); // 固定值PRE_AUTH_ONLINE model.setProductCode("PRE_AUTH_ONLINE"); // 固定值PRE_AUTH_ONLINE
model.setAuthNo(serialNumber); // 填写预授权冻结交易号 model.setAuthNo(serialNumber); // 填写预授权冻结交易号
model.setSubject(subject); // 解冻转支付标题，用于展示在支付宝账单中 if (StringUtils.isNotBlank(subject)) {
model.setSubject(subject); // 解冻转支付标题，用于展示在支付宝账单中
} else {
model.setSubject("订单费用");
}
model.setTotalAmount(realAmount.toString()); // 结算支付金额 model.setTotalAmount(realAmount.toString()); // 结算支付金额
model.setSellerId(SystemConfig.ALIPAY_PID); // 填写卖家支付宝账户pid model.setSellerId(SystemConfig.ALIPAY_PID); // 填写卖家支付宝账户pid
model.setBuyerId(SystemConfig.ALIPAY_APPID); // 填写预授权用户uid，通过预授权冻结接口返回的payer_user_id字段获取 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由支付宝完成剩余金额自动解冻，或者商户自行调用解冻接口将剩余金额解冻。 //如果需要从一笔授权中完成多笔订单支付，保持auth_no不变，不同订单根据outTradeNo进行标识，此时auth_confirm_mode不传或者传入NOT_COMPLETE；进行到最后一笔转支付时，auth_confirm_mode传入COMPLETE由支付宝完成剩余金额自动解冻，或者商户自行调用解冻接口将剩余金额解冻。
model.setAuthConfirmMode("NOT_COMPLETE");//传入该值用户剩余金额不会自动解冻 model.setAuthConfirmMode("NOT_COMPLETE");//传入该值用户剩余金额不会自动解冻
request.setBizModel(model); request.setBizModel(model);
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/handler/WithDrawMqHandler.java
View file @ f6ac079c
...@@ -95,7 +95,12 @@ public class WithDrawMqHandler implements InitializingBean { ...@@ -95,7 +95,12 @@ public class WithDrawMqHandler implements InitializingBean {
Long count = valueOperations.increment(orderNo); Long count = valueOperations.increment(orderNo);
if (count <= MAX_RETRY) { 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; return;
} }
redisTemplate.delete(orderNo); redisTemplate.delete(orderNo);
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/SysRegionBiz.java
View file @ f6ac079c
...@@ -59,7 +59,7 @@ public class SysRegionBiz extends BaseBiz<SysRegionMapper, SysRegion> { ...@@ -59,7 +59,7 @@ public class SysRegionBiz extends BaseBiz<SysRegionMapper, SysRegion> {
} }
} }
if(!hasCache){//从db读 if(!hasCache && ids != null){//从db读
rs = mapper.getByIdList(ids); rs = mapper.getByIdList(ids);
} }
return rs; return rs;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
View file @ f6ac079c
...@@ -256,7 +256,7 @@ public class VehicleActiveService { ...@@ -256,7 +256,7 @@ public class VehicleActiveService {
bookVehicleVo.setBookEndDate(null); bookVehicleVo.setBookEndDate(null);
bookVehicleVo.setUnbookStartDate(actualArrivalDate.toString(DATE_TIME_FORMATTER)); bookVehicleVo.setUnbookStartDate(actualArrivalDate.toString(DATE_TIME_FORMATTER));
bookVehicleVo.setUnbookEndDate(arrivalDate.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()); vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
try { try {
Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo); Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
...@@ -268,7 +268,7 @@ public class VehicleActiveService { ...@@ -268,7 +268,7 @@ public class VehicleActiveService {
log.error(e.getMessage(), e);; log.error(e.getMessage(), e);;
} }
} else if (actualArrivalDate.compareTo(arrivalDate) > 0) {//实际还车时间大于预计还车时间 } else if (actualArrivalDate.compareTo(arrivalDate) > 0) {//实际还车时间大于预计还车时间
vehicleBookRecord.setRemark(vehicleBookRecord.getRemark() + " 用户延期还车，实际占用日期"); vehicleBookRecord.setRemark(vehicleBookRecord.getRemark()==null?"": vehicleBookRecord.getRemark() + " 用户延期还车，实际占用日期");
} }
updateBookRecordStatus(vehicleBookRecord, 2); updateBookRecordStatus(vehicleBookRecord, 2);
departureLog.setMileageEnd(arrivalVo.getMileage()); departureLog.setMileageEnd(arrivalVo.getMileage());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment