From b44832493c6d1f9db88e28e757be1e83846ed938 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 16:37:52 +0800
Subject: [PATCH] #单位提交 分转换元
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 1 +
server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java | 1 +
server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java | 6 ++++++
server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java | 3 +++
server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java | 3 +++
5 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
index e29aba3..70954dc 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
@@ -15,6 +15,9 @@
@ApiModel("杞﹁締闂涓婃姤淇℃伅鍒楄〃")
public class BikeRepairDTO {
+ @ApiModelProperty(value = "缂栫爜")
+ private String id;
+
@ApiModelProperty(value = "鐢ㄦ埛")
private String openid;
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java b/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
index a626043..029f2f5 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
@@ -41,4 +41,7 @@
private Boolean hasBack;
@ApiModelProperty(value = "缁撶畻璁㈠崟鍙�")
private String goodsorderId;
+
+ @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
+ private Integer backType;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
index 3137788..c4e3023 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
@@ -62,6 +62,12 @@
@ApiModelProperty("鍋滄鏈嶅姟缁撴潫")
private String stopServeEndtime = "";
+ @ApiModelProperty("鍋滄鏈嶅姟缁撴潫")
+ private String leaseNotice = "";
+
+ @ApiModelProperty("鍋滄鏈嶅姟缁撴潫")
+ private String leaseNoticeUrl = "";
+
/**
* 瀵硅薄椹煎嘲灞炴�ц浆涓嬪垝绾�
* @param object
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
index 710465c..53081d9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
@@ -115,6 +115,7 @@
updateWrapper
.lambda()
.eq(BaseParam::getId,baseParam.getId())
+ .set(BaseParam::getRequired,baseParam.getRequired())
.set(BaseParam::getName,baseParam.getName())
.set(BaseParam::getSortnum,baseParam.getSortnum())
.set(BaseParam::getEditDate,new Date())
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 51a5e59..d9e8c89 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -221,6 +221,7 @@
queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
+ queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getStatus, model.getStatus());
queryWrapper.eq(MemberRides::getBackType, Constants.ZERO);
queryWrapper.in(MemberRides::getStatus,
Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
--
Gitblit v1.9.3