From cab3425bb92d01f3494eb25c1f299038dc634c65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 15 三月 2023 23:43:48 +0800
Subject: [PATCH] 优化保养转单功能
---
service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCarCmd.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCarCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCarCmd.java
index 0a9c53a..1844ce2 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCarCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCarCmd.java
@@ -21,7 +21,6 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
@@ -29,11 +28,13 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Date;
import java.util.List;
/**
@@ -68,6 +69,7 @@
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setMemberId(reqJson.getString("memberId"));
ownerCarDto.setCommunityId(reqJson.getString("communityId"));
+ ownerCarDto.setCarId(reqJson.getString("carId"));
List<OwnerCarDto> ownerCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
Assert.listOnlyOne(ownerCarDtos, "鏈壘鍒拌溅杈嗕俊鎭�");
@@ -84,8 +86,16 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ if (!reqJson.containsKey("leaseType")) {
+ reqJson.put("leaseType", OwnerCarDto.LEASE_TYPE_MONTH);
+ }
+
+ if (!OwnerCarDto.LEASE_TYPE_MONTH.equals(reqJson.getString("leaseType"))) {
+ reqJson.put("startTime", DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_B));
+ reqJson.put("endTime", "2037-01-01");
+ }
+
OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(reqJson, OwnerCarPo.class);
- ownerCarPo.setMemberId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
int flag = ownerCarV1InnerServiceSMOImpl.updateOwnerCar(ownerCarPo);
if (flag < 1) {
--
Gitblit v1.8.0