Skip to content

C
cloud-platform
Commit 5d5e3063 authored by jiaorz's avatar jiaorz
Browse files
Options

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

parents 87a210e8 0c74a132
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1126 additions and 382 deletions
.gitignore
View file @ 5d5e3063
......@@ -9,3 +9,6 @@ target/
ace-modules/ace-tool/src/main/resources/application-dev.yml
src/main/test/**
logs/**
xx-order/xx-order-server/logs/**
*.log
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
View file @ 5d5e3063
package com.github.wxiaoqi.security.admin.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
import java.util.Set;
/**
......@@ -49,6 +45,11 @@ public class AppUserManageDTO {
private Long registrationTimeEnd;
/**
* 身份标识 0：除普通用户外 1:与1相反
*/
private Integer postionState;
/**
* 用户来源:0-自来,1-用户邀请
*/
......
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserManageVo.java
View file @ 5d5e3063
......@@ -166,4 +166,9 @@ public class AppUserManageVo {
* 邀请人用户名
*/
private String inviter;
/**
* 身份信息
*/
private String positionName;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java
View file @ 5d5e3063
......@@ -5,6 +5,7 @@ import com.ace.cache.annotation.CacheClear;
import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
import com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper;
import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
import com.github.wxiaoqi.security.admin.vo.AppUserVo;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import org.apache.commons.beanutils.BeanUtils;
......@@ -128,4 +129,19 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
public void updateUserPositionByUserId(Integer userId, Integer positionId) {
mapper.updateUserPositionByUserId(userId,positionId);
}
public AppUserInfoVo findUserInfoByCode(String code) {
AppUserInfoVo appUserInfoVo = new AppUserInfoVo();
AppUserDetail appUserDetail = new AppUserDetail();
appUserDetail.setCode(code);
AppUserDetail userDetail = mapper.selectOne(appUserDetail);
if (userDetail==null){
return appUserInfoVo;
}
appUserInfoVo.setHeadimgurl(userDetail.getHeadimgurl());
appUserInfoVo.setNickname(userDetail.getNickname());
return appUserInfoVo;
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java
View file @ 5d5e3063
......@@ -348,7 +348,8 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
public void deleteByMemberIds(Collection<Integer> userIds) {
Example example = new Example(AppUserSellingWater.class);
Example.Criteria criteria = example.createCriteria();
criteria.andIn("sourceId",userIds);
criteria.orIn("sourceId",userIds);
criteria.orIn("userId",userIds);
mapper.deleteByExample(example);
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBusinessBiz.java
View file @ 5d5e3063
......@@ -46,6 +46,10 @@ public class UserBusinessBiz {
List<AppUserRelation> teamMemberBos = memberPage.getData();
if (CollectionUtils.isEmpty(teamMemberBos)) {
userTeamMemberVo.setPageNum(pageNo);
userTeamMemberVo.setPageSize(pageSize);
userTeamMemberVo.setTotalIncome(new BigDecimal(0));
userTeamMemberVo.setUserTeamMemberBos(Collections.EMPTY_LIST);
return userTeamMemberVo;
}
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java
View file @ 5d5e3063
......@@ -4,18 +4,24 @@ import com.ace.cache.annotation.Cache;
import com.github.wxiaoqi.security.admin.biz.*;
import com.github.wxiaoqi.security.admin.entity.*;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
import com.github.wxiaoqi.security.admin.vo.AppUserVo;
import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
import com.github.wxiaoqi.security.common.context.BaseContextHandler;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.msg.TableResultResponse;
import com.github.wxiaoqi.security.common.rest.CommonBaseController;
import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.xxfc.platform.order.entity.BaseOrder;
import com.xxfc.platform.order.feign.OrderFeign;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -29,13 +35,15 @@ import javax.ws.rs.GET;
import java.util.List;
import java.util.Map;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
/**
* @author keliii
*/
@RestController
@RequestMapping("app/user")
@Slf4j
public class AppUserController extends CommonBaseController {
public class AppUserController extends CommonBaseController{
@Autowired
AppUserBiz appUserBiz;
......@@ -145,7 +153,7 @@ public class AppUserController extends CommonBaseController {
UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
if(memberVo!=null){
BeanUtils.copyProperties(userDTO,memberVo);
// userDTO.setPayCount(orderFeign.baseOrderEntityList(new BaseOrder()));
userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "1,4,5,6,7", userid).getData());
Integer level=memberVo.getMemberLevel();
BaseUserMemberLevel memberLevel=userMemberLevelBiz.getLevel(level);
if (memberLevel!=null){
......@@ -269,4 +277,12 @@ public class AppUserController extends CommonBaseController {
Map<String, Integer> findAppusersByUserNames(@RequestParam(value = "phones") List<String> phones){
return appUserLoginBiz.findPhoneAndUserIdMapByPhones(phones);
}
@GetMapping("/app/unauth/user_info/{code}")
@IgnoreUserToken
@IgnoreClientToken
public ObjectRestResponse<AppUserInfoVo> findUserInfoByCode(@PathVariable("code") String code){
AppUserInfoVo appUserInfoVo = userDetailBiz.findUserInfoByCode(code);
return ObjectRestResponse.succ(appUserInfoVo);
}
}
ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
View file @ 5d5e3063
......@@ -70,11 +70,21 @@
m.crt_time as timeOfMembership,
m.recent_recharge as recentRecharge,
m.name as memberName,
ul.username as inviter
ul.username as inviter,
aup.name as `positionName`
from
app_user_login l
left join
app_user_detail d
inner join
(select * from app_user_detail where 1=1 <if test="postionState != null">
<choose>
<when test="postionState == 0">
and `position_id`=#{postionState}
</when>
<otherwise>
and <![CDATA[`position_id`<>#{postionState}]]>
</otherwise>
</choose>
</if>) d
on
d.userid = l.id
left join
......@@ -95,6 +105,9 @@
) m
on
l.id = m.user_id
left join
`app_user_position` as aup
on aup.id = d.position_id
where l.isdel = 0
<if test="mobile !=null and mobile !='' ">
and l.username like CONCAT('%',#{mobile},'%')
......@@ -119,7 +132,6 @@
and d.source = #{source}
</if>
order by l.id ASC
</select>
<update id="updateUserMemberStatusByUserId">
......
xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/BuyVehicleForm.java
View file @ 5d5e3063
......@@ -89,4 +89,10 @@ public class BuyVehicleForm implements Serializable {
@Column(name = "user_id")
@ApiModelProperty(value = "用户id")
private Integer userId;
/**
* 0未处理 1已处理
*/
@Column(name = "status")
private Integer status;
}
xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/dto/BuyVehicleFormFindDTO.java 0 → 100644
View file @ 5d5e3063
package com.xxfc.platform.app.entity.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/9 16:25
*/
@Data
public class BuyVehicleFormFindDTO extends PageParam {
private Long startTime;
private Long endTime;
private Integer companyId;
private Integer areaId;
private Integer status;
}
xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/BuyVehicleFormPageVo.java 0 → 100644
View file @ 5d5e3063
package com.xxfc.platform.app.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/9 15:36
*/
@Data
public class BuyVehicleFormPageVo {
/**
* 主键
*/
@ApiModelProperty("主键")
private Integer id;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间", hidden = true )
private Long crtTime;
/**
* 车型id
*/
@ApiModelProperty(value = "车型id")
private Integer modelId;
/**
* 联系人名称
*/
@ApiModelProperty(value = "联系人名称")
private String contactName;
/**
* 联系人电话
*/
@ApiModelProperty(value = "联系人电话")
private String contactPhone;
/**
* 预约时间
*/
@ApiModelProperty(value = "预约时间")
private Long bookTime;
/**
* 公司
*/
@ApiModelProperty(value = "公司")
private String companyName;
/**
* 0未处理 1已处理
*/
private Integer status;
/**
* 负责人
*/
private String leaderName;
/**
* 负责人电话
*/
private String leaderPhone;
}
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BuyVehicleFormBiz.java
View file @ 5d5e3063
package com.xxfc.platform.app.biz;
import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.app.entity.dto.BuyVehicleFormFindDTO;
import com.xxfc.platform.app.entity.vo.BuyVehicleFormPageVo;
import com.xxfc.platform.vehicle.feign.VehicleFeign;
import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xxfc.platform.app.entity.BuyVehicleForm;
import com.xxfc.platform.app.mapper.BuyVehicleFormMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import java.util.*;
import java.util.stream.Collectors;
/**
* 购房车提交表单
*
......@@ -14,5 +27,67 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
* @date 2019-07-09 19:39:47
*/
@Service
public class BuyVehicleFormBiz extends BaseBiz<BuyVehicleFormMapper,BuyVehicleForm> {
public class BuyVehicleFormBiz extends BaseBiz<BuyVehicleFormMapper, BuyVehicleForm> {
@Autowired
private VehicleFeign vehicleFeign;
@Autowired
private UserFeign userFeign;
public PageDataVO<BuyVehicleFormPageVo> findBuyVehicleFormWithPage(BuyVehicleFormFindDTO buyVehicleFormFindDTO) {
PageDataVO<BuyVehicleFormPageVo> buyVehicleFormPage = new PageDataVO<>();
List<Integer> cpyIds = new ArrayList<>();
if(Objects.nonNull(buyVehicleFormFindDTO.getAreaId())){
List<Integer> companyIds = vehicleFeign.findCompanyIdsByAreaId(buyVehicleFormFindDTO.getAreaId());
if (Objects.isNull(buyVehicleFormFindDTO.getCompanyId())){
cpyIds.addAll(companyIds);
}else {
boolean flag = companyIds.contains(buyVehicleFormFindDTO.getCompanyId());
if (flag){
cpyIds.add(buyVehicleFormFindDTO.getCompanyId());
}else {
return buyVehicleFormPage;
}
}
}else {
if (Objects.nonNull(buyVehicleFormFindDTO.getCompanyId())){
cpyIds.add(buyVehicleFormFindDTO.getCompanyId());
}
}
PageDataVO<BuyVehicleForm> pageDataVO = PageDataVO.pageInfo(buyVehicleFormFindDTO.getPage(),buyVehicleFormFindDTO.getLimit(),()->mapper.findBuyVehicleForms(buyVehicleFormFindDTO, cpyIds));
List<BuyVehicleForm> data = pageDataVO.getData();
if (CollectionUtils.isEmpty(data)){
return buyVehicleFormPage;
}
List<Integer> companyIds = data.stream().map(BuyVehicleForm::getCompanyId).collect(Collectors.toList());
Map<Integer, BranComanyLeaderVo> comanyLeaderVoMap = vehicleFeign.findCompanyLeaderMapByIds(companyIds);
List<BuyVehicleFormPageVo> buyVehicleFormPageVoList = new ArrayList<>();
BuyVehicleFormPageVo buyVehicleFormPageVo;
for (BuyVehicleForm buyVehicleForm : data) {
buyVehicleFormPageVo = new BuyVehicleFormPageVo();
BeanUtils.copyProperties(buyVehicleForm,buyVehicleFormPageVo);
if(comanyLeaderVoMap!=null) {
BranComanyLeaderVo branComanyLeaderVo = comanyLeaderVoMap.get(buyVehicleForm.getCompanyId());
buyVehicleFormPageVo.setLeaderName(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getLeader());
buyVehicleFormPageVo.setLeaderPhone(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getPhone());
buyVehicleFormPageVo.setCompanyName(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getName());
}
buyVehicleFormPageVoList.add(buyVehicleFormPageVo);
}
buyVehicleFormPage.setData(buyVehicleFormPageVoList);
buyVehicleFormPage.setPageSize(pageDataVO.getPageSize());
buyVehicleFormPage.setPageNum(pageDataVO.getPageNum());
buyVehicleFormPage.setTotalPage(pageDataVO.getTotalPage());
buyVehicleFormPage.setTotalCount(pageDataVO.getTotalCount());
return buyVehicleFormPage;
}
public void processApplyStatusById(Integer id) {
mapper.updateApplyStatusById(id);
}
}
\ No newline at end of file
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/BuyVehicleFormMapper.java
View file @ 5d5e3063
package com.xxfc.platform.app.mapper;
import com.xxfc.platform.app.entity.BuyVehicleForm;
import com.xxfc.platform.app.entity.dto.BuyVehicleFormFindDTO;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
/**
* 购房车提交表单
*
......@@ -11,5 +15,8 @@ import tk.mybatis.mapper.common.Mapper;
* @date 2019-07-09 19:39:47
*/
public interface BuyVehicleFormMapper extends Mapper<BuyVehicleForm> {
List<BuyVehicleForm> findBuyVehicleForms(@Param("bvf") BuyVehicleFormFindDTO buyVehicleFormFindDTO,@Param("companyIds") List<Integer> companyIds);
void updateApplyStatusById(Integer id);
}
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/admin/BuyVehicleFormAdminController.java
View file @ 5d5e3063
package com.xxfc.platform.app.rest.admin;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.app.biz.BuyVehicleFormBiz;
import com.xxfc.platform.app.entity.dto.BuyVehicleFormFindDTO;
import com.xxfc.platform.app.entity.vo.BuyVehicleFormPageVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* @author libin
......@@ -11,8 +15,21 @@ import org.springframework.web.bind.annotation.RestController;
* @data 2019/8/9 13:55
*/
@RestController
@RequestMapping("admin/buy_vehicle")
public class BuyVehicleFormAdminController {
@Autowired
private BuyVehicleFormBiz vehicleFormBiz;
@PostMapping("/page")
public ObjectRestResponse<BuyVehicleFormPageVo> findBuyVehicleFormWithPage(@RequestBody BuyVehicleFormFindDTO buyVehicleFormFindDTO){
PageDataVO<BuyVehicleFormPageVo> pageDataVO = vehicleFormBiz.findBuyVehicleFormWithPage(buyVehicleFormFindDTO);
return ObjectRestResponse.succ(pageDataVO);
}
@PostMapping("/status/{id}")
public ObjectRestResponse<Void> processApplyById(@PathVariable(value = "id") Integer id){
vehicleFormBiz.processApplyStatusById(id);
return ObjectRestResponse.succ();
}
}
xx-app/xx-app-server/src/main/resources/mapper/BuyVehicleFormMapper.xml
View file @ 5d5e3063
......@@ -8,13 +8,42 @@
<result property="id" column="id"/>
<result property="crtTime" column="crt_time"/>
<result property="updTime" column="upd_time"/>
<result property="name" column="name"/>
<result property="modelId" column="model_id"/>
<result property="contactName" column="contact_name"/>
<result property="contactPhone" column="contact_phone"/>
<result property="bookTime" column="book_time"/>
<result property="companyId" column="company_id"/>
<result property="remark" column="remark"/>
<result property="status" column="status"/>
</resultMap>
<select id="findBuyVehicleForms" resultMap="buyVehicleFormMap">
select * from `buy_vehicle_form` where 1=1
<if test="bvf.startTime != null and bvf.endTime !=null">
and `book_time` between #{bvf.startTime} and #{bvf.endTime}
</if>
<if test="bvf.startTime != null and bvf.endTime == null">
and `book_time`>= #{bvf.startTime}
</if>
<if test="bvf.endTime != null and bvf.startTime == null">
and <![CDATA[ `book_time`<= #{bvf.endTime}]]>
</if>
<if test="bvf.areaId != null || bvf.companyId !=null">
<if test="companyIds != null and companyIds.size() != 0">
and `company_id` in
<foreach collection="companyIds" item="cpyId" close=")" open="(" separator=",">
#{cpyId}
</foreach>
</if>
</if>
<if test="bvf.status != null">
and `status`=#{bvf.status}
</if>
order by `book_time` desc
</select>
<update id="updateApplyStatusById">
update `buy_vehicle_form` set `status`=1 where `id`=#{id}
</update>
</mapper>
\ No newline at end of file
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopDetailDTO.java
View file @ 5d5e3063
......@@ -68,4 +68,9 @@ public class CampsiteShopDetailDTO {
@ApiModelProperty(value = "电话")
private String phone;
/**
* 店铺logo
*/
private String logo;
}
xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopDetailVo.java
View file @ 5d5e3063
......@@ -92,4 +92,9 @@ public class CampsiteShopDetailVo {
@ApiModelProperty(value = "電話")
private String phone;
/**
* 店铺logo
*/
private String logo;
}
xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml
View file @ 5d5e3063
......@@ -58,7 +58,7 @@
<!--根据id查询详情-->
<select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,
select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,
`content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude` from `campsite_shop` where `id`=#{id}
</select>
......
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyOrderStatistics.java
View file @ 5d5e3063
......@@ -26,6 +26,13 @@ public class DailyOrderStatistics {
@Column(name = "one_day")
private String oneDay;
/**
* 分公司id
*/
@Column(name = "branch_company_id")
private Integer branchCompanyId;
/**
* 成交总金额
*/
......
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java
View file @ 5d5e3063
......@@ -23,11 +23,6 @@ import java.util.Date;
@Table(name = "daily_vehicle_order_statistics")
public class DailyVehicleOrderStatistics extends DailyOrderStatistics{
/**
* 成交总金额
*/
@Column(name = "gmv")
private BigDecimal gmv;
/**
* 预交押金总额
......@@ -60,5 +55,10 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics{
@Column(name = "postpone")
private BigDecimal postpone;
/**
* 取消订单扣款总额
*/
@Column(name = "penal_sum")
private BigDecimal penalSum;
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderStatistics.java 0 → 100644
View file @ 5d5e3063
package com.xxfc.platform.order.entity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author Administrator
*/
@Data
@ApiModel(value = "月订单统计实体")
public class OrderStatistics {
/**
* 月成交总金额
*/
@ApiModelProperty(value = "月成交总金额")
private BigDecimal totalGmv;
/**
* 月押金总额
*/
@ApiModelProperty(value = "月押金总额")
private BigDecimal totalSecurityDeposit;
/**
* 月退还押金总额
*/
@ApiModelProperty(value = "月退还押金总额")
private BigDecimal totalRefundSecurityDeposit;
/**
* 月赔偿总额
*/
@ApiModelProperty(value = "月赔偿总额")
private BigDecimal totalCompensation;
/**
* 月违章总额
*/
@ApiModelProperty(value = "月违章总额")
private BigDecimal totalForfeit;
/**
* 月取消订单扣款总额
*/
@ApiModelProperty(value = "月取消订单扣款总额")
private BigDecimal totalPenalSum;
/**
* 月延期扣款总额
*/
@ApiModelProperty(value = "月延期扣款总额")
private BigDecimal totalPostpone;
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java
View file @ 5d5e3063
......@@ -19,6 +19,6 @@ import java.util.Set;
*/
@FeignClient(name = "order")
public interface OrderFeign {
// @GetMapping("/baseOrder/entityList")
// public ObjectRestResponse<List<BaseOrder>> baseOrderEntityList(@RequestParam("entity") Map<String, Object> entity);
@GetMapping("/baseOrder/count")
public ObjectRestResponse<Integer> baseOrderCount(@RequestParam("hasMemberRight") Integer hasMemberRight,@RequestParam("multiStatus") String multiStatus, @RequestParam("userId") Integer userId);
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/QueryOrderDTO.java
View file @ 5d5e3063
......@@ -25,7 +25,8 @@ public class QueryOrderDTO extends PageParam {
"3--待付款\n" +
"4--待出行\n" +
"5--出行中（进行中）\n" +
"6--已完成")
"6--已完成"+
"7--定損中")
private Integer status;
private String multiStatus;
......
xx-order/xx-order-server/pom.xml
View file @ 5d5e3063
......@@ -38,6 +38,13 @@
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<!-- hutool工具类-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>4.5.10</version>
</dependency>
</dependencies>
<build>
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
View file @ 5d5e3063
......@@ -372,6 +372,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
sendQueue(orderMQDTO, sign);
}
@Override
public void updateSelectiveById(BaseOrder entity) {
super.updateSelectiveById(entity);
}
/**
* 更新（不成功抛异常）
*
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyMembersOrderStatisticsBiz.java
View file @ 5d5e3063
......@@ -3,14 +3,20 @@ package com.xxfc.platform.order.biz;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper;
import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
......@@ -19,19 +25,26 @@ import java.util.Map;
* @author Administrator
*/
@Service
@Slf4j
public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderStatisticsMapper, DailyMembersOrderStatistics> {
private final Integer headOfficeId = 1;
@Transactional(rollbackFor = Exception.class)
public boolean memberOrderStatistics() {
try {
HashMap<String, Object> resultMap = new HashMap<>();
Map<String, Object> travelGmv = mapper.getTravelGmv();
resultMap.putAll(travelGmv);
DailyMembersOrderStatistics MembersStatistics = new DailyMembersOrderStatistics();
BeanUtils.copyProperties(MembersStatistics, resultMap);
insertSelective(MembersStatistics);
List<Map<String, Object>> travelGmv = mapper.getTravelGmv();
if (CollectionUtils.isEmpty(travelGmv)) {
return true;
}
for (Map<String, Object> stringObjectMap : travelGmv) {
DailyMembersOrderStatistics MembersStatistics = new DailyMembersOrderStatistics();
BeanUtils.copyProperties(MembersStatistics, stringObjectMap);
insertSelective(MembersStatistics);
}
return true;
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
e.printStackTrace();
return false;
}
......@@ -39,7 +52,16 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
@Override
public int insertSelectiveRe(DailyMembersOrderStatistics entity) {
entity.setCrtTime(new Date());
Date date = new Date();
if (log.isDebugEnabled()){
log.debug("时间******[{}]",date);
}
entity.setBranchCompanyId(headOfficeId);
entity.setCrtTime(date);
return mapper.insertSelective(entity);
}
public OrderStatistics findAll(Integer companyId) {
return mapper.monthOrderTotal(companyId);
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyTravelOrderStatisticsBiz.java
View file @ 5d5e3063
package com.xxfc.platform.order.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.util.EntityUtils;
import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
/**
* 每日旅游订单统计
......@@ -20,27 +21,54 @@ import java.util.Map;
@Service
public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStatisticsMapper, DailyTravelOrderStatistics> {
@Transactional(rollbackFor = Exception.class)
public boolean StatisticsOfTravelOrders() {
try {
HashMap<String, Object> resultMap = new HashMap<>();
Map<String, Object> travelGmv = mapper.getTravelGmv();
BigDecimal travelPenalSum = mapper.getTravelPenalSum();
resultMap.putAll(travelGmv);
resultMap.put("penalSum", travelPenalSum);
DailyTravelOrderStatistics TravelStatistics = new DailyTravelOrderStatistics();
BeanUtils.copyProperties(TravelStatistics, resultMap);
insertSelective(TravelStatistics);
ArrayList<DailyTravelOrderStatistics> objects = new ArrayList<>();
List<DailyTravelOrderStatistics> travelGmv = mapper.getTravelGmv();
objects.addAll(travelGmv);
List<DailyTravelOrderStatistics> travelPenalSum = mapper.getTravelPenalSum();
objects.addAll(travelPenalSum);
insertByList(objects);
return true;
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return false;
}
}
private void insertByList(ArrayList<DailyTravelOrderStatistics> objects) throws Exception {
if (CollectionUtils.isNotEmpty(objects)) {
HashMap<Integer, DailyTravelOrderStatistics> map = new HashMap<>();
for (DailyTravelOrderStatistics object : objects) {
DailyTravelOrderStatistics statistics = map.get(object.getBranchCompanyId());
if (statistics == null) {
statistics = new DailyTravelOrderStatistics();
map.put(object.getBranchCompanyId(), statistics);
}
BeanUtil.copyProperties(object, statistics, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
}
for (Map.Entry<Integer, DailyTravelOrderStatistics> e : map.entrySet()) {
insertSelectiveRe(e.getValue());
}
}
}
@Override
public int insertSelectiveRe(DailyTravelOrderStatistics entity) {
entity.setCrtTime(new Date());
return mapper.insertSelective(entity);
}
public OrderStatistics findAll(Integer branchCompanyId) {
return mapper.monthOrderTotal(branchCompanyId);
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyVehicleOrderStatisticsBiz.java
View file @ 5d5e3063
package com.xxfc.platform.order.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.alibaba.fastjson.JSON;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
import com.xxfc.platform.order.entity.DailyVehicleOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper;
import com.xxfc.platform.order.pojo.DedDetailDTO;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.util.*;
/** 每日租车订单统计
/**
* 每日租车订单统计
*
* @author Administrator
*/
@Service
......@@ -23,33 +28,39 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
private final Integer TYPE_DEFERRED = 1;
private final Integer TYPE_DAMAGE = 2;
private final Integer TYPE_OTHER = 3;
@Transactional(rollbackFor = Exception.class)
public boolean StatisticsOfCarRentalOrders() {
public boolean StatisticsOfCarRentalOrders() {
try {
HashMap<String, Object> resultMap = new HashMap<>();
ArrayList<DailyVehicleOrderStatistics> result = new ArrayList<>();
// 获取每日租车订单成交金和押金总额
Map<String, BigDecimal> gmvAndMarginTotal = mapper.getGmvAndMarginTotal();
resultMap.putAll(gmvAndMarginTotal);
// 获取车辆
BigDecimal penalSum = mapper.getPenalSum();
resultMap.put("penalSum", penalSum);
List<DailyVehicleOrderStatistics> gmvAndMarginTotal = mapper.getGmvAndMarginTotal();
result.addAll(gmvAndMarginTotal);
// 获取取消订单扣款总额
List<DailyVehicleOrderStatistics> penalSum = mapper.getPenalSum();
result.addAll(penalSum);
// 获取订单退还押金总额
BigDecimal refundSecurityDeposit = mapper.getRefundSecurityDeposit();
resultMap.put("refundSecurityDeposit", refundSecurityDeposit);
// 获取违章查询总和
BigDecimal violationMoney = mapper.getViolationMoney();
resultMap.put("violationMoney", violationMoney);
// 获取赔偿和延期JSON字符串
List<String> compensationAndPostpone = mapper.getCompensationAndPostpone();
// 获取赔偿和延期JSON字符串转换为map
Map<String, BigDecimal> cpMap = getCompensationAndPostponeMap(compensationAndPostpone);
resultMap.putAll(cpMap);
DailyVehicleOrderStatistics orderStatistics = new DailyVehicleOrderStatistics();
BeanUtils.copyProperties(orderStatistics,resultMap);
insertSelective(orderStatistics);
List<DailyVehicleOrderStatistics> refundSecurityDeposit = mapper.getRefundSecurityDeposit();
result.addAll(refundSecurityDeposit);
// 获取违章查询总和
List<DailyVehicleOrderStatistics> violationMoney = mapper.getViolationMoney();
result.addAll(violationMoney);
// 获取赔偿和延期JSON字符串
List<Map> compensationAndPostpone = mapper.getCompensationAndPostpone();
// 获取赔偿和延期JSON字符串转换为map
List<DailyVehicleOrderStatistics> compensationAndPostpones = getCompensationAndPostpones(compensationAndPostpone);
result.addAll(compensationAndPostpones);
InsertByList(result);
return true;
} catch (Exception e) {
e.printStackTrace();
......@@ -59,53 +70,127 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
}
private void InsertByList(ArrayList<DailyVehicleOrderStatistics> result) throws Exception {
if(CollectionUtils.isNotEmpty(result)) {
Map<Integer, DailyVehicleOrderStatistics> map = new HashMap<>();
for (DailyVehicleOrderStatistics value : result) {
Integer branchCompanyId = value.getBranchCompanyId();
DailyVehicleOrderStatistics statistics = map.get(branchCompanyId);
if (statistics == null) {
statistics = new DailyVehicleOrderStatistics();
map.put(branchCompanyId, statistics);
BeanUtil.copyProperties(
value,
statistics,
CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
}
for (Map.Entry<Integer, DailyVehicleOrderStatistics> entry : map.entrySet()) {
insertSelectiveRe(entry.getValue());
}
}
}
}
/**
* 获取赔偿总额和延期总额
*/
private Map<String, BigDecimal> getCompensationAndPostponeMap(List<String> compensationAndPostpone) {
if (CollectionUtils.isNotEmpty(compensationAndPostpone)) {
List<DedDetailDTO> sumDedDetailDTOs = new ArrayList<>();
for (String value : compensationAndPostpone) {
List<DedDetailDTO> dedDetailDTOS = JSON.parseArray(value, DedDetailDTO.class);
sumDedDetailDTOs.addAll(dedDetailDTOS);
private List<DailyVehicleOrderStatistics> getCompensationAndPostpones(List<Map> list) {
if (CollectionUtils.isNotEmpty(list)) {
//获取分公全部赔偿和延期DedDetailDTO
HashMap<Integer, List<DedDetailDTO>> map = new HashMap<>();
for (Map value : list) {
if (value != null) {
//获取分公司id
Integer branchCompanyId = (Integer) value.get("branchCompanyId");
List<DedDetailDTO> strings = map.get(branchCompanyId);
if (strings == null) {
strings = new ArrayList<DedDetailDTO>();
map.put(branchCompanyId, strings);
}
String str = (String) value.get("dedDetail");
if (StringUtils.isNotBlank(str)) {
List<DedDetailDTO> dedDetailDTOS = JSON.parseArray(str, DedDetailDTO.class);
if (CollectionUtils.isNotEmpty(dedDetailDTOS)) {
strings.addAll(dedDetailDTOS);
}
}
}
}
List<DailyVehicleOrderStatistics> result = new ArrayList<>();
if (!map.isEmpty()) {
//获取分工对象集合
for (Map.Entry<Integer, List<DedDetailDTO>> entry : map.entrySet()) {
DailyVehicleOrderStatistics statistics = new DailyVehicleOrderStatistics();
//公司id添加到对象当中
statistics.setBranchCompanyId(entry.getKey());
//获取公司的JSON字符串
List<DedDetailDTO> sumDedDetailDTOs = entry.getValue();
// 获取赔偿金额总和
BigDecimal compensation = get(sumDedDetailDTOs, TYPE_DAMAGE);
BigDecimal compensation = get(sumDedDetailDTOs, TYPE_DAMAGE);
statistics.setCompensation(compensation);
// 获取延期金额总和
BigDecimal postpone = get(sumDedDetailDTOs, TYPE_DEFERRED);
Map<String, BigDecimal> resultMap = new HashMap<>();
resultMap.put("compensation", compensation);
resultMap.put("postpone", postpone);
return resultMap;
BigDecimal postpone = get(sumDedDetailDTOs, TYPE_DEFERRED);
statistics.setPostpone(postpone);
//// 其他款项总金额
// BigDecimal other = get(sumDedDetailDTOs, TYPE_OTHER);
result.add(statistics);
}
}
return result;
}
return new HashMap<String, BigDecimal>();
return new ArrayList<>();
}
/**
* 根据type获取对应的金额总和
*
* @param sumDedDetailDTOs
* @param TYPE_DAMAGE
* @param type 金额类型
* @return
*/
private BigDecimal get(List<DedDetailDTO> sumDedDetailDTOs, Integer TYPE_DAMAGE) {
private BigDecimal get(List<DedDetailDTO> sumDedDetailDTOs, Integer type) {
if (CollectionUtils.isNotEmpty(sumDedDetailDTOs)) {
BigDecimal aggregateAmount = sumDedDetailDTOs.stream()
.filter(d -> TYPE_DAMAGE.equals(d.getType()))
.filter(d -> type.equals(d.getType()))
.map(DedDetailDTO::getCost)
.reduce(BigDecimal.ZERO, BigDecimal::add);
return aggregateAmount;
}
return null;
return BigDecimal.ZERO;
}
@Override
public int insertSelectiveRe(DailyVehicleOrderStatistics entity) {
Date date = new Date();
entity.setCrtTime(new Date());
return mapper.insertSelective(entity);
}
public OrderStatistics findAll(Integer companyId) {
return mapper.monthOrderTotal(companyId);
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java 0 → 100644
View file @ 5d5e3063
package com.xxfc.platform.order.biz;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.xxfc.platform.order.entity.OrderStatistics;
import com.xxfc.platform.order.mapper.OrderStatisticsMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Objects;
/**
* @author Administrator
*/
@Service
public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStatistics> {
@Autowired
private DailyVehicleOrderStatisticsBiz vehicleBiz;
@Autowired
private DailyTravelOrderStatisticsBiz TravelBiz;
@Autowired
private DailyMembersOrderStatisticsBiz membersBiz;
public OrderStatistics getToalOrder(Integer companyId) {
OrderStatistics result = new OrderStatistics();
ArrayList<OrderStatistics> orderStatistics = new ArrayList<>();
OrderStatistics vehicle = vehicleBiz.findAll(companyId);
if (vehicle != null) {
orderStatistics.add(vehicle);
}
OrderStatistics tour = TravelBiz.findAll(companyId);
if (vehicle != null) {
orderStatistics.add(tour);
}
OrderStatistics member = membersBiz.findAll(companyId);
if (vehicle != null) {
orderStatistics.add(member);
}
result.setTotalGmv(orderStatistics.stream().map(OrderStatistics::getTotalGmv).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
result.setTotalForfeit(orderStatistics.stream().map(OrderStatistics::getTotalForfeit).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
result.setTotalCompensation(orderStatistics.stream().map(OrderStatistics::getTotalCompensation).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
result.setTotalRefundSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalRefundSecurityDeposit).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
result.setTotalSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalSecurityDeposit).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
result.setTotalPenalSum(orderStatistics.stream().map(OrderStatistics::getTotalPenalSum).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
result.setTotalPostpone(orderStatistics.stream().map(OrderStatistics::getTotalPostpone).filter(o-> Objects.nonNull(o)).reduce(BigDecimal.ZERO, BigDecimal::add));
return result;
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
View file @ 5d5e3063
......@@ -286,7 +286,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
baseOrderBiz.updateSelectiveById(baseOrder);
baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
} else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) { //还车
if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
//添加非定损记录
......@@ -298,7 +298,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
//修改订单状态为已完成
baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
baseOrderBiz.updateSelectiveById(baseOrder);
baseOrderBiz.updateSelectiveByIdReT(baseOrder);
//修改订单详情是否押金全部退还
orderRentVehicleDetail.setFixedLossStatus(0);
orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
......@@ -312,7 +312,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
baseOrderBiz.updateSelectiveById(baseOrder);
baseOrderBiz.updateSelectiveByIdReT(baseOrder);
orderRentVehicleDetail.setFixedLossStatus(1);
orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
}
......@@ -334,7 +334,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
throw new BaseException("定损记录不存在！请联系客服");
}
baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
baseOrderBiz.updateSelectiveById(baseOrder);
baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
}
}
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/SwaggerConfig.java
View file @ 5d5e3063
......@@ -62,7 +62,7 @@ public class SwaggerConfig {
return new ApiInfoBuilder()
.title("api swagger document")
.description("前后端联调swagger api 文档")
.version("2.1.5.5")
.version("2.1.5.5")
.build();
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java
View file @ 5d5e3063
package com.xxfc.platform.order.jobhandler;
import cn.hutool.core.date.DateUtil;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.google.common.collect.Lists;
import com.xxfc.platform.order.biz.*;
import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
import com.xxfc.platform.order.contant.enumerate.*;
import com.xxfc.platform.order.entity.BaseOrder;
import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
import com.xxfc.platform.order.entity.OrderViolation;
import com.xxfc.platform.universal.constant.DictionaryKey;
import com.xxfc.platform.universal.entity.Dictionary;
......@@ -17,6 +17,7 @@ import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.handler.annotation.JobHandler;
import com.xxl.job.core.log.XxlJobLogger;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -24,10 +25,12 @@ import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.weekend.WeekendSqls;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
/**
......@@ -78,7 +81,7 @@ public class RentDepositJobHandler extends IJobHandler {
.where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE)
.andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH) //已完成的订单
.andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL) //已归还了部分押金
.andLessThanOrEqualTo(BaseOrder::getRefundTime, System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000))
.andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)))
// .andLike(BaseOrder::getId, "%"+ i)
).build());
......@@ -88,17 +91,41 @@ public class RentDepositJobHandler extends IJobHandler {
setOrderId(baseOrder.getId());
}});
OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
setDetailId(orvd.getId());
setIsDel(SYS_FALSE);
Integer crosstownTypeEnum;
//判断是否定损过
if(SYS_TRUE.equals(orvd.getFixedLossStatus())) {
crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
}else {
crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
}
OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
setOrderId(baseOrder.getId());
setType(crosstownTypeEnum);
}});
//还车扣除款 剩余的 钱，再减去违章预备金
BigDecimal refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
refundDesc += ")";
orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)) < 0) {
OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
setDetailId(orvd.getId());
setIsDel(SYS_FALSE);
}});
if(null != orderViolation) {
//还车扣除款 剩余的 钱，再减去违章预备金
BigDecimal refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
refundDesc += ")";
orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
}
}
//获取交车时间
// List<OrderVehicleCrosstown> crosstowns = crosstownBiz.selectByExample(
// new Example.Builder(BaseOrder.class)
// .where(WeekendSqls.<OrderVehicleCrosstown>custom()
// .andIn(OrderVehicleCrosstown::getType, Lists.newArrayList(CrosstownTypeEnum.ARRIVE.getCode(), CrosstownTypeEnum.FIXED_LOSS.getCode()))
// .andEqualTo(OrderVehicleCrosstown::getOrderId, baseOrder.getId())).build());
}
// }
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyMembersOrderStatisticsMapper.java
View file @ 5d5e3063
package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
import java.util.Map;
/**
......@@ -10,6 +12,9 @@ import java.util.Map;
* @author Administrator
*/
public interface DailyMembersOrderStatisticsMapper extends Mapper<DailyMembersOrderStatistics> {
Map<String, Object> getTravelGmv();
List<Map<String, Object>> getTravelGmv();
OrderStatistics monthOrderTotal(Integer companyId);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyTravelOrderStatisticsMapper.java
View file @ 5d5e3063
package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
import org.springframework.stereotype.Repository;
import com.xxfc.platform.order.entity.OrderStatistics;
import tk.mybatis.mapper.common.Mapper;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
......@@ -13,7 +14,9 @@ import java.util.Map;
public interface DailyTravelOrderStatisticsMapper extends Mapper<DailyTravelOrderStatistics> {
Map<String,Object> getTravelGmv();
List<DailyTravelOrderStatistics> getTravelGmv();
BigDecimal getTravelPenalSum();
List<DailyTravelOrderStatistics> getTravelPenalSum();
OrderStatistics monthOrderTotal(Integer branchCompanyId);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyVehicleOrderStatisticsMapper.java
View file @ 5d5e3063
package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.DailyVehicleOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import tk.mybatis.mapper.common.Mapper;
import java.math.BigDecimal;
......@@ -13,13 +14,15 @@ import java.util.Map;
*/
public interface DailyVehicleOrderStatisticsMapper extends Mapper<DailyVehicleOrderStatistics> {
Map<String, BigDecimal> getGmvAndMarginTotal();
List<DailyVehicleOrderStatistics> getGmvAndMarginTotal();
List<String> getCompensationAndPostpone();
List<Map> getCompensationAndPostpone();
BigDecimal getPenalSum();
List<DailyVehicleOrderStatistics> getPenalSum();
BigDecimal getRefundSecurityDeposit();
List<DailyVehicleOrderStatistics> getRefundSecurityDeposit();
BigDecimal getViolationMoney();
List<DailyVehicleOrderStatistics> getViolationMoney();
OrderStatistics monthOrderTotal(Integer companyId);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderStatisticsMapper.java 0 → 100644
View file @ 5d5e3063
package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.OrderStatistics;
import tk.mybatis.mapper.common.Mapper;
/**
* @author Administrator
*/
public interface OrderStatisticsMapper extends Mapper<OrderStatistics> {
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @ 5d5e3063
package com.xxfc.platform.order.rest;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
......@@ -48,12 +49,16 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.weekend.WeekendSqls;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
......@@ -155,12 +160,27 @@ public class BaseOrderController extends CommonBaseController implements UserRes
return new ObjectRestResponse<>().data(pages);
}
@ApiOperation("根据参数查询，等于")
@RequestMapping(value = "/entityList",method = RequestMethod.GET)
@ApiOperation("查询个数")
@RequestMapping(value = "/count",method = RequestMethod.GET)
@ResponseBody
public ObjectRestResponse<List<BaseOrder>> entityList(BaseOrder entity){
public ObjectRestResponse<Integer> entityList(Integer hasMemberRight, String multiStatus, Integer userId){
//查询列表数据
return ObjectRestResponse.succ(baseOrderBiz.selectList(entity));
WeekendSqls<BaseOrder> weekendSqls = WeekendSqls.<BaseOrder>custom();
if(null != hasMemberRight) {
weekendSqls.andEqualTo(BaseOrder::getHasMemberRight, hasMemberRight);
}
if(null != multiStatus) {
weekendSqls.andIn(BaseOrder::getStatus,
StrUtil.splitTrim(multiStatus, ",")
.parallelStream().map(v -> Integer.valueOf(v)).collect(Collectors.toList()));
}
if(null != userId) {
weekendSqls.andEqualTo(BaseOrder::getUserId, userId);
}
// null;
return ObjectRestResponse.succ(baseOrderBiz
.selectCountByExample( new Example.Builder(BaseOrder.class)
.where(weekendSqls).build()));
}
@ApiOperation("订单详情")
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java 0 → 100644
View file @ 5d5e3063
package com.xxfc.platform.order.rest.background;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
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 com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.xxfc.platform.order.biz.DailyMembersOrderStatisticsBiz;
import com.xxfc.platform.order.biz.DailyTravelOrderStatisticsBiz;
import com.xxfc.platform.order.biz.DailyVehicleOrderStatisticsBiz;
import com.xxfc.platform.order.biz.OrderStatisticsBiz;
import com.xxfc.platform.order.entity.OrderStatistics;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author Administrator
*/
@RestController
@RequestMapping("orderStatistics")
@Api(description = "每月总的订单统计")
public class OrderStatisticsController extends BaseController<OrderStatisticsBiz, OrderStatistics> {
@Autowired
private UserFeign userFeign;
@Autowired
private UserAuthConfig userAuthConfig;
/**
* 租车订单
*/
private final Integer TYEP_VEHICLE = 1;
/**
* 旅游订单
*/
private final Integer TYEP_TOUR = 2;
/**
* 购买会员订单
*/
private final Integer TYEP_MEMBER = 3;
/**
* 月总数据
*/
private final Integer TYEP_TOTAL = 4;
@Autowired
private DailyVehicleOrderStatisticsBiz vehicleBiz;
@Autowired
private DailyTravelOrderStatisticsBiz TravelBiz;
@Autowired
private DailyMembersOrderStatisticsBiz membersBiz;
@ApiOperation("获取订单统计数据")
@GetMapping("/findAll/{type}")
public ObjectRestResponse findAll(@PathVariable Integer type) {
try {
ObjectRestResponse<UserDTO> userDTOObjectRestResponse
= userFeign.userinfoByToken(userAuthConfig.getToken(getRequest()));
if (userDTOObjectRestResponse == null || userDTOObjectRestResponse.getData() == null) {
throw new BaseException("请登录!");
}
UserDTO user = userDTOObjectRestResponse.getData();
Integer companyId = user.getCompanyId();
if (TYEP_VEHICLE.equals(type)) {
OrderStatistics vehicle = vehicleBiz.findAll(companyId);
return ObjectRestResponse.succ(vehicle);
}
if (TYEP_TOUR.equals(type)) {
OrderStatistics tour = TravelBiz.findAll(companyId);
return ObjectRestResponse.succ(tour);
}
if (TYEP_MEMBER.equals(type)) {
OrderStatistics member = membersBiz.findAll(companyId);
return ObjectRestResponse.succ(member);
}
if (TYEP_TOTAL.equals(type)) {
return ObjectRestResponse.succ(baseBiz.getToalOrder(companyId));
}
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "参数错误!");
} catch (Exception e) {
e.printStackTrace();
return ObjectRestResponse.createDefaultFail();
}
}
}
xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml
View file @ 5d5e3063
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper">
<!-- 获取每日租车订单成交金和押金总额-->
<!-- 获取会员订单成交金-->
<select id="getTravelGmv" resultType="HashMap">
select
COALESCE(date_format(FROM_UNIXTIME(pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
......@@ -14,4 +14,16 @@
AND
date(FROM_UNIXTIME(pay_time/1000))=date(DATE_SUB(now(),interval 1 day))
</select>
<select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
SELECT
IFNULL(sum(gmv),0) as totalGmv
FROM
daily_members_order_statistics
WHERE
branch_company_id =1
and
DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
</select>
</mapper>
\ No newline at end of file
xx-order/xx-order-server/src/main/resources/mapper/DailyTravelOrderStatisticsMapper.xml
View file @ 5d5e3063
......@@ -2,29 +2,41 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper">
<!-- 获取每日租车订单成交金和押金总额-->
<select id="getTravelGmv" resultType="HashMap">
<!-- 获取旅游订单成交金-->
<select id="getTravelGmv" resultType="com.xxfc.platform.order.entity.DailyTravelOrderStatistics">
select
COALESCE(date_format(FROM_UNIXTIME(pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
IFNULL(SUM(real_amount),0) as gmv
t.start_company_id as branchCompanyId,
COALESCE(date_format(FROM_UNIXTIME(o.pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
IFNULL(SUM(o.real_amount),0) as gmv
from
base_order
base_order o
left join
order_tour_detail t
on
o.id=t.order_id
where
type=2
AND
date(FROM_UNIXTIME(pay_time/1000))=date(DATE_SUB(now(),interval 1 day))
and
date(FROM_UNIXTIME(o.pay_time/1000))=date(DATE_SUB(now(),interval 1 day))
group by
t.start_company_id
</select>
<!-- 取消订单扣除款项总和-->
<select id="getTravelPenalSum" resultType="BigDecimal">
<select id="getTravelPenalSum" resultType="com.xxfc.platform.order.entity.DailyTravelOrderStatistics">
SELECT
t.start_company_id as branchCompanyId,
IFNULL(SUM(r.deduct_amount),0) as penalSum
FROM
base_order o
left join
order_refund r
left join
base_order o
on
o.id=r.order_id
left join
order_tour_detail t
on
o.id=t.order_id
WHERE
o.type=2
and
......@@ -33,5 +45,20 @@
r.refund_type =1
and
date(FROM_UNIXTIME(r.refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
group by
t.start_company_id
</select>
<select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
SELECT
IFNULL(sum(gmv),0) as totalGmv,
IFNULL(sum(penal_sum) ,0) as totalPenalSum
FROM
daily_travel_order_statistics
WHERE
branch_company_id =#{branchCompanyId}
AND
DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
</select>
</mapper>
\ No newline at end of file
xx-order/xx-order-server/src/main/resources/mapper/DailyVehicleOrderStatisticsMapper.xml
View file @ 5d5e3063
......@@ -3,107 +3,155 @@
<mapper namespace="com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper">
<!-- 获取每日租车订单成交金和押金总额-->
<select id="getGmvAndMarginTotal" resultType="HashMap">
select
<select id="getGmvAndMarginTotal" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
SELECT
v.start_company_id AS branchCompanyId,
COALESCE(date_format(FROM_UNIXTIME(b.pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
IFNULL(SUM(b.real_amount-v.deposit),0) as gmv,
IFNULL(SUM(v.deposit),0) as securityDeposit
from
IFNULL(SUM(b.real_amount-v.deposit),0) AS gmv,
IFNULL(SUM(v.deposit),0) AS securityDeposit
FROM
base_order b
left join
LEFT JOIN
order_rent_vehicle_detail v
on
ON
b.id=v.order_id
where
WHERE
b.type=1
AND
date(FROM_UNIXTIME(b.pay_time/1000))=date(DATE_SUB(now(),interval 1 day))
DATE(FROM_UNIXTIME(b.pay_time/1000))=DATE(DATE_SUB(now(),INTERVAL 1 DAY))
GROUP BY
v.start_company_id
</select>
<!-- 退还押金总额-->
<select id="getRefundSecurityDeposit" resultType="BigDecimal">
<select id="getRefundSecurityDeposit" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
SELECT
IFNULL(SUM(r.refund_amount),0) as refundSecurityDeposit
v.start_company_id AS branchCompanyId,
IFNULL(SUM(r.refund_amount),0) AS refundSecurityDeposit
FROM
base_order o
left join
LEFT JOIN
order_refund r
on
ON
o.id=r.order_id
LEFT JOIN
order_rent_vehicle_detail v
ON
v.order_id=o.id
WHERE
o.type=1
and
AND
r.refund_status=1
and
AND
r.refund_type >1
and
date(FROM_UNIXTIME(r.refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
AND
DATE(FROM_UNIXTIME(r.refund_time/1000))=DATE(DATE_SUB(now(),INTERVAL 1 DAY))
GROUP BY
v.start_company_id
</select>
<!-- 取消订单扣除款项总和-->
<select id="getPenalSum" resultType="BigDecimal">
<select id="getPenalSum" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
SELECT
v.start_company_id as branchCompanyId,
IFNULL(SUM(r.deduct_amount),0) as penalSum
FROM
base_order o
left join
order_refund r
on
LEFT JOIN
base_order o
ON
o.id=r.order_id
LEFT JOIN
order_rent_vehicle_detail v
ON
v.order_id=o.id
WHERE
o.type=1
and
AND
r.refund_status=1
and
AND
r.refund_type =1
and
AND
date(FROM_UNIXTIME(r.refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
GROUP BY
v.start_company_id
</select>
<!-- 获取赔偿和延期JSON字符串-->
<select id="getCompensationAndPostpone" resultType="List">
<select id="getCompensationAndPostpone" resultType="HashMap">
SELECT
ded_detail
v.start_company_id AS branchCompanyId,
c.ded_detail AS dedDetail
FROM
order_refund r
LEFT JOIN
order_vehicle_crosstown c
on
r.order_id = c.order_id
LEFT JOIN
order_rent_vehicle_detail v
ON
r.order_id=v.order_id
WHERE
r.refund_status=1
and
r.refund_type = 3
and
c.type=2
c.type=3
and
date(FROM_UNIXTIME(refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
order by v.start_company_id asc
</select>
<select id="getViolationMoney" resultType="BigDecimal">
<!--违章-->
<select id="getViolationMoney" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
SELECT
v.price
d.start_company_id AS branchCompanyId,
v.price as violationMoney
FROM
order_refund r
left JOIN
LEFT JOIN
base_order o
on
o.id=r.order_id
r.order_id= o.id
LEFT JOIN
order_rent_vehicle_detail d
on
o.id = d.order_id
left join
r.order_id= d.order_id
left join
order_violation v
on
d.id = v.detail_id
WHERE
o.type=1
and
r.refund_status=1
and
r.refund_type = 4
and
date(FROM_UNIXTIME(r.refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
GROUP BY
d.start_company_id
</select>
<select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
SELECT
IFNULL(sum(gmv),0) as totalGmv,
IFNULL(sum(security_deposit),0) as totalSecurityDeposit,
IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,
IFNULL(sum(compensation) ,0) as totalCompensation,
IFNULL(sum(forfeit) ,0) as totalForfeit,
IFNULL(sum(penal_sum) ,0) as totalPenalSum,
IFNULL(sum(postpone) ,0) as totalPostpone
FROM
daily_vehicle_order_statistics
WHERE
branch_company_id =#{companyId}
and
DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
</select>
</mapper>
\ No newline at end of file
xx-order/xx-order-server/src/test/java/ServiceTest.java 0 → 100644
View file @ 5d5e3063
import com.xxfc.platform.order.OrderApplication;
import com.xxfc.platform.order.biz.DailyOrderStatisticsBiz;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/6 20:05
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = {OrderApplication.class})
public class ServiceTest {
@Autowired
private DailyOrderStatisticsBiz dailyOrderStatisticsBiz;
@Test
public void testSchedu(){
dailyOrderStatisticsBiz.statisticalOrder();
}
}
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGood.java
View file @ 5d5e3063
......@@ -134,5 +134,4 @@ public class TourGood implements Serializable {
@Column(name = "poster_background")
@ApiModelProperty(value = "海报背景")
private String posterBackground;
}
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodDetailVo.java
View file @ 5d5e3063
......@@ -128,7 +128,7 @@ public class TourGoodDetailVo {
@ApiModelProperty(value = "商品标签")
List<GoodTagDTO> tagDTOS;
private String posterBackground;
}
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
View file @ 5d5e3063
......@@ -6,6 +6,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.entity.*;
import com.xxfc.platform.vehicle.pojo.*;
import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
......@@ -16,7 +17,7 @@ import java.util.Set;
/**
* Created by ace on 2017/9/15.
*/
@FeignClient(name = "vehicle")
@FeignClient(name = "vehicle",contextId = "vh")
public interface VehicleFeign {
@GetMapping(value = "/vehicleModel/{id}")
public ObjectRestResponse<VehicleModel> get(@PathVariable(value = "id") int id);
......@@ -116,4 +117,10 @@ public interface VehicleFeign {
@GetMapping("/accompanyingItem/app/unauth/items")
public RestResponse<List<AccompanyingItemVo>> listAccompanyingItem();
@GetMapping("/branchCompany/findByAreaId")
List<Integer> findCompanyIdsByAreaId(@RequestParam(value = "areaId") Integer areaId);
@GetMapping("/branchCompany/company")
Map<Integer, BranComanyLeaderVo> findCompanyLeaderMapByIds(@RequestParam(value = "companyIds") List<Integer> companyIds);
}
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/BranComanyLeaderVo.java 0 → 100644
View file @ 5d5e3063
package com.xxfc.platform.vehicle.pojo.vo;
import lombok.Data;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/9 18:44
*/
@Data
public class BranComanyLeaderVo {
/**
* 负责人
*/
private String leader;
/**
* 负责人联系电话
*/
private String phone;
/**
* 公司名
*/
private String name;
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java
View file @ 5d5e3063
......@@ -20,6 +20,7 @@ import com.xxfc.platform.vehicle.mapper.BranchCompanyMapper;
import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
import com.xxfc.platform.vehicle.pojo.CompanyDetail;
import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
import com.xxfc.platform.vehicle.util.excel.ExcelImport;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
......@@ -327,4 +328,21 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
}
public List<Integer> selectCompanyIdsByAreaId(Integer areaId) {
return mapper.findCompanyIdsByAreaId(areaId);
}
public Map<Integer, BranComanyLeaderVo> findCompanyLeaderMapByIds(List<Integer> companyIds) {
Map<Integer,BranComanyLeaderVo> companyIdAndLeaderMap = new HashMap<>(companyIds.size());
List<BranchCompany> branchCompanies = mapper.selectByIdList(companyIds);
if (CollectionUtils.isEmpty(branchCompanies)){
return companyIdAndLeaderMap;
}
return branchCompanies.stream().collect(Collectors.toMap(BranchCompany::getId,branchCompany -> {
BranComanyLeaderVo branComanyLeaderVo = new BranComanyLeaderVo();
BeanUtils.copyProperties(branchCompany,branComanyLeaderVo);
return branComanyLeaderVo;
}));
}
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BranchCompanyMapper.java
View file @ 5d5e3063
......@@ -2,12 +2,15 @@ package com.xxfc.platform.vehicle.mapper;
import com.xxfc.platform.vehicle.entity.BranchCompany;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
import java.util.Map;
public interface BranchCompanyMapper extends Mapper<BranchCompany> {
public interface BranchCompanyMapper extends Mapper<BranchCompany>, SelectByIdListMapper<BranchCompany,Integer> {
List<BranchCompany> search(@Param("lon") String lon, @Param("lat") String lat, @Param("addrCity") Integer addrCity);
List<BranchCompany> selectByZoneId(Map<String, Object> param);
List<Integer> findCompanyIdsByAreaId(@Param("areaId") Integer areaId);
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java
View file @ 5d5e3063
......@@ -16,6 +16,7 @@ import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
import com.xxfc.platform.vehicle.pojo.CompanyDetail;
import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -27,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/branchCompany")
......@@ -164,4 +166,14 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
//查询列表数据
return ObjectRestResponse.succ(baseBiz.selectList(entity));
}
@GetMapping("/findByAreaId")
public List<Integer> findCompanyIdsByAreaId(@RequestParam(value = "areaId") Integer areaId){
return baseBiz.selectCompanyIdsByAreaId(areaId);
}
@GetMapping("/company")
Map<Integer, BranComanyLeaderVo> findCompanyLeaderMapByIds(@RequestParam("companyIds") List<Integer> companyIds){
return baseBiz.findCompanyLeaderMapByIds(companyIds);
}
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java
View file @ 5d5e3063
......@@ -271,7 +271,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
vehicleCata.setVehicleModelId(id);
vehicleCata.setIsdel(1);
vehicleCataBiz.updateIsdalByVehicleModelId(vehicleCata);
return ObjectRestResponse.succ();
}
......
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml
View file @ 5d5e3063
......@@ -19,6 +19,7 @@
<result column="tour_service_phone" property="tourServicePhone"/>
<result column="longitude" property="longitude"/>
<result column="latitude" property="latitude"/>
<result column="zone_id" property="zoneId"/>
</resultMap>
<select id="search" resultType="com.xxfc.platform.vehicle.pojo.CompanySearchVO">
......@@ -49,4 +50,7 @@
</foreach>
</if>
</select>
<select id="findCompanyIdsByAreaId" resultType="integer">
select `id` from `branch_company` where `zone_id`=#{areaId}
</select>
</mapper>
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @ 5d5e3063
......@@ -500,7 +500,7 @@
<select id="searchUsableModel" parameterType="java.util.Map"
resultMap="searchUsableModelMap">
select distinct vm.id as model_id, bc.id as company_id
(select distinct vm.id as model_id, bc.id as company_id
<if test=" catas != null ">
,GROUP_CONCAT(vc.cata_id) as catas
</if>
......@@ -540,7 +540,30 @@
</foreach>
) > 0
</if>
)
<!-- union 所有车型 -->
<if test="startCompanyId != null or parkBranchCompanyId != null ">
union
(select id as model_id,
<choose>
<when test="startCompanyId != null">
#{startCompanyId} as company_id,
</when>
<otherwise>
#{parkBranchCompanyId} as company_id,
</otherwise>
</choose>
<if test=" catas != null ">
null as catas,
</if>
<if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
0 as hasVehicle,
</if>
<if test="lon != null and lat != null">
0 as distance
</if>
from vehicle_model where vehicle_model.isdel = 0)
</if>
<if test="lon != null and lat != null">
order by
<if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
......
xx-vehicle/xx-vehicle-server/src/test/java/com/xxfc/platform/vehicle/ListTest.java deleted 100644 → 0
View file @ 87a210e8
package com.xxfc.platform.vehicle;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.junit.Test;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.List;
public class ListTest {
@Test
public void ListTest(){
List<Object> objects = Arrays.asList();
DateTime startDay= DateTime.parse("2019-07-30 00:00:00", DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"));
System.out.println(startDay);
}
}
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