From 580cead2bc3a8502cd9bdd098df02345c0616b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 12:12:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/TransactionsService.java | 2
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 38 ++
server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java | 17 +
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 149 +++++++++++
server/services/src/main/java/com/doumee/dao/business/web/request/RepairRequest.java | 59 ++++
server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java | 1
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 5
server/services/src/main/java/com/doumee/dao/business/model/Multifile.java | 79 ++++++
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 26 ++
/dev/null | 37 --
server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java | 18 +
server/services/src/main/java/com/doumee/service/business/MultifileService.java | 98 +++++++
server/web/src/main/java/com/doumee/api/web/HomeApi.java | 12
server/services/src/main/java/com/doumee/core/constants/Constants.java | 12
server/services/src/main/java/com/doumee/dao/business/MultifileMapper.java | 14 +
server/services/src/main/java/com/doumee/service/business/MemberRidesService.java | 8
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 45 +++
server/services/src/main/java/com/doumee/service/business/BikeRepairService.java | 4
server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java | 4
server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java | 148 +++++++++++
20 files changed, 724 insertions(+), 52 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index f2ecde0..dd9844b 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -95,6 +95,18 @@
public static final String RENT_DEPOSIT = "RENT_DEPOSIT";
//娓╅Θ鎻愮ず
public static final String TIPS = "TIPS";
+ //灏忕▼搴忓仠姝㈡湇鍔℃彁绀�
+ public static final String STOP_SERVE_TIPS = "STOP_SERVE_TIPS";
+ //灏忕▼搴忔槸鍚﹀仠姝㈡湇鍔� 0鍚� 1鏄�
+ public static final String IS_STOP_SERVE = "IS_STOP_SERVE";
+ //灏忕▼搴忓仠姝㈠紑濮嬫椂闂�
+ public static final String STOP_SERVE_STARTTIME = "STOP_SERVE_STARTTIME";
+ //灏忕▼搴忓仠姝㈢粨鏉熸椂闂�
+ public static final String STOP_SERVE_ENDTIME = "STOP_SERVE_ENDTIME";
+ //灏忕▼搴忔瘡鏃ユ湇鍔″紑濮嬫椂闂�
+ public static final String BUSINESS_STARTTIME = "BUSINESS_STARTTIME";
+ //灏忕▼搴忔瘡鏃ユ湇鍔＄粨鏉熸椂闂�
+ public static final String BUSINESS_ENDTIME = "BUSINESS_ENDTIME";
public static final String FILES_DIR = "FILES_DIR";
diff --git a/server/services/src/main/java/com/doumee/dao/business/MultifileMapper.java b/server/services/src/main/java/com/doumee/dao/business/MultifileMapper.java
new file mode 100644
index 0000000..d3ef2a4
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/MultifileMapper.java
@@ -0,0 +1,14 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.Multifile;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/05/12 13:58
+ */
+public interface MultifileMapper extends BaseMapper<Multifile> {
+
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java b/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
index 8aabe01..2f246cb 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
@@ -104,4 +104,8 @@
@ExcelColumn(name="鐜板満鎻忚堪")
private String content;
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
+ @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
+ private String memberId;
+
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
new file mode 100644
index 0000000..fd2beb8
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -0,0 +1,79 @@
+package com.doumee.dao.business.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 闄勪欢淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2023/05/12 13:58
+ */
+@Data
+@ApiModel("闄勪欢淇℃伅琛�")
+@TableName("multifile")
+public class Multifile {
+
+ @ApiModelProperty(value = "涓婚敭")
+ @ExcelColumn(name="涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "鏂囦欢鍚�")
+ @ExcelColumn(name="鏂囦欢鍚�")
+ private String name;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String info;
+
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
+ @ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
+ private String objId;
+
+ @ApiModelProperty(value = "绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
+ @ExcelColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
+ private Integer type;
+
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0杞﹁締淇濅慨")
+ @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0杞﹁締淇濅慨")
+ private Integer objType;
+
+ @ApiModelProperty(value = "鏂囦欢鍦板潃")
+ @ExcelColumn(name="鏂囦欢鍦板潃")
+ private String fileurl;
+
+ @ApiModelProperty(value = "鎺掑簭鐮�")
+ @ExcelColumn(name="鎺掑簭鐮�")
+ private Integer sortnum;
+
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/RepairRequest.java b/server/services/src/main/java/com/doumee/dao/business/web/request/RepairRequest.java
new file mode 100644
index 0000000..f76ba33
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/RepairRequest.java
@@ -0,0 +1,59 @@
+package com.doumee.dao.business.web.request;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/10/9 11:04
+ */
+@Data
+@ApiModel("鎶ヤ慨涓氬姟璇锋眰绫�")
+public class RepairRequest {
+
+ @ApiModelProperty(value = "杞﹁締缂栫爜")
+ private String binkeId;
+
+ @ApiModelProperty(value = "缁忓害", example = "1")
+ private BigDecimal longitude;
+
+ @ApiModelProperty(value = "绾害", example = "1")
+ private BigDecimal latitude;
+
+ @ApiModelProperty(value = "璇︾粏鍦板潃")
+ private String addr;
+
+ @ApiModelProperty(value = "杞﹁締闂鍘熷洜缂栫爜锛堝叧鑱攂ase_param)")
+ private String paramId;
+
+ @ApiModelProperty(value = "杞﹁締闂")
+ private String param;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String info;
+
+ @ApiModelProperty(value = "鑱旂郴浜�")
+ private String linkname;
+
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String linkphone;
+
+ @ApiModelProperty(value = "鐜板満鎻忚堪")
+ private String content;
+
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級",hidden = true)
+ private String memberId;
+
+ @ApiModelProperty(value = "鐜板満鎯呭喌")
+ private List<String> fileUrlList;
+
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
index bd03383..31d9b99 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
@@ -1,9 +1,11 @@
package com.doumee.dao.business.web.response;
+import com.doumee.dao.business.model.Ad;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* Created by IntelliJ IDEA.
@@ -44,7 +46,23 @@
@ApiModelProperty(value = "楠戣鐘舵�侊細-1=鏈獞琛岋紱0=璇锋眰寮�閿佷腑 ;1=楠戣涓�; 2=宸茶繕杞�; 3=寮�閿佸け璐ワ紱")
private Integer rideStatus;
+ @ApiModelProperty(value = "灏忕▼搴忔槸鍚﹀仠姝㈡湇鍔� 0鍚� 1鏄�")
+ private Integer isStopServe;
+
+ @ApiModelProperty(value = "灏忕▼搴忓仠姝㈡湇鍔℃彁绀�")
+ private String stopServeTips;
+
+ @ApiModelProperty(value = "灏忕▼搴忚惀涓氬紑濮嬫椂闂寸偣")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "灏忕▼搴忚惀涓氱粨鏉熸椂闂寸偣")
+ private String businessEndTime;
+
@ApiModelProperty(value = "楠戣鎯呭喌")
private MemberRidesResponse memberRidesResponse;
+ @ApiModelProperty(value = "骞垮憡淇℃伅")
+ private List<Ad> adList;
+
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java b/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java
index 72a2942..00053a9 100644
--- a/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java
+++ b/server/services/src/main/java/com/doumee/service/business/BikeRepairService.java
@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.BikeRepair;
+import com.doumee.dao.business.web.request.RepairRequest;
+
import java.util.List;
/**
@@ -94,4 +96,6 @@
* @return long
*/
long count(BikeRepair bikeRepair);
+
+ void saveRepair(RepairRequest repairRequest);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
index 87d8377..4568275 100644
--- a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -144,6 +144,11 @@
void closerGoodsorder(String id);
+ /**
+ * 楠戣璁板綍璇︽儏
+ * @param id
+ * @return
+ */
RidesDetailResponse getRidesDetailResponse(String id);
GoodsorderTotalDataVO getTotalData(Goodsorder pageWrap);
diff --git a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
index d886882..53c11c8 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
@@ -107,4 +107,12 @@
* @return PageData<MemberRides>
*/
PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛楠戣涓殑杞﹁締
+ * @param memberId
+ * @return
+ */
+ String getOnlineBike(String memberId);
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/MultifileService.java b/server/services/src/main/java/com/doumee/service/business/MultifileService.java
new file mode 100644
index 0000000..c57bf46
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/service/business/MultifileService.java
@@ -0,0 +1,98 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Multifile;
+
+import java.util.List;
+
+/**
+ * 闄勪欢淇℃伅琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/05/12 13:58
+ */
+public interface MultifileService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param multifile 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(Multifile multifile);
+
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param multifile 瀹炰綋瀵硅薄
+ */
+ void delete(Multifile multifile);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param multifile 瀹炰綋瀵硅薄
+ */
+ void updateById(Multifile multifile);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param multifiles 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<Multifile> multifiles);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return Multifile
+ */
+ Multifile findById(Integer id);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param multifile 瀹炰綋瀵硅薄
+ * @return Multifile
+ */
+ Multifile findOne(Multifile multifile);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param multifile 瀹炰綋瀵硅薄
+ * @return List<Multifile>
+ */
+ List<Multifile> findList(Multifile multifile);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<Multifile>
+ */
+ PageData<Multifile> findPage(PageWrap<Multifile> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param multifile 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(Multifile multifile);
+}
diff --git a/server/services/src/main/java/com/doumee/service/business/TransactionsService.java b/server/services/src/main/java/com/doumee/service/business/TransactionsService.java
index f9920d1..2373716 100644
--- a/server/services/src/main/java/com/doumee/service/business/TransactionsService.java
+++ b/server/services/src/main/java/com/doumee/service/business/TransactionsService.java
@@ -94,4 +94,6 @@
* @return long
*/
long count(Transactions transactions);
+
+ PageData<Transactions> findPageForMini(PageWrap pageWrap,String memberId);
}
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 2b5b809..e2eff99 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
@@ -130,6 +130,7 @@
@Override
public List<BaseParam> findList(BaseParam baseParam) {
QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
+ wrapper.orderByAsc("sortnum");
return baseParamMapper.selectList(wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index 04cf768..2406bd9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -1,20 +1,27 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BikeRepairMapper;
+import com.doumee.dao.business.MultifileMapper;
import com.doumee.dao.business.model.BikeRepair;
+import com.doumee.dao.business.model.Multifile;
+import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.service.business.BikeRepairService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 杞﹁締闂涓婃姤淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +33,9 @@
@Autowired
private BikeRepairMapper bikeRepairMapper;
+
+ @Autowired
+ private MultifileMapper multifileMapper;
@Override
public String create(BikeRepair bikeRepair) {
@@ -167,4 +177,32 @@
QueryWrapper<BikeRepair> wrapper = new QueryWrapper<>(bikeRepair);
return bikeRepairMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public void saveRepair(RepairRequest repairRequest){
+ BikeRepair bikeRepair = new BikeRepair();
+ BeanUtils.copyProperties(repairRequest,bikeRepair);
+ bikeRepair.setCreateDate(new Date());
+ bikeRepair.setIsdeleted(Constants.ZERO);
+ bikeRepairMapper.insert(bikeRepair);
+ //澶勭悊闄勪欢淇℃伅
+ List<String> stringList = repairRequest.getFileUrlList();
+ if(!Objects.isNull(stringList)&&stringList.size()>Constants.ZERO){
+ for (int i = 0; i < stringList.size(); i++) {
+ Multifile multifile = new Multifile();
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setSortnum(i+Constants.ONE);
+ multifile.setObjId(bikeRepair.getId());
+ multifile.setType(Constants.ZERO);
+ multifile.setObjType(Constants.ZERO);
+ multifile.setFileurl(stringList.get(i));
+ multifileMapper.insert(multifile);
+ }
+ }
+ }
+
+
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 2c9fff5..56f195a 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -84,6 +84,12 @@
private MemberRidesJoinMapper memberRidesJoinMapper;
@Autowired
+ private AdMapper adMapper;
+
+ @Autowired
+ private TransactionsMapper transactionsMapper;
+
+ @Autowired
PricingRuleService pricingRuleService;
@Override
@@ -214,6 +220,23 @@
homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.TIPS).getCode());
homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
homeResponse.setPricingRules(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRICING_RULE).getCode());
+ homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
+ homeResponse.setIsStopServe(Constants.ZERO);
+ homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
+ .eq("isdeleted",Constants.ZERO)
+ .eq("status",Constants.ZERO)
+ .orderByDesc("create_date")
+ ));
+ if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE)){
+ String stopServeStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_STARTTIME).getCode();
+ String stopServeEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_ENDTIME).getCode();
+ //鏌ヨ褰撳墠鏃堕棿鏄惁鍦ㄥ仠姝腑
+ long s = DateUtil.StringToDate(stopServeStartTime).getTime();
+ long e = DateUtil.StringToDate(stopServeEndTime).getTime();
+ if(e>System.currentTimeMillis()&&s<=System.currentTimeMillis()){
+ homeResponse.setIsStopServe(Constants.ONE);
+ }
+ }
//鏌ヨ鏄惁瀛樺湪 宸叉敮浠樼殑 鎶奸噾璁㈠崟
Integer status = this.goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>()
.eq("member_id",memberId)
@@ -245,8 +268,6 @@
}
return homeResponse;
}
- @Autowired
- private TransactionsMapper transactionsMapper;
@Override
@@ -419,7 +440,6 @@
}
@Override
public RidesDetailResponse getRidesDetailResponse(String id) {
-
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(MemberRides::getOrdreId,id);
@@ -472,6 +492,25 @@
if(goodsorderMapper.selectCount(new QueryWrapper<>(qry))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
}
+ //鏄惁澶勪簬灏忕▼搴忓仠姝㈡湇鍔℃椂闂村唴
+ if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE)){
+ String stopServeStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_STARTTIME).getCode();
+ String stopServeEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_ENDTIME).getCode();
+ //鏌ヨ褰撳墠鏃堕棿鏄惁鍦ㄥ仠姝腑
+ long s = DateUtil.StringToDate(stopServeStartTime).getTime();
+ long e = DateUtil.StringToDate(stopServeEndTime).getTime();
+ if(e>System.currentTimeMillis()&&s<=System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠灏忕▼搴忓仠姝㈡湇鍔★紝璇锋敞鎰忔煡鐪嬪叕鍛�");
+ }
+ }
+ //鏄惁澶勪簬钀ヤ笟鏃堕棿
+ String businessStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode();
+ String businessEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode();
+ String nowTime = DateUtil.getDate(new Date(),"HH:mm");
+ if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
+ ||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鏃堕棿鏆傛湭钀ヤ笟鏈嶅姟锛岃娉ㄦ剰鏌ョ湅钀ヤ笟鏃堕棿");
+ }
Goodsorder goodsorder = new Goodsorder();
goodsorder.setId(Constants.getUUID());
goodsorder.setCreateDate(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 3c98943..4d28930 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
@@ -1,6 +1,9 @@
package com.doumee.service.business.impl;
import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
@@ -14,6 +17,7 @@
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MemberRidesQuery;
+import com.doumee.service.business.DeviceService;
import com.doumee.service.business.MemberRidesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -42,6 +46,9 @@
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
+
+ @Autowired
+ private DeviceService deviceService;
@Override
public String create(MemberRides memberRides) {
@@ -191,4 +198,23 @@
}
return PageData.from(bikeLogDTOIPage);
}
+
+ @Override
+ public String getOnlineBike(String memberId){
+ MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
+ .eq("isdeleted", Constants.ZERO)
+ .eq("member_id",memberId)
+ .eq("status",Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey())
+ .last(" limit 1 ")
+ );
+ if(Objects.isNull(memberRides)){
+ return null;
+ }
+ return memberRides.getBikeCode();
+ }
+
+
+
+
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
new file mode 100644
index 0000000..02ec839
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
@@ -0,0 +1,148 @@
+package com.doumee.service.business.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.MultifileMapper;
+import com.doumee.dao.business.model.Multifile;
+import com.doumee.service.business.MultifileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * 闄勪欢淇℃伅琛⊿ervice瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2023/05/12 13:58
+ */
+@Service
+public class MultifileServiceImpl implements MultifileService {
+
+ @Autowired
+ private MultifileMapper multifileMapper;
+
+ @Override
+ public Integer create(Multifile multifile) {
+ multifileMapper.insert(multifile);
+ return multifile.getId();
+ }
+
+ @Override
+ public void deleteById(Integer id) {
+ multifileMapper.deleteById(id);
+ }
+
+ @Override
+ public void delete(Multifile multifile) {
+ UpdateWrapper<Multifile> deleteWrapper = new UpdateWrapper<>(multifile);
+ multifileMapper.delete(deleteWrapper);
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ multifileMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void updateById(Multifile multifile) {
+ multifileMapper.updateById(multifile);
+ }
+
+ @Override
+ public void updateByIdInBatch(List<Multifile> multifiles) {
+ if (CollectionUtils.isEmpty(multifiles)) {
+ return;
+ }
+ for (Multifile multifile: multifiles) {
+ this.updateById(multifile);
+ }
+ }
+
+ @Override
+ public Multifile findById(Integer id) {
+ return multifileMapper.selectById(id);
+ }
+
+ @Override
+ public Multifile findOne(Multifile multifile) {
+ QueryWrapper<Multifile> wrapper = new QueryWrapper<>(multifile);
+ return multifileMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<Multifile> findList(Multifile multifile) {
+ QueryWrapper<Multifile> wrapper = new QueryWrapper<>(multifile);
+ return multifileMapper.selectList(wrapper);
+ }
+
+ @Override
+ public PageData<Multifile> findPage(PageWrap<Multifile> pageWrap) {
+ IPage<Multifile> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<Multifile> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(Multifile::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(Multifile::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(Multifile::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(Multifile::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(Multifile::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(Multifile::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(Multifile::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(Multifile::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().eq(Multifile::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getInfo() != null) {
+ queryWrapper.lambda().eq(Multifile::getInfo, pageWrap.getModel().getInfo());
+ }
+ if (pageWrap.getModel().getObjId() != null) {
+ queryWrapper.lambda().eq(Multifile::getObjId, pageWrap.getModel().getObjId());
+ }
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(Multifile::getType, pageWrap.getModel().getType());
+ }
+ if (pageWrap.getModel().getObjType() != null) {
+ queryWrapper.lambda().eq(Multifile::getObjType, pageWrap.getModel().getObjType());
+ }
+ if (pageWrap.getModel().getFileurl() != null) {
+ queryWrapper.lambda().eq(Multifile::getFileurl, pageWrap.getModel().getFileurl());
+ }
+ if (pageWrap.getModel().getSortnum() != null) {
+ queryWrapper.lambda().eq(Multifile::getSortnum, pageWrap.getModel().getSortnum());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(multifileMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(Multifile multifile) {
+ QueryWrapper<Multifile> wrapper = new QueryWrapper<>(multifile);
+ return multifileMapper.selectCount(wrapper);
+ }
+}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
index a9beb77..58eab98 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
@@ -163,4 +163,21 @@
QueryWrapper<Transactions> wrapper = new QueryWrapper<>(transactions);
return transactionsMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public PageData<Transactions> findPageForMini(PageWrap pageWrap,String memberId) {
+ IPage<Transactions> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<Transactions> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.lambda().eq(Transactions::getMemberId, memberId);
+ queryWrapper.orderByDesc("create_date");
+ return PageData.from(transactionsMapper.selectPage(page, queryWrapper));
+ }
+
+
+
+
+
+
}
diff --git a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
new file mode 100644
index 0000000..9ca214a
--- /dev/null
+++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
@@ -0,0 +1,149 @@
+package com.doumee.api.web;
+
+import com.doumee.core.annotation.LoginRequired;
+import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.BaseParam;
+import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.model.RentSite;
+import com.doumee.dao.business.model.Transactions;
+import com.doumee.dao.business.web.request.RepairRequest;
+import com.doumee.dao.business.web.response.RidesDetailResponse;
+import com.doumee.service.business.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/10/9 10:15
+ */
+
+@Api(tags = "3銆佷笟鍔℃帴鍙�")
+@Trace(exclude = true)
+@RestController
+@RequestMapping("/web/business")
+@Slf4j
+public class BusinessApi extends ApiController{
+
+ @Autowired
+ private GoodsorderService goodsorderService;
+
+ @Autowired
+ private RentSiteService rentSiteService;
+
+ @Autowired
+ private TransactionsService transactionsService;
+
+ @Autowired
+ private BaseParamService baseParamService;
+
+ @Autowired
+ private BikeRepairService bikeRepairService;
+
+ @Autowired
+ private MemberRidesService memberRidesService;
+
+ @LoginRequired
+ @ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕")
+ @GetMapping("/createGoodsOrderPay")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<Object> createGoodsOrderPay() {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.createGoodsOrderPay(getMemberId()));
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "楠戣鏄庣粏", notes = "灏忕▼搴忕")
+ @GetMapping("/ridesDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "goodsOrderId", value = "璁㈠崟涓婚敭", required = true)
+ })
+ public ApiResponse<RidesDetailResponse> ridesDetail(@RequestParam String goodsOrderId) {
+ return ApiResponse.success("鏌ヨ鎴愬姛",goodsorderService.getRidesDetailResponse(goodsOrderId));
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "绉熻溅鐐瑰垪琛�", notes = "灏忕▼搴忕")
+ @GetMapping("/rentSiteList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<RentSite>> rentSiteList() {
+ RentSite rentSite = new RentSite();
+ rentSite.setIsdeleted(Constants.ZERO);
+ rentSite.setStatus(Constants.ZERO);
+ return ApiResponse.success("鏌ヨ鎴愬姛",rentSiteService.findList(rentSite));
+ }
+
+
+ @LoginRequired
+ @ApiOperation("娑堣垂鏄庣粏")
+ @PostMapping("/transactionsPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<PageData<Transactions>> transactionsPage (@RequestBody PageWrap pageWrap) {
+ return ApiResponse.success(transactionsService.findPageForMini(pageWrap,getMemberId()));
+ }
+
+ @LoginRequired
+ @ApiOperation("鍩虹閰嶇疆鏁版嵁")
+ @GetMapping("/baseParamList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "绫诲瀷 0杞﹁締鎶ヤ慨鍘熷洜 1寮哄埗杩樿溅鍘熷洜 2鏃堕暱鍑忓厤鍘熷洜 3鍗曡溅绫诲瀷", required = true)
+ })
+ public ApiResponse<List<BaseParam>> baseParamList (@RequestParam Integer type) {
+ BaseParam baseParam = new BaseParam();
+ baseParam.setIsdeleted(Constants.ZERO);
+ baseParam.setStatus(Constants.ZERO);
+ baseParam.setType(type);
+ return ApiResponse.success(baseParamService.findList(baseParam));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鏌ヨ楠戣涓溅杈�", notes = "灏忕▼搴忕")
+ @GetMapping("/onlineBike")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<String> onlineBike() {
+ return ApiResponse.success("鏌ヨ鎴愬姛",memberRidesService.getOnlineBike(getMemberId()));
+ }
+
+ @LoginRequired
+ @ApiOperation("杞﹁締闂涓婃姤")
+ @PostMapping("/saveRepair")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse transactionsPage (@RequestBody RepairRequest repairRequest) {
+ repairRequest.setMemberId(getMemberId());
+ bikeRepairService.saveRepair(repairRequest);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+
+
+
+
+
+}
diff --git a/server/web/src/main/java/com/doumee/api/web/GoodsOrderApi.java b/server/web/src/main/java/com/doumee/api/web/GoodsOrderApi.java
deleted file mode 100644
index c5ba7d8..0000000
--- a/server/web/src/main/java/com/doumee/api/web/GoodsOrderApi.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.doumee.api.web;
-
-import com.doumee.core.annotation.trace.Trace;
-import com.doumee.service.business.GoodsorderService;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/10/9 10:15
- */
-
-@Api(tags = "3銆佽鍗曚笟鍔�")
-@Trace(exclude = true)
-@RestController
-@RequestMapping("/web/goodsOrder")
-@Slf4j
-public class GoodsOrderApi extends ApiController{
-
- @Autowired
- private GoodsorderService goodsorderService;
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/server/web/src/main/java/com/doumee/api/web/HomeApi.java b/server/web/src/main/java/com/doumee/api/web/HomeApi.java
index 6f71c5e..0d31240 100644
--- a/server/web/src/main/java/com/doumee/api/web/HomeApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/HomeApi.java
@@ -47,18 +47,6 @@
}
- @LoginRequired
- @ApiOperation(value = "楠戣鏄庣粏", notes = "楠戣鏄庣粏")
- @GetMapping("/rideDetail")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "goodsOrderId", value = "璁㈠崟涓婚敭", required = true)
- })
- public ApiResponse<RidesDetailResponse> rideDetail(@RequestParam String goodsOrderId) {
- RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
- return ApiResponse.success("鏌ヨ鎴愬姛",ridesDetailResponse);
- }
-
--
Gitblit v1.9.3