From 69c7aa6c7cf05197c0b1d1e9e19759943a5fb3a1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 19 二月 2025 09:14:41 +0800
Subject: [PATCH] 111
---
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 deletions(-)
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
index 2766dad..8c95549 100644
--- a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
@@ -1,17 +1,22 @@
package com.doumee.api.web;
+//import com.doumee.api.Repeat.RepeatSubmit;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.LoginRequired;
+import com.doumee.core.annotation.pr.PreventRepeat;
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.*;
+import com.doumee.dao.business.web.request.BackElecBikeRequest;
import com.doumee.dao.business.web.request.RepairRequest;
+import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.jtt808.web.service.Jtt808Service;
import com.doumee.service.business.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -20,6 +25,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.yzh.commons.model.APIResult;
+import org.yzh.protocol.t808.T0201_0500;
+import org.yzh.protocol.t808.T8500;
import java.util.List;
@@ -39,6 +47,8 @@
@Autowired
private GoodsorderService goodsorderService;
+ @Autowired
+ private Jtt808Service jtt808Service;
@Autowired
private RentSiteService rentSiteService;
@@ -58,6 +68,10 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private DiscountService discountService;
+
+ @PreventRepeat
@LoginRequired
@ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕")
@GetMapping("/createGoodsOrderPay")
@@ -67,6 +81,19 @@
public ApiResponse<Object> createGoodsOrderPay() {
return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.createGoodsOrderPay(getMemberId()));
}
+
+ @PreventRepeat
+ @LoginRequired
+ @ApiOperation(value = "濂楅璐拱", notes = "灏忕▼搴忕")
+ @GetMapping("/createDiscountOrderPay")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "discountId", value = "濂楅涓婚敭", required = true)
+ })
+ public ApiResponse<Object> createDiscountOrderPay(@RequestParam String discountId) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.createDiscountOrderPay(discountId,getMemberId()));
+ }
+
@LoginRequired
@@ -79,8 +106,6 @@
public ApiResponse<RidesDetailResponse> ridesDetail(@RequestParam String goodsOrderId) {
return ApiResponse.success("鏌ヨ鎴愬姛",goodsorderService.getRidesDetailResponse(goodsOrderId));
}
-
-
@LoginRequired
@ApiOperation(value = "绉熻溅鐐瑰垪琛�", notes = "灏忕▼搴忕")
@@ -95,7 +120,6 @@
return ApiResponse.success("鏌ヨ鎴愬姛",rentSiteService.findList(rentSite));
}
-
@LoginRequired
@ApiOperation("娑堣垂鏄庣粏")
@PostMapping("/transactionsPage")
@@ -105,6 +129,24 @@
public ApiResponse<PageData<Transactions>> transactionsPage (@RequestBody PageWrap pageWrap) {
return ApiResponse.success(transactionsService.findPageForMini(pageWrap,getMemberId()));
}
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "鐑攢濂楅", notes = "鐑攢濂楅")
+ @GetMapping("/discountPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<PageData<Discount>> discountPage (@RequestBody PageWrap<Discount> pageWrap) {
+ Discount discount = new Discount();
+ discount.setStatus(Constants.ZERO);
+ pageWrap.setModel(discount);
+ return ApiResponse.success(discountService.findPage(pageWrap));
+ }
+
+
+
@LoginRequired
@ApiOperation("鍩虹閰嶇疆鏁版嵁")
@@ -143,7 +185,7 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
+ @PreventRepeat
@LoginRequired
@ApiOperation(value = "鎵爜瑙ｉ攣", notes = "灏忕▼搴忕")
@GetMapping("/openLock")
@@ -154,7 +196,6 @@
public ApiResponse<MemberRidesDetailResponse> openLock(@RequestParam String code) {
return ApiResponse.success("鎿嶄綔鎴愬姛",memberRidesService.openLock(code,getMemberId()));
}
-
@LoginRequired
@ApiOperation(value = "鍒锋柊瑙ｉ攣鎯呭喌", notes = "灏忕▼搴忕")
@@ -167,16 +208,15 @@
return ApiResponse.success("鎿嶄綔鎴愬姛",memberRidesService.refreshLock(id));
}
-
@LoginRequired
+ @PreventRepeat
@ApiOperation(value = "璁㈠崟缁撶畻", notes = "灏忕▼搴忕")
@GetMapping("/goodsOrderSettlement")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "orderId", value = "璁㈠崟涓婚敭", required = true)
})
- public ApiResponse goodsOrderSettlement(@RequestParam String orderId) {
- goodsorderService.goodsOrderSettlement(orderId);
+ public ApiResponse goodsOrderSettlement() {
+ goodsorderService.goodsOrderSettlement(getMemberId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -191,4 +231,12 @@
public ApiResponse<SystemDictData> getSysDict(@RequestParam String dicCode, @RequestParam String label) {
return ApiResponse.success("鏌ヨ鎴愬姛",systemDictDataBiz.queryByCode(dicCode,label));
}
+
+ @ApiOperation(value = "鐢佃溅绔欑偣杩樿溅", notes = "鐢佃溅绔欑偣杩樿溅")
+ @PostMapping("/backElecBike")
+ public ApiResponse backElecBike(@RequestBody BackElecBikeRequest param) {
+ param.setMemberId(getMemberId());
+ jtt808Service.backElecBike(param);
+ return ApiResponse.success( null);
+ }
}
--
Gitblit v1.9.3