qichexitong/car-system-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix-导出司机编号

Browse Source
This commit is contained in:
xl
2024-07-18 17:34:50 +08:00
parent b9a1ae9d71
commit df4d9d7c55
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lxk-common/src/main/java/com/zbkj/common/response/brokerage/JoinExportResponse.java
View File

@@ -17,10 +17,14 @@ public class JoinExportResponse implements Serializable {
@ApiModelProperty(value = "返佣平台SN")
private String platformSn;
@ExcelProperty("返佣平台名称")
@ExcelProperty("返佣平台简称")
@ApiModelProperty(value = "返佣平台名称")
private String platformName;
@ExcelProperty("返佣平台全称")
@ApiModelProperty(value = "返佣平台名称")
private String platformAbbreviation;
@ExcelProperty("参与时间")
@ApiModelProperty(value = "参与时间")
private Date participationTime;

6
lxk-common/src/main/java/com/zbkj/common/response/brokerage/ReturnCommissionPlatformInformationJoinUserExcelResponse.java
View File

@@ -43,10 +43,14 @@ public class ReturnCommissionPlatformInformationJoinUserExcelResponse implements
@ApiModelProperty(value = "滴友ID")
private String driverKey;
@ExcelProperty("注册平台")
@ExcelProperty("注册平台简称")
@ApiModelProperty(value = "注册平台")
private String platformName;
@ExcelProperty("注册平台全称")
@ApiModelProperty(value = "注册平台")
private String platformAbbreviation;
@ExcelProperty("平台司机编号")
@ApiModelProperty(value = "平台司机编码")
private String driverSn;

4
lxk-service/src/main/java/com/zbkj/service/service/impl/CouponUserServiceImpl.java
View File

@@ -628,11 +628,11 @@ public class CouponUserServiceImpl extends ServiceImpl<CouponUserDao, CouponUser
lqw.eq(CouponUser::getUid, userId);
if (type.equals("usable")) {
lqw.eq(CouponUser::getStatus, CouponConstants.STORE_COUPON_USER_STATUS_USABLE);
lqw.gt(CouponUser::getMoney, money);
lqw.lt(CouponUser::getMoney, money);
lqw.orderByDesc(CouponUser::getId);
}
if (type.equals("unusable") || "used".equals(type)) {
lqw.and(w -> w.gt(CouponUser::getStatus, CouponConstants.STORE_COUPON_USER_STATUS_USABLE).or().lt(CouponUser::getMoney, money));
lqw.and(w -> w.gt(CouponUser::getStatus, CouponConstants.STORE_COUPON_USER_STATUS_USABLE).or().gt(CouponUser::getMoney, money));
//lqw.gt(CouponUser::getStatus, CouponConstants.STORE_COUPON_USER_STATUS_USABLE);
lqw.last(StrUtil.format(" order by case `status` when {} then {} when {} then {} when {} then {} end", 0, 1, 1, 2, 2, 3));
}

4
lxk-service/src/main/java/com/zbkj/service/service/impl/ReturnCommissionPlatformInformationJoinUserServiceImpl.java
View File

@@ -244,6 +244,7 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
response.setIdCard(v.getIdCard());
response.setPhone(v.getPhone());
response.setPlatformName(Optional.ofNullable(mapByplatformIds.get(v.getPlatformId())).map(ReturnCommissionPlatformInformation::getName).orElse(""));
response.setPlatformName(Optional.ofNullable(mapByplatformIds.get(v.getPlatformId())).map(ReturnCommissionPlatformInformation::getAbbreviation).orElse(""));
User user = uidMapList.get(v.getUid());
if (ObjectUtil.isNotNull(user)) {
response.setDriverKey(Convert.toStr(user.getUserSn()));
@@ -894,7 +895,8 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
JoinExportResponse resp = new JoinExportResponse();
BeanUtils.copyProperties(v, resp);
resp.setUserSn(Optional.ofNullable(uidMapList.get(v.getUid())).map(User::getUserSn).orElse(null));
resp.setPlatformName(Optional.ofNullable(platform).map(ReturnCommissionPlatformInformation::getAbbreviation).orElse(""));
resp.setPlatformName(Optional.ofNullable(platform).map(ReturnCommissionPlatformInformation::getName).orElse(""));
resp.setPlatformAbbreviation(Optional.ofNullable(platform).map(ReturnCommissionPlatformInformation::getAbbreviation).orElse(""));
resp.setProvince(Optional.ofNullable(platform).map(ReturnCommissionPlatformInformation::getProvince).orElse(""));
resp.setCity(Optional.ofNullable(platform).map(ReturnCommissionPlatformInformation::getCity).orElse(""));
return resp;