Skip to content

C
cloud-platform
Commit 35fb9a50 authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'hz_dev' into base-modify

parents 43476927 b72733e6
Hide whitespace changes
Inline Side-by-side
Showing with 571 additions and 72 deletions
ace-common/src/main/java/com/github/wxiaoqi/security/common/constant/CommonConstants.java
View file @ 35fb9a50
package com.github.wxiaoqi.security.common.constant;
import java.time.format.DateTimeFormatter;
/**
* Created by ace on 2017/8/29.
*/
......@@ -39,4 +41,8 @@ public class CommonConstants {
public static final String LONG_TIME = "HHmmss";
public static final String SHORT_TIME = "HHmm";
public static final String DATE_TIME_LINE = "yyyy-MM-dd HH:mm:ss";
public static final DateTimeFormatter DATE_TIME_LINE_FORMATTER = DateTimeFormatter.ofPattern(DATE_TIME_LINE);
public static final DateTimeFormatter YMR_SLASH_FORMATTER = DateTimeFormatter.ofPattern(YMR_SLASH);
}
ace-common/src/main/java/com/github/wxiaoqi/security/common/log/Impl/CommonLogServiceImpl.java
View file @ 35fb9a50
......@@ -88,9 +88,9 @@ public class CommonLogServiceImpl implements CommonLogService {
}
@Override
public void run() {
if(!xxLogEntity.getServletPath().contains("/vehicleInfo/app/unauth/getVehiclePlanList")) {
log.info("用户请求信息：xxLogEntity = {}", xxLogEntity.toString());
}
// if(!xxLogEntity.getServletPath().contains("/vehicleInfo/app/unauth/getVehiclePlanList")) {
// log.info("用户请求信息：xxLogEntity = {}", xxLogEntity.toString());
// }
mongoTemplate.insert(xxLogEntity, xxLogEntity.getMongoKey());
}
}
......
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseUserMemberVO.java
View file @ 35fb9a50
......@@ -77,4 +77,7 @@ public class BaseUserMemberVO implements Serializable {
@Column(name = "member_name")
private String memberName;
private Integer discount;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java
View file @ 35fb9a50
......@@ -103,9 +103,9 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
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(results);
// 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);
}
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
View file @ 35fb9a50
......@@ -208,11 +208,12 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
if (baseUserMemberVO != null) {
return baseUserMemberVO;
}
return new BaseUserMemberVO();
return null;
}
/**
* 设置用户会员
*
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
View file @ 35fb9a50
......@@ -45,19 +45,20 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
@Autowired
private VehicleFeign vehicleFeign;
private Integer ALL_PERMISSIONS=1;
/**
* 查询所有
* @return
*/
@PostMapping("/findAll")
public ObjectRestResponse<PageInfo<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO, HttpServletRequest request) throws Exception {
public ObjectRestResponse<PageInfo<AppUserManageVo>> findAllByQuery(@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 (user.getDataAll()==1) {
if (ALL_PERMISSIONS.equals(user.getDataAll())) {
return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO));
}
ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany());
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/BaseUserMemberController.java
View file @ 35fb9a50
......@@ -3,7 +3,6 @@ package com.github.wxiaoqi.security.admin.rest;
import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
import com.github.wxiaoqi.security.admin.entity.AppUserManage;
import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
......@@ -15,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.lang.reflect.InvocationTargetException;
import java.util.Objects;
/**
......@@ -39,8 +37,10 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
*/
@ApiOperation(value = "根据用户id获取用户会员信息")
@GetMapping("/findOne/{userId}")
public ObjectRestResponse<BaseUserMemberVO> findOneByUserId(@PathVariable Integer userId){
return ObjectRestResponse.succ(baseBiz.findOneByUserId(userId));
public ObjectRestResponse<BaseUserMemberVO> findOneByUserId(@PathVariable Integer userId)throws Exception{
BaseUserMemberVO oneByUserId = baseBiz.findOneByUserId(userId);
oneByUserId=(oneByUserId==null? new BaseUserMemberVO(): oneByUserId);
return ObjectRestResponse.succ(oneByUserId);
}
......
ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
View file @ 35fb9a50
......@@ -133,6 +133,12 @@
<if test="source !=null ">
and d.source = #{source}
</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>
......
ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberMapper.xml
View file @ 35fb9a50
......@@ -37,7 +37,8 @@
m.total_number as totalNumber,
m.buy_count as buyCount,
m.valid_time as validTime,
m.member_name as `memberName`,
m.member_name as memberName,
m.discount as discount,
ml.name as name
from
base_user_member m
......@@ -46,10 +47,9 @@
on
m.member_level =ml.level
where
m.user_id=#{userId}
and
m.is_del=0
m.user_id=#{userId}
and
m.is_del=0
limit 1
</select>
......
ace-modules/ace-tool/pom.xml
View file @ 35fb9a50
......@@ -87,7 +87,10 @@
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-consul-all</artifactId> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-all</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
......@@ -95,8 +98,8 @@
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework.amqp</groupId>-->
<!--<artifactId>spring-rabbit</artifactId>-->
<!--<groupId>org.springframework.amqp</groupId>-->
<!--<artifactId>spring-rabbit</artifactId>-->
<!--</dependency>-->
<dependency>
......
ace-sidecar/ace-sidecar-client-demo/pom.xml
View file @ 35fb9a50
......@@ -36,8 +36,14 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-server</artifactId>
</dependency>
<dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-consul-all</artifactId> </dependency>
<dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-consul-all</artifactId> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-all</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-consul-all</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
......
ace-sidecar/ace-sidecar-server/pom.xml
View file @ 35fb9a50
......@@ -36,7 +36,10 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-server</artifactId>
</dependency>
<dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-consul-all</artifactId> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-all</artifactId>
</dependency>
</dependencies>
<build>
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderRefundBiz.java
View file @ 35fb9a50
......@@ -85,7 +85,7 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
//判断是否定损过
if(SYS_TRUE.equals(orderMQDTO.getOrderRentVehicleDetail().getFixedLossStatus())) {
crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
depositRefundRecordStatus = DepositRefundStatus.FIXLOSSREFUND;
depositRefundRecordStatus = DepositRefundStatus.FIXLOSSREFUNDARRIVAL;
}else {
crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
depositRefundRecordStatus = DepositRefundStatus.REFUNDARRIVAL;
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
View file @ 35fb9a50
......@@ -320,6 +320,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
//修改訂單狀態為定損
baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
baseOrderBiz.updateSelectiveByIdReT(baseOrder);
orderRentVehicleDetail.setFixedLossStatus(1);
......
xx-order/xx-order-server/src/main/resources/bootstrap.yml
View file @ 35fb9a50
......@@ -13,7 +13,7 @@ spring:
cloud:
nacos:
config:
server-addr: 127.0.0.1:8848
server-addr: 127.0.0.1:8848, 10.1.37.166:8848
#共用配置，+ mongodb日志配置
shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
......
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourVerificationInfoVo.java 0 → 100644
View file @ 35fb9a50
package com.xxfc.platform.tour.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 旅游商品
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-06 11:41:51
*/
@Data
public class TourVerificationInfoVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("旅游线路核销id")
private Integer verificationId;
@ApiModelProperty(value = "旅游商品规格id")
private Integer speId;
@ApiModelProperty(value = "开始时间")
private Date startTime;
//结束时间
@ApiModelProperty(value = "结束时间")
private Date endTime;
@ApiModelProperty(value = "时间区间")
private String time;
@ApiModelProperty(value = "出发路线id")
private Integer siteId;
@ApiModelProperty(value = "出发路线名称")
private String siteName;
@ApiModelProperty(value = "出发路线分公司id")
private Integer companyId;
@ApiModelProperty(value = "旅游路线id")
private Integer goodId;
@ApiModelProperty(value = "旅游路线名称")
private String goodName;
@ApiModelProperty(value = "出发路线分公司ids")
private List<Integer> companyList;
}
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java
View file @ 35fb9a50
package com.xxfc.platform.tour.biz;
import cn.hutool.core.date.DateUtil;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
import com.xxfc.platform.tour.vo.TourGoodOrderVo;
import com.xxfc.platform.tour.vo.TourVerificationInfoVo;
import org.omg.CORBA.PUBLIC_MEMBER;
import org.springframework.stereotype.Service;
import com.xxfc.platform.tour.entity.TourGoodVerification;
import com.xxfc.platform.tour.mapper.TourGoodVerificationMapper;
......@@ -90,4 +93,42 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
TourGoodVerification verfication = mapper.selectByPrimaryKey(tourGoodVerification);
return verfication.getStatus();
}
//获取路线核销id
public ObjectRestResponse getVerificationList(TourVerificationInfoVo tourVerificationInfoVo){
Integer companyId=tourVerificationInfoVo.getCompanyId();
Integer goodId=tourVerificationInfoVo.getGoodId();
Integer siteId=tourVerificationInfoVo.getSiteId();
List<Integer> companyIds=tourVerificationInfoVo.getCompanyList();
List<TourVerificationInfoVo> list=null;
if (goodId==null||goodId==0){
if (companyId!=null&&companyId!=0){
list=mapper.getSiteList(null,companyId,null);
if (list.size()==0){
return ObjectRestResponse.succ();
}
}else if (companyIds!=null&&companyIds.size()>0){
list=mapper.getSiteList(null,null,companyIds);
}
list=mapper.getGoodList(list);
}else {
if (siteId==null||siteId==0){
if (companyId==null||companyId==0){
list=mapper.getSiteList(goodId,null,companyIds);
}else {
list=mapper.getSpeList(goodId,null,companyId);
}
}else {
list= mapper.getSpeList(goodId,siteId,null);
}
}
return ObjectRestResponse.succ(list);
}
//获取路线核销信息
public ObjectRestResponse getVerification(Integer verificationId){
return ObjectRestResponse.succ(mapper.getVerification(verificationId));
}
}
\ No newline at end of file
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodVerificationMapper.java
View file @ 35fb9a50
......@@ -4,6 +4,7 @@ package com.xxfc.platform.tour.mapper;
import com.xxfc.platform.tour.entity.TourGoodVerification;
import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
import com.xxfc.platform.tour.vo.TourGoodOrderVo;
import com.xxfc.platform.tour.vo.TourVerificationInfoVo;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
......@@ -55,4 +56,16 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
* @return
*/
List<TourGoodOrderVo> findVerificationAll(TourGoodOrderFindVo tourGoodOrderFindVo );
//获取旅游路线
List<TourVerificationInfoVo> getGoodList(@Param("list")List<TourVerificationInfoVo> list);
//获取路线id列表
List<TourVerificationInfoVo> getSiteList(@Param("goodId")Integer goodId,@Param("companyId")Integer companyId,@Param("companyList")List<Integer> companyIds);
//获取时间列表
List<TourVerificationInfoVo> getSpeList(@Param("goodId")Integer goodId,@Param("siteId")Integer siteId,@Param("companyId")Integer companyId);
//获取核销路线信息
TourVerificationInfoVo getVerification(@Param("verificationId")Integer verificationId);
}
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java
View file @ 35fb9a50
......@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/tourGood/verfication")
@IgnoreClientToken
public class TourGoodVerificationController extends BaseController<TourGoodVerificationBiz, TourGoodVerification> {
/**
* 查询订单列表
* @param tourGoodOrderFindVo
......@@ -67,4 +69,5 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
public Integer selectDepartureStatusByVerificationId(@RequestParam(value = "verificationId") Integer verificationId){
return baseBiz.selectDepartureStatusByVerificationId(verificationId);
}
}
\ No newline at end of file
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourVerificationController.java 0 → 100644
View file @ 35fb9a50
package com.xxfc.platform.tour.rest;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.biz.TourGoodVerificationBiz;
import com.xxfc.platform.tour.common.TourBaseController;
import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
import com.xxfc.platform.tour.vo.TourGoodOrderVo;
import com.xxfc.platform.tour.vo.TourVerificationInfoVo;
import com.xxfc.platform.vehicle.entity.BranchCompany;
import com.xxfc.platform.vehicle.feign.VehicleFeign;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.stream.Collectors;
import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
@RestController
@RequestMapping("/verfication")
@IgnoreClientToken
public class TourVerificationController extends TourBaseController<TourGoodVerificationBiz> {
@Autowired
VehicleFeign vehicleFeign;
@GetMapping("/getList")
public ObjectRestResponse getList(TourVerificationInfoVo tourVerificationInfoVo){
Integer companyId=tourVerificationInfoVo.getCompanyId();
if (companyId==null){
UserDTO userDTO=userinfoByToken();
if ( userDTO!=null&&DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
List<BranchCompany> companyList= vehicleFeign.companyAll(userDTO.getDataAll(),userDTO.getDataCompany(),userDTO.getDataZone());
if (companyList.size()>0){
List<Integer> companyIds = companyList.stream().map(BranchCompany::getId).collect(Collectors.toList());
tourVerificationInfoVo.setCompanyList(companyIds);
}
}
}
return baseBiz.getVerificationList(tourVerificationInfoVo);
}
@GetMapping("/info/{id}")
public ObjectRestResponse getList(@PathVariable Integer id){
return baseBiz.getVerification(id);
}
}
\ No newline at end of file
xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml
View file @ 35fb9a50
......@@ -38,4 +38,99 @@
LEFT JOIN tour_good_spe_price p ON v.spe_id=p.id
WHERE s.company_id=#{companyId} and v.status=#{orderStatus} and p.start_time=#{travelDate} ORDER BY s.depart_time ) as `goodOrder`
</select>
<!-- 获取旅游路线id-->
<select id="getGoodList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
SELECT
v.good_id as goodId,
g.`name` as goodName
FROM
tour_good_verification v
LEFT JOIN tour_good g ON v.good_id = g.id
WHERE
v.is_del = 0
<if test="list!=null and list.size != 0">
and v.site_id in (
<trim suffixOverrides=",">
<foreach collection="list" item="item">
#{item.siteId},
</foreach>
</trim>
)
</if>
GROUP BY
v.good_id
</select>
<!--获取路线id-->
<select id="getSiteList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
SELECT
id as siteId,
name as siteName,
company_id as companyId
FROM tour_good_site
WHERE is_del=0
and type=0
<if test="goodId!=null and goodId!='' ">
and good_id=#{goodId}
</if>
<if test="companyId!=null and companyId!='' ">
and company_id=#{companyId}
</if>
<if test="companyList!=null and companyList.size != 0">
and company_id in (
<trim suffixOverrides=",">
<foreach collection="companyList" item="id">
#{id},
</foreach>
</trim>
)
</if>
order by rank desc
</select>
<!--获取时间-->
<select id="getSpeList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
SELECT
DISTINCT
v.id as verificationId,
v.spe_id as speId,
p.start_time as startTime,
p.end_time as endTime,
CONCAT(date_format(p.start_time,'%Y-%m-%d'), '~', date_format(p.end_time, '%Y-%m-%d')) as time
FROM
tour_good_verification v
LEFT JOIN tour_good_site s on v.site_id=s.id
LEFT JOIN tour_good_spe_price p ON v.spe_id=p.id
WHERE
v.is_del = 0 and v.good_id=#{goodId} and DATEDIFF(p.start_time,NOW())>0
<if test="siteId!=null and siteId!='' ">
and v.site_id=#{siteId}
</if>
<if test="companyId!=null and companyId!='' ">
and s.company_id=#{companyId}
</if>
ORDER BY
p.start_time
</select>
<!--获取核销信息-->
<select id="getVerification" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
SELECT
DISTINCT
v.id as verificationId,
v.spe_id as speId,
p.start_time as startTime,
p.end_time as endTime,
CONCAT(date_format(p.start_time,'%Y-%m-%d'), '~', date_format(p.end_time, '%Y-%m-%d')) as time,
s.id as siteId,
s.name as siteName,
s.company_id as companyId,
v.good_id as goodId,
g.`name` as goodName
FROM
tour_good_verification v
LEFT JOIN tour_good_site s on v.site_id=s.id
LEFT JOIN tour_good_spe_price p ON v.spe_id=p.id
LEFT JOIN tour_good g ON v.good_id=g.id
WHERE v.id=#{verificationId}
</select>
</mapper>
\ No newline at end of file
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/CertificationController.java
View file @ 35fb9a50
......@@ -102,7 +102,7 @@ public class CertificationController {
// }
// });
// thread.start();
}
}
return result ;
}
} catch (Exception e) {
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java
View file @ 35fb9a50
......@@ -251,16 +251,16 @@ public class CertificationService {
}
idInformation.setExpirationDate(expirationDate);
CertificationService cs = applicationContext.getBean(this.getClass());
ObjectRestResponse objRR =cs.addIdInformation(idInformation);
log.info("----请求admin=========" + objRR);
if (objRR.getRel()) {
return ObjectRestResponse.succ(objRR.getData());
}
return cs.addIdInformation(idInformation);
// log.info("----请求admin=========" + objRR);
// if (objRR.getRel()) {
// return ObjectRestResponse.succ(objRR.getData());
// }
}
}
return ObjectRestResponse.succ();
return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA,"网络异常,请稍后再试");
}
......@@ -344,7 +344,8 @@ public class CertificationService {
// idInformation.setId(idInformation1.getId());
// idInformation.setUpdTime(new Date());
// idInformationMapper.updateByPrimaryKeySelective(idInformation);
throw new BaseException("该身份证已存在,不要重复认证!");
log.error("该身份证已存在,不要重复认证");
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"该身份证已存在,不要重复认证");
}
log.info("----addIdInformation---userid==="+idInformation.getUserLoginId()+"----name====" + idInformation.getName()+"---IdNumber==="+idInformation.getIdNumber());
//认证成功后修改用户,用户认证状态
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java
View file @ 35fb9a50
......@@ -23,6 +23,7 @@ public enum ResCode {
VEHICLE_BOOKED_RECORD_ALREADY_CHANGED(103001,"车辆预定申请已被审批"),
VEHICLE_BOOKED_RECORD_STATUS_CHANGED(103002,"车辆预定申请状态已变更"),
VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED(103003,"请输入仪表盘内当前显示的公里数"),
VEHICLE_BOOKED_RECORD_NOT_EXIST(103004, "预定记录不存在"),
CHECKUSER_AND_PHONE_NOT_NULL(103999, "收车或交车人姓名和电话不能为空"),
USERNAME_AND_TELE_NOT_NULL(104000, "使用人和电话不能为空"),
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BranchCompany.java
View file @ 35fb9a50
......@@ -18,6 +18,10 @@ public class BranchCompany {
@ApiModelProperty("主键id")
private Integer id;
@Column(name = "company_base_id")
@ApiModelProperty("主键id")
private Integer companyBaseId;
/**
* 分公司名称
*/
......@@ -119,4 +123,16 @@ public class BranchCompany {
@ApiModelProperty("旅游客服电话")
private String tourServicePhone;
/**
* 上下架:1-上架；2-下架
*/
private Integer state;
/**
* 是否删除：0-正常；1-删除
*/
@Column(name = "is_del")
private Integer isDel;
}
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BranchCompanyStockRight.java
View file @ 35fb9a50
package com.xxfc.platform.vehicle.entity;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import lombok.Data;
import javax.persistence.*;
import java.math.BigDecimal;
......@@ -17,10 +15,10 @@ public class BranchCompanyStockRight{
private Integer id;
/**
* 分公司id
* 有限公司id
*/
@Column(name = "company_id")
private Integer companyId;
@Column(name = "company_base_id")
private Integer companyBaseId;
/**
* 剩余股份
......@@ -37,15 +35,13 @@ public class BranchCompanyStockRight{
*/
private BigDecimal price;
private Integer state;
@Column(name = "company_pic")
private String companyPic;
/**
* 详情
* 股价类型:1-万/股；2-港万/股
*/
private String info;
private Integer type;
private Integer state;
/**
* 创建时间
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/CompanyBase.java 0 → 100644
View file @ 35fb9a50
package com.xxfc.platform.vehicle.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Data
@Table(name = "company_base")
public class CompanyBase {
@Id
@GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键id")
private Integer id;
/**
* 分公司名称
*/
@ApiModelProperty("分公司名称")
private String name;
/**
* 公司封面
*/
@ApiModelProperty("公司封面")
private String cover;
/**
* 轮播图
*/
@ApiModelProperty("轮播图")
private String images;
/**
* 片区id
*/
@Column(name = "zone_id")
@ApiModelProperty("片区id")
private Integer zoneId;
/**
* 公司简介
*/
@ApiModelProperty("公司简介")
private String describes;
/**
* 详情
*/
@ApiModelProperty("详情")
private String content;
/**
* 地址-省/直辖市(编码)
*/
@Column(name = "addr_province")
@ApiModelProperty("地址-省/直辖市(编码)")
private Integer addrProvince;
/**
* 地址-市(编码)
*/
@Column(name = "addr_city")
@ApiModelProperty("地址-市(编码)")
private Integer addrCity;
/**
* 地址-镇/县（编码）
*/
@Column(name = "addr_town")
@ApiModelProperty("地址-镇/县（编码）")
private Integer addrTown;
/**
* 创建时间
*/
@Column(name = "crt_time")
@ApiModelProperty("创建时间")
private Long crtTime;
/**
* 更新时间
*/
@Column(name = "upd_time")
@ApiModelProperty("更新时间")
private Long updTime;
/**
* 是否删除：0-正常；1-删除
*/
@Column(name = "is_del")
@ApiModelProperty("更新时间")
private Integer isDel;
}
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java
View file @ 35fb9a50
......@@ -176,7 +176,7 @@ public class VehicleBookRecord {
private Integer haveViolation;
/**
* 订单号
* 租车订单号或者旅游路线id
*/
private String orderNo;
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java
View file @ 35fb9a50
......@@ -4,9 +4,16 @@ import com.github.wxiaoqi.security.common.vo.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.List;
import java.util.Map;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.DATE_TIME_LINE_FORMATTER;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.YMR_SLASH_FORMATTER;
@Data
public class RentVehicleBookDTO extends PageParam {
//根据车型、时间、距离，门店，预定车辆
......@@ -57,9 +64,6 @@ public class RentVehicleBookDTO extends PageParam {
@ApiModelProperty("订单号")
private String orderNo;
@ApiModelProperty("停靠公司id")
Integer parkBranchCompanyId;
@ApiModelProperty("指定车牌")
String numberPlate;
......@@ -71,4 +75,35 @@ public class RentVehicleBookDTO extends PageParam {
*/
@ApiModelProperty("随车物品id以及数量 List<Map<id,数量>>")
Map<Integer,Integer> selectedAccItem;
@ApiModelProperty("停靠公司id")
Integer parkBranchCompanyId;
@ApiModelProperty("开始公司id")
Integer startCompanyId;
@ApiModelProperty("结束公司id")
Integer endCompanyId;
@ApiModelProperty("扩展开始时间")
String startDateExtend;
@ApiModelProperty("扩展结束时间")
String endDateExtend;
public void setBookStartDate(String bookStartDate) {
this.bookStartDate = bookStartDate;
//首次设置
if(null == this.startDateExtend) {
this.startDateExtend = YMR_SLASH_FORMATTER.format(LocalDate.parse(bookStartDate, YMR_SLASH_FORMATTER).minusDays(1L));
}
}
public void setBookEndDate(String bookEndDate) {
this.bookEndDate = bookEndDate;
//首次设置
if(null == this.endDateExtend) {
this.endDateExtend = YMR_SLASH_FORMATTER.format(LocalDate.parse(bookEndDate, YMR_SLASH_FORMATTER).plusDays(1L));
}
}
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyStockRightBiz.java
View file @ 35fb9a50
......@@ -147,8 +147,6 @@ public class BranchCompanyStockRightBiz extends BaseBiz<BranchCompanyStockRightM
stockInfoVo.setBalance(balance);
stockInfoVo.setTotal(total);
stockInfoVo.setState(2);
stockInfoVo.setCompanyPic(companyPic);
stockInfoVo.setCompanyId(companyId);
list.add(stockInfoVo);
}
mapper.addCompamyList(list);
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java 0 → 100644
View file @ 35fb9a50
package com.xxfc.platform.vehicle.biz;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.xxfc.platform.vehicle.entity.*;
import com.xxfc.platform.vehicle.mapper.CompanyBaseMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Service
@Slf4j
public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
//临时数据同步
// public ObjectRestResponse
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @ 35fb9a50
......@@ -436,6 +436,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
throw new BaseException(ResultCode.ONLY_BOOK_TWO_MONTH);
}
//检验时间是否可以预定
Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate(), bookVehicleVo.getNotCheckTimeLegal());
for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey(), map);
......@@ -458,9 +459,18 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
vehicleBookRecordBiz.save(vehicleBookRecord);
} else {
vehicleBookRecord = vehicleBookRecordBiz.selectById(bookVehicleVo.getVehicleBookRecordId());
vehicleBookRecord.setBookStartDate(startDay.toDate());
vehicleBookRecord.setBookEndDate(endDay.toDate());
vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
if(vehicleBookRecord == null) {
throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_NOT_EXIST.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_NOT_EXIST.getCode());
} else {
//先取消预定，然后再修改
bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
unbookVehicle(bookVehicleVo);
vehicleBookRecord.setBookStartDate(startDay.toDate());
vehicleBookRecord.setBookEndDate(endDay.toDate());
vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
}
}
// //添加预定时间记录
......@@ -510,9 +520,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
Integer andOperationFactor = andOpratorParam.get("andOperationFactor");
Integer andOperationRs = andOpratorParam.get("andOperationRs");
if(vehicleBookInfo != null && vehicleBookInfo.getBookedDate() != null &&
((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){
((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){//已经被预定
//当天已经被预定检查小时是否也被预定
return filterHourInfoBooked(vehicleId, hourInfo);
} else if ((vehicleBookInfo.getBookedDate() & andOperationFactor) == 0){//未被预定，查看时间是否被预定
return filterHourInfoBooked(vehicleId, hourInfo);
}
return Boolean.TRUE;
}
......@@ -787,13 +799,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
stringBuilder.append("保养");
break;
}
// List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
// if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
// stringBuilder.append("中，使用人：");
// stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
// stringBuilder.append(" 使用人电话：");
// stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
// }
List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
stringBuilder.append("中，使用人：");
stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
stringBuilder.append(" 使用人电话：");
stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
}
return stringBuilder.toString();
}
......@@ -907,7 +919,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
if((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()) == 0) {
if(!flag) { //解决重复执行的问题
Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
if (effected < 0) {
if (effected < 1) {
return Boolean.FALSE;
}
flag = true;
......@@ -1158,8 +1170,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
List<String> notBookedDates = Lists.newArrayList();
if(StringUtils.isNotBlank(dto.getStartDate())&&
StringUtils.isNotBlank(dto.getEndDate())) {
notBookedDates = convertDatePeriod2List(dto.getStartDate(),
dto.getEndDate());
// notBookedDates = convertDatePeriod2List(dto.getStartDate(),
// dto.getEndDate());
notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
dto.getEndDateExtend());
}
//若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）
......@@ -1185,8 +1199,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
List<String> notBookedDates = Lists.newArrayList();
if(StringUtils.isNotBlank(dto.getBookEndDate())&&
StringUtils.isNotBlank(dto.getBookEndDate())) {
notBookedDates = convertDatePeriod2List(dto.getBookStartDate(),
dto.getBookEndDate());
// notBookedDates = convertDatePeriod2List(dto.getBookStartDate(),
// dto.getBookEndDate());
notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
dto.getEndDateExtend());
}
//若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookHourInfoBiz.java
View file @ 35fb9a50
......@@ -151,8 +151,8 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
}
public static void main(String[] args) throws Exception{
int b = 24;
Integer a = b & 4;
Integer a = 7936 & 2047;
System.out.println(a);
}
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/CompanyBaseMapper.java 0 → 100644
View file @ 35fb9a50
package com.xxfc.platform.vehicle.mapper;
import com.xxfc.platform.vehicle.entity.CompanyBase;
import tk.mybatis.mapper.common.Mapper;
public interface CompanyBaseMapper extends Mapper<CompanyBase> {
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java
View file @ 35fb9a50
......@@ -163,6 +163,8 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
dto.setLimit(1);
dto.setPage(1);
dto.setParkBranchCompanyId(dto.getLiftCompany());
dto.setStartCompanyId(dto.getLiftCompany());
dto.setEndCompanyId(dto.getEndCompanyId());
//查询可车辆信息
PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
if (pageDataVO.getData().size() <= 0) {
......
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @ 35fb9a50
......@@ -639,9 +639,9 @@
<!-- yearNo4Where 标识时间参数是否用于where条件 -->
<if test="startCompanyId != null and endCompanyId != null ">
and (
(abr.to_lift_company = null or abr.to_lift_company = #{startCompanyId})
(abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
and
(abr.to_return_company = null or abr.to_return_company = #{endCompanyId})
(abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
)
</if>
<if test=" modelId != null ">
......
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