From bb0a8ba2fba9f22d66a3db7f194493f7f0a96ae0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 09 十月 2023 10:20:36 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java                   |   60 +++++++++--
 server/services/src/main/java/com/doumee/dao/business/web/request/WxPhoneRequest.java     |    5 
 server/web/src/main/java/com/doumee/api/web/HomeApi.java                                  |   38 +++++++
 server/web/src/main/java/com/doumee/api/web/GoodsOrderApi.java                            |   37 +++++++
 server/services/src/main/java/com/doumee/core/constants/Constants.java                    |    7 +
 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java          |    6 -
 server/services/src/main/java/com/doumee/service/business/MemberService.java              |   11 +-
 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java     |   12 +-
 server/web/src/main/java/com/doumee/api/web/AccountApi.java                               |   50 ++++++---
 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java |   21 +++
 server/services/src/main/java/com/doumee/dao/business/model/Transactions.java             |    2 
 server/services/src/main/java/com/doumee/dao/business/web/request/RefundDTO.java          |   40 ++++++++
 12 files changed, 231 insertions(+), 58 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 c0f4808..b1cfc2a 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
@@ -50,7 +50,12 @@
         int waitPay =0;
         int pay =1;
     }
-
+    public interface transactionsType{
+        int deposit =0;
+        int consumption =1;
+        int refund =2;
+        int platformRefund = 3;
+    }
 
 public static  String getUUID(){
       return UUID.randomUUID().toString().replace("-","");
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index d0da6cd..295eb7e 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -1,19 +1,28 @@
 package com.doumee.core.wx;
 
 import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.Constants;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.utils.ID;
+import com.doumee.dao.business.RefundMapper;
+import com.doumee.dao.business.TransactionsMapper;
+import com.doumee.dao.business.model.Refund;
+import com.doumee.dao.business.model.Transactions;
+import com.doumee.dao.business.web.request.RefundDTO;
+import com.doumee.service.business.RefundService;
 import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
 import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 寰俊灏忕▼搴�-鍏叡鏂规硶
@@ -22,29 +31,55 @@
 @Slf4j
 public class WxMiniUtilService {
 
+    @Autowired
+    private RefundMapper refundMapper;
 
     @Autowired
-    private SystemDictDataBiz systemDictDataBiz;
+    private TransactionsMapper transactionsMapper;
 
-    /**
-     * 璁㈠崟寰俊閫�娆�
-     * orderNo:鍟嗘埛璁㈠崟鍙�
-     * totalPrice锛氳鍗曟�婚噾棰�
-     * refundPrice锛涢��娆鹃噾棰�
-     */
+
     @Transactional(rollbackFor = Exception.class)
-    public static String wxRefund(String orderNo, BigDecimal totalPrice, BigDecimal refundPrice) {
+    public Refund wxRefund(RefundDTO refundDTO) {
         try {
             // 鍙戦�侀��娆捐姹�
             String refNum = ID.nextGUID();
             WxPayRefundRequest request = new WxPayRefundRequest();
-            request.setOutTradeNo(orderNo);
+            request.setOutTradeNo(refundDTO.getOrderId());
             request.setOutRefundNo(refNum);
-            request.setTotalFee(BaseWxPayRequest.yuanToFen(totalPrice.toString()));
-            request.setRefundFee(BaseWxPayRequest.yuanToFen(refundPrice.toString()));
+            request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
+            request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
             WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);
             if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
-                return refNum;
+                //瀛樺偍閫�娆捐褰� 涓� 娴佹按璁板綍
+                Refund refund = new Refund();
+                refund.setCreateDate(new Date());
+                refund.setMemberId(refundDTO.getMemberId());
+                refund.setMoney(refundDTO.getRefundAmount());
+                refund.setOnlineOrderid(refNum);
+                refund.setPayWay(Constants.ZERO);
+                refund.setDoneDate(new Date());
+                refund.setType(refundDTO.getType());
+                refund.setObjId(refundDTO.getOrderId());
+                refund.setReason(refundDTO.getReason());
+                refundMapper.insert(refund);
+                //瀛樺偍浜ゆ槗娴佹按琛�
+                Transactions transactions = new Transactions();
+                transactions.setMemberId(refundDTO.getMemberId());
+                transactions.setCreateDate(new Date());
+                transactions.setIsdeleted(Constants.ZERO);
+                transactions.setOrderId(refundDTO.getOrderId());
+                transactions.setMoney(refundDTO.getRefundAmount());
+                transactions.setType(refundDTO.getType()==Constants.transactionsType.refund?Constants.transactionsType.platformRefund:Constants.transactionsType.refund);
+                transactions.setPreOrderid(refundDTO.getOrderId());
+                transactions.setOnlineOrderid(refNum);
+                transactions.setDoneDate(new Date());
+                transactions.setTitle("閫�娆�");
+                transactions.setContent(refundDTO.getType()==Constants.transactionsType.refund?"骞冲彴閫�娆�":"缁撶畻閫�娆�");
+                transactions.setBalance(BigDecimal.ZERO);
+                transactions.setObjId(refund.getId());
+                transactions.setObjType(Constants.ONE);
+                transactionsMapper.insert(transactions);
+                return refund;
             } else{
                 throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),response.getErrCode() + response.getErrCodeDes());
             }
@@ -53,6 +88,5 @@
         }
         throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閫�娆惧彂鐢熷紓甯歌鑱旂郴绠$悊鍛�");
     }
-
 
 }
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java b/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
index 5abe37d..91c04df 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
@@ -77,7 +77,7 @@
 
     @ApiModelProperty(value = "浜ゆ槗瀹屾垚鏃堕棿")
     @ExcelColumn(name="浜ゆ槗瀹屾垚鏃堕棿")
-    private String doneDate;
+    private Date doneDate;
 
     @ApiModelProperty(value = "浜ゆ槗鏍囬")
     @ExcelColumn(name="浜ゆ槗鏍囬")
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/RefundDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/request/RefundDTO.java
new file mode 100644
index 0000000..9f14775
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/RefundDTO.java
@@ -0,0 +1,40 @@
+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 io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/10/9 9:34
+ */
+@Data
+@ApiModel("閫�娆捐姹傜被")
+public class RefundDTO {
+
+    @ApiModelProperty(value = "璁㈠崟淇℃伅鍙凤紙goodsOrder:id锛�")
+    private String orderId;
+
+    @ApiModelProperty(value = "璁㈠崟鎬婚噾棰濓紙鍒嗭級")
+    private BigDecimal totalAmount;
+
+    @ApiModelProperty(value = "鐢ㄦ埛涓婚敭")
+    private String memberId;
+
+    @ApiModelProperty(value = "閫�娆鹃噾棰濓紙鍒嗭級")
+    private BigDecimal refundAmount;
+
+    @ApiModelProperty(value = "閫�娆剧被鍨� 0缁撶畻閫�娆� 1寮哄埗缁撶畻閫�娆� 2缁撶畻鍚庨��娆�")
+    private Integer type;
+
+    @ApiModelProperty(value = "閫�娆惧師鍥�")
+    private String reason;
+
+
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/WxPhoneRequest.java b/server/services/src/main/java/com/doumee/dao/business/web/request/WxPhoneRequest.java
index 84dc7db..3ad88b8 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/request/WxPhoneRequest.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/WxPhoneRequest.java
@@ -29,8 +29,7 @@
     @ApiModelProperty(value = "sessionKey")
     private String sessionKey;
 
-    @NotEmpty(message = "openId 涓嶈兘涓虹┖")
-    @ApiModelProperty(value = "openId")
-    private String openId;
+    @ApiModelProperty(value = "鐢ㄦ埛涓婚敭",hidden = true)
+    private String memberId;
 
 }
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 66d6a1d..6941ae7 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
@@ -142,11 +142,5 @@
     void closerGoodsorder(String id);
 
 
-
-    /**
-     * 鎶奸噾鏀粯涓氬姟
-     * @param id
-     * @return
-     */
     RidesDetailResponse getRidesDetailResponse(String id);
 }
diff --git a/server/services/src/main/java/com/doumee/service/business/MemberService.java b/server/services/src/main/java/com/doumee/service/business/MemberService.java
index e43dbc6..9aefd3a 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberService.java
@@ -4,6 +4,7 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.web.request.RegisterRequest;
+import com.doumee.dao.business.web.request.WxPhoneRequest;
 import com.doumee.dao.business.web.response.AccountResponse;
 import com.doumee.dao.business.web.response.UserResponse;
 
@@ -104,20 +105,18 @@
     void wxEmpower(String code, String memberId);
 
     /**
-     * 鎷夊彇鐧诲綍
+     * 鎺堟潈鐧诲綍
      * @param code
      */
     AccountResponse wxLogin(String code);
 
+
     /**
      * 瑙f瀽鎵嬫満鍙�
-     * @param memberId
-     * @param encryptedData
-     * @param iv
-     * @param sessionKey
+     * @param wxPhoneRequest
      * @return
      */
-    AccountResponse wxPhone(String memberId,String encryptedData, String iv,String sessionKey);
+    AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest);
 
     UserResponse getUserInfo(String memberId);
 }
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 4a7c2cf..9ad6314 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
@@ -222,8 +222,8 @@
         }
         return homeResponse;
     }
-
-
+    @Autowired
+    private TransactionsMapper transactionsMapper;
 
 
     @Override
@@ -445,6 +445,23 @@
         goodsorder.setPayDate(new Date());
         goodsorder.setEditDate(new Date());
         goodsorderMapper.updateById(goodsorder);
+        //瀛樺偍浜ゆ槗娴佹按琛�
+        Transactions transactions = new Transactions();
+        transactions.setMemberId(goodsorder.getMemberId());
+        transactions.setCreateDate(new Date());
+        transactions.setIsdeleted(Constants.ZERO);
+        transactions.setOrderId(goodsorder.getId());
+        transactions.setMoney(goodsorder.getMoney());
+        transactions.setType(Constants.transactionsType.deposit);
+        transactions.setPreOrderid(goodsorder.getPreOrderid());
+        transactions.setOnlineOrderid(goodsorder.getOnlineOrderid());
+        transactions.setDoneDate(new Date());
+        transactions.setTitle("鏀粯");
+        transactions.setContent("鎶奸噾鏀粯");
+        transactions.setBalance(goodsorder.getMoney());
+        transactions.setObjId(goodsorder.getId());
+        transactions.setObjType(Constants.ZERO);
+        transactionsMapper.insert(transactions);
         return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
     }
 
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index ef5e369..20b977d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -19,6 +19,7 @@
 import com.doumee.dao.business.MemberMapper;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.web.request.RegisterRequest;
+import com.doumee.dao.business.web.request.WxPhoneRequest;
 import com.doumee.dao.business.web.response.AccountResponse;
 import com.doumee.dao.business.web.response.HomeResponse;
 import com.doumee.dao.business.web.response.UserResponse;
@@ -285,17 +286,14 @@
 
     /**
      * 瑙f瀽寰俊鎵嬫満鍙�
-     * @param memberId
-     * @param encryptedData
-     * @param iv
-     * @param sessionKey
+     * @param wxPhoneRequest
      * @return
      */
     @Override
-    public AccountResponse wxPhone(String memberId,String encryptedData, String iv,String sessionKey) {
+    public AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest) {
         try {
-            Member member =  memberMapper.selectById(memberId);
-            WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
+            Member member =  memberMapper.selectById(wxPhoneRequest.getMemberId());
+            WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNoInfo(wxPhoneRequest.getSessionKey(), wxPhoneRequest.getEncryptedData(), wxPhoneRequest.getIv());
             //鑾峰彇鎵嬫満鍙�
             String mobile= userPhoneInfo.getPurePhoneNumber();
             if(Objects.isNull(mobile)){
diff --git a/server/web/src/main/java/com/doumee/api/web/AccountApi.java b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
index 995aca2..3b007c0 100644
--- a/server/web/src/main/java/com/doumee/api/web/AccountApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -4,6 +4,7 @@
 import com.doumee.core.annotation.trace.Trace;
 import com.doumee.core.model.ApiResponse;
 import com.doumee.dao.business.web.request.RegisterRequest;
+import com.doumee.dao.business.web.request.WxPhoneRequest;
 import com.doumee.dao.business.web.response.AccountResponse;
 import com.doumee.dao.business.web.response.UserResponse;
 import com.doumee.service.business.MemberService;
@@ -32,31 +33,30 @@
     @Autowired
     private MemberService memberService;
 
-    @ApiOperation(value = "鐢ㄦ埛娉ㄥ唽", notes = "灏忕▼搴忕")
-    @PostMapping("/userRegister")
-    public ApiResponse<AccountResponse> userRegister(@RequestBody RegisterRequest registerRequest) {
-        return  ApiResponse.success("鎿嶄綔鎴愬姛",memberService.userRegister(registerRequest));
-    }
-
-    @Trace
-    @LoginRequired
-    @ApiOperation(value = "寰俊鎺堟潈锛堢櫥褰曞悗锛�", notes = "灏忕▼搴忕")
-    @GetMapping("/wxEmpower")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true)
-    })
-    public ApiResponse wxEmpower(@RequestParam String code) {
-        memberService.wxEmpower(code,getMemberId());
-        return  ApiResponse.success("鎿嶄綔鎴愬姛");
-    }
+//    @ApiOperation(value = "鐢ㄦ埛娉ㄥ唽", notes = "灏忕▼搴忕")
+//    @PostMapping("/userRegister")
+//    public ApiResponse<AccountResponse> userRegister(@RequestBody RegisterRequest registerRequest) {
+//        return  ApiResponse.success("鎿嶄綔鎴愬姛",memberService.userRegister(registerRequest));
+//    }
+//
+//    @Trace
+//    @LoginRequired
+//    @ApiOperation(value = "寰俊鎺堟潈锛堢櫥褰曞悗锛�", notes = "灏忕▼搴忕")
+//    @GetMapping("/wxEmpower")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+//            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true)
+//    })
+//    public ApiResponse wxEmpower(@RequestParam String code) {
+//        memberService.wxEmpower(code,getMemberId());
+//        return  ApiResponse.success("鎿嶄綔鎴愬姛");
+//    }
 
 
     @Trace
     @ApiOperation(value = "寰俊鎺堟潈", notes = "灏忕▼搴忕")
     @GetMapping("/wxLogin")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true)
     })
     public ApiResponse<AccountResponse> wxLogin(@RequestParam String code) {
@@ -65,6 +65,18 @@
 
 
     @LoginRequired
+    @ApiOperation(value = "瑙f瀽寰俊鎵嬫満鍙�", notes = "灏忕▼搴忕")
+    @PostMapping("/wxPhone")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<AccountResponse> wxPhone(@RequestBody WxPhoneRequest wxPhoneRequest) {
+        wxPhoneRequest.setMemberId(getMemberId());
+        return  ApiResponse.success("鎿嶄綔鎴愬姛",memberService.wxPhone(wxPhoneRequest));
+    }
+
+
+    @LoginRequired
     @ApiOperation(value = "鑾峰彇鐢ㄦ埛淇℃伅", notes = "灏忕▼搴忕")
     @GetMapping("/getUserInfo")
     @ApiImplicitParams({
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
new file mode 100644
index 0000000..c5ba7d8
--- /dev/null
+++ b/server/web/src/main/java/com/doumee/api/web/GoodsOrderApi.java
@@ -0,0 +1,37 @@
+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 004bce6..6f71c5e 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
@@ -1,9 +1,20 @@
 package com.doumee.api.web;
 
+import com.doumee.core.annotation.LoginRequired;
 import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.dao.business.web.response.HomeResponse;
+import com.doumee.dao.business.web.response.RidesDetailResponse;
+import com.doumee.service.business.GoodsorderService;
 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.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -20,6 +31,33 @@
 @Slf4j
 public class HomeApi extends ApiController{
 
+    @Autowired
+    private GoodsorderService goodsorderService;
+
+
+    @LoginRequired
+    @ApiOperation(value = "棣栭〉淇℃伅", notes = "棣栭〉淇℃伅")
+    @GetMapping("/home")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<HomeResponse> home() {
+        HomeResponse homeResponse = goodsorderService.getHome(getMemberId());
+        return  ApiResponse.success("鏌ヨ鎴愬姛",homeResponse);
+    }
+
+
+    @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