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-06-21 11:38:50 +08:00
parent 021a2b23d4
commit 5ce600ff7f
7 changed files with 93 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lxk-admin/src/main/java/com/zbkj/admin/controller/platform/ReturnCommissionPlatformInformationJoinUserController.java
View File

@@ -1,7 +1,10 @@
package com.zbkj.admin.controller.platform;
import com.zbkj.common.annotation.LogControllerAnnotation;
import com.zbkj.common.enums.MethodType;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.brokerage.ReturnCommissionPlatformInformationJoinUserEditRequest;
import com.zbkj.common.request.brokerage.ReturnCommissionPlatformInformationJoinUserRequest;
import com.zbkj.common.response.brokerage.ReturnCommissionPlatformInformationJoinUserResponse;
import com.zbkj.common.result.CommonResult;
@@ -31,6 +34,7 @@ public class ReturnCommissionPlatformInformationJoinUserController {
return CommonResult.success(platformPage);
}
@LogControllerAnnotation(intoDB = true, methodType = MethodType.UPDATE, description = "修改用户参与信息成功")
@ApiOperation(value = "审核参与状态")
@RequestMapping(value = "/audit/{id}", method = RequestMethod.GET)
public CommonResult<String> audit(@PathVariable(value = "id") Integer id) {
@@ -39,4 +43,15 @@ public class ReturnCommissionPlatformInformationJoinUserController {
}
return CommonResult.failed("审核失败");
}
@LogControllerAnnotation(intoDB = true, methodType = MethodType.UPDATE, description = "修改用户参与信息成功")
@PreAuthorize("hasAuthority('platform:return:commission:edit')")
@ApiOperation(value = "修改用户参与信息")
@RequestMapping(value = "/edit", method = RequestMethod.POST)
public CommonResult<String> edit(@RequestBody ReturnCommissionPlatformInformationJoinUserEditRequest request) {
if (joinUserService.edit(request)) {
return CommonResult.failed("修改用户参与信息成功");
}
return CommonResult.failed("修改用户参与信息失败");
}
}

3
lxk-common/src/main/java/com/zbkj/common/model/brokerage/ReturnCommissionPlatformInformation.java
View File

@@ -63,6 +63,9 @@ public class ReturnCommissionPlatformInformation implements Serializable {
@ApiModelProperty(value = "合作开始时间")
private Date startTime;
@ApiModelProperty(value = "合作结束时间")
private Date settlementTime;
@ApiModelProperty(value = "合同链接")
private String contract;

5
lxk-common/src/main/java/com/zbkj/common/request/brokerage/ReturnCommissionPlatformInformationEditRequest.java
View File

@@ -57,9 +57,14 @@ public class ReturnCommissionPlatformInformationEditRequest implements Serializa
@NotBlank(message = "维度,不能为空")
private String longitude;
@NotBlank(message = "合作时间不能为空")
@ApiModelProperty(value = "合作开始时间")
private String startTime;
@NotBlank(message = "合作结束时间不能为空")
@ApiModelProperty(value = "合作结束时间")
private String settlementTime;
@ApiModelProperty(value = "合同链接")
private String contract;

28
lxk-common/src/main/java/com/zbkj/common/request/brokerage/ReturnCommissionPlatformInformationJoinUserEditRequest.java Normal file
View File

@@ -0,0 +1,28 @@
package com.zbkj.common.request.brokerage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "ReturnCommissionPlatformInformationJoinUserEditRequest", description = "ReturnCommissionPlatformInformationJoinUserEditRequest")
public class ReturnCommissionPlatformInformationJoinUserEditRequest implements Serializable {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空")
@ApiModelProperty(value = "ID")
private Integer id;
@NotBlank(message = "司机编码不能为空")
@ApiModelProperty(value = "司机编码")
private String driverSn;
}

10
lxk-service/src/main/java/com/zbkj/service/service/ReturnCommissionPlatformInformationJoinUserService.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.zbkj.common.model.brokerage.ReturnCommissionPlatformInformationJoinUser;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.brokerage.ReturnCommissionPlatformInformationJoinUserEditRequest;
import com.zbkj.common.request.brokerage.ReturnCommissionPlatformInformationJoinUserRequest;
import com.zbkj.common.response.brokerage.ReturnCommissionPlatformInformationJoinUserExcelResponse;
import com.zbkj.common.response.brokerage.ReturnCommissionPlatformInformationJoinUserResponse;
@@ -82,4 +83,13 @@ public interface ReturnCommissionPlatformInformationJoinUserService extends ISer
Map<String, ReturnCommissionPlatformInformationJoinUser> getUserMapByDriverSns(Collection<String> driverSn);
Map<String, ReturnCommissionPlatformInformationJoinUser> getMapByDriverKey(Collection<String> driverKey);
Boolean edit(ReturnCommissionPlatformInformationJoinUserEditRequest request);
/**
* 根据司机编号查询参加信息
*
* @param driverSn 司机编号
*/
ReturnCommissionPlatformInformationJoinUser getByDriverSn(String driverSn);
}

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

@@ -28,6 +28,7 @@ import com.zbkj.common.model.user.User;
import com.zbkj.common.page.CommonPage;
import com.zbkj.common.request.PageParamRequest;
import com.zbkj.common.request.SystemArticleRequest;
import com.zbkj.common.request.brokerage.ReturnCommissionPlatformInformationJoinUserEditRequest;
import com.zbkj.common.request.brokerage.ReturnCommissionPlatformInformationJoinUserRequest;
import com.zbkj.common.response.brokerage.ReturnCommissionPlatformInformationJoinUserExcelResponse;
import com.zbkj.common.response.brokerage.ReturnCommissionPlatformInformationJoinUserResponse;
@@ -564,6 +565,28 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
return map;
}
@Override
public Boolean edit(ReturnCommissionPlatformInformationJoinUserEditRequest request) {
ReturnCommissionPlatformInformationJoinUser joinUser = getById(request.getId());
if (ObjectUtil.isNull(joinUser)) {
throw new LxkException(StrUtil.format("用户参与信息不存在id:{}", request.getId()));
} else if (request.getDriverSn().equals(joinUser.getDriverSn())) {
return Boolean.TRUE;
} else if (ObjectUtil.isNotNull(getByDriverSn(request.getDriverSn()))) {
throw new LxkException("司机编号重复");
}
ReturnCommissionPlatformInformationJoinUser up = new ReturnCommissionPlatformInformationJoinUser();
up.setId(request.getId());
up.setPlatformSn(request.getDriverSn());
return updateById(up);
}
@Override
public ReturnCommissionPlatformInformationJoinUser getByDriverSn(String driverSn) {
return getOne(new LambdaQueryWrapper<ReturnCommissionPlatformInformationJoinUser>().eq(ReturnCommissionPlatformInformationJoinUser::getDriverSn, driverSn));
}
private CheckReturnCommissionPlatformInformationJoinUserExcelVo checkRegisterVo(CheckReturnCommissionPlatformInformationJoinUserRegisterVo vo, Integer platformId, Map<String, ReturnCommissionPlatformInformationJoinUser> mapByDriverKey) {
boolean isSn = StrUtil.isBlank(vo.getDriverSn());
Boolean flag = true;

12
lxk-service/src/main/java/com/zbkj/service/service/impl/ReturnCommissionPlatformInformationServiceImpl.java
View File

@@ -85,16 +85,22 @@ public class ReturnCommissionPlatformInformationServiceImpl extends ServiceImpl<
if (plagiarismCheck(request.getName(), null)) {
throw new LxkException(StrUtil.format("平台名称:{}存在重复", request.getName()));
}
if (!LxkDateUtil.checkDateFormat(request.getStartTime(), DateConstants.DATE_FORMAT_DATE)) {
throw new LxkException(StrUtil.format("{}时间格式错误，请传如2024-01-01的格式", request.getStartTime()));
if (!LxkDateUtil.checkDateFormat(request.getStartTime(), DateConstants.DATE_FORMAT)) {
throw new LxkException(StrUtil.format("{}时间格式错误，请传2000-01-01 01:01:01的格式", request.getStartTime()));
}
if (!LxkDateUtil.checkDateFormat(request.getSettlementTime(), DateConstants.DATE_FORMAT)) {
throw new LxkException(StrUtil.format("{}时间格式错误，请传2000-01-01 01:01:01的格式", request.getSettlementTime()));
}
boolean b = request.getWay().equals(0);
if (b && !(request.getRatio() == null || request.getRatio().compareTo(BigDecimal.ZERO) < 1 || request.getRatio().compareTo(BigDecimal.ONE) < 1)) {
throw new LxkException("分佣比例不能为空不能小于0且不能大于0");
}
if (!b && !(request.getEach() == null || request.getEach().compareTo(BigDecimal.ZERO) < 1)) {
if (!b && !(request.getEach() == null || request.getEach().compareTo(BigDecimal.ZERO) > 0)) {
throw new LxkException("按量分佣不能小于0");
}
if (LxkDateUtil.compareDate(request.getStartTime(), request.getSettlementTime(), DateConstants.DATE_FORMAT) < 1) {
throw new LxkException("结束时间不能小于开始时间");
}
ReturnCommissionPlatformInformation add = new ReturnCommissionPlatformInformation();
BeanUtils.copyProperties(request, add);
add.setEachMoney(request.getEach());