From dea2325896c7f8bd7df5107569b71d15fede79c7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 22 九月 2022 20:11:55 +0800
Subject: [PATCH] 1、优化图片异步上传2、bug修复3、合同bug修复4、车场相关问题
---
service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java
index 7269006..1993c2c 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/UpdateVisitCmd.java
@@ -27,7 +27,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -48,7 +47,6 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
@Autowired
private IVisitV1InnerServiceSMO visitV1InnerServiceSMOImpl;
@@ -58,7 +56,6 @@
//閿�
public static final String ASCRIPTION_CAR_AREA_ID = "ASCRIPTION_CAR_AREA_ID";
-
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.hasKeyAndValue(reqJson, "vId", "璁垮璁板綍ID涓嶈兘涓虹┖");
@@ -66,16 +63,12 @@
Assert.hasKeyAndValue(reqJson, "visitGender", "蹇呭~锛岃濉啓璁垮濮撳悕");
Assert.hasKeyAndValue(reqJson, "phoneNumber", "蹇呭~锛岃濉啓璁垮鑱旂郴鏂瑰紡");
Assert.hasKeyAndValue(reqJson, "visitTime", "蹇呭~锛岃濉啓璁垮鎷滆鏃堕棿");
-
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-
-
String userId = context.getReqHeaders().get("user-id");
-
-//鏄惁鏈夌┖闂茶溅浣�
+ //鏄惁鏈夌┖闂茶溅浣�
boolean freeSpace = false;
//鏄惁瀛樺湪杞﹁締
boolean existCar = false;
@@ -102,9 +95,8 @@
newTime.setTime(time);
newTime.add(Calendar.MINUTE, Integer.parseInt(freeTime));//鏃ユ湡鍔犱笂鍒嗛挓
Date newDate = newTime.getTime();
- String finishFreeTime = DateUtil.getFormatTimeString(newDate,DateUtil.DATE_FORMATE_STRING_A);
+ String finishFreeTime = DateUtil.getFormatTimeString(newDate, DateUtil.DATE_FORMATE_STRING_A);
reqJson.put("freeTime", finishFreeTime);
-
//鑾峰彇灏忓尯閰嶇疆閲岄厤缃殑鍋滆溅鍦篿d
String parkingAreaId = CommunitySettingFactory.getValue(reqJson.getString("communityId"), ASCRIPTION_CAR_AREA_ID);
if (StringUtil.isEmpty(parkingAreaId)) { //濡傛灉娌℃湁閰嶇疆鍋滆溅鍦篿d锛屽氨闅忎究鍒嗛厤璇ュ皬鍖轰笅涓�涓┖闂茶溅浣�
@@ -194,6 +186,7 @@
ownerCarPo.setState(OwnerCarDto.STATE_NORMAL); //1001 姝e父鐘舵�侊紝2002 杞︿綅閲婃斁娆犺垂鐘舵�� 3003 杞︿綅閲婃斁
ownerCarPo.setCarTypeCd(OwnerCarDto.CAR_TYPE_TEMP); //1001 涓氫富杞﹁締 1002 鎴愬憳杞﹁締 1003 涓存椂杞�
ownerCarPo.setMemberId(reqJson.getString("ownerId"));
+ ownerCarPo.setLeaseType("R"); //H 鏈堢杞� S 鍑哄敭杞� I 鍐呴儴杞� NM 鍏嶈垂杞� R 棰勭害杞�
ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
//娣诲姞杞﹁締灞炴��
OwnerCarAttrPo ownerCarAttrPo = new OwnerCarAttrPo();
@@ -215,7 +208,7 @@
/**
* 娣诲姞灏忓尯淇℃伅
*
- * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void updateVisit(JSONObject paramInJson) {
@@ -224,8 +217,8 @@
businessVisit.putAll(paramInJson);
VisitPo visitPo = BeanConvertUtil.covertBean(businessVisit, VisitPo.class);
- int flag =visitV1InnerServiceSMOImpl.updateVisit(visitPo);
- if(flag <1){
+ int flag = visitV1InnerServiceSMOImpl.updateVisit(visitPo);
+ if (flag < 1) {
throw new CmdException("淇敼璁垮澶辫触");
}
}
--
Gitblit v1.8.0