Merge remote-tracking branch 'origin/master'

src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -47,7 +48,7 @@ public class AppGoodsController {
 
     @ApiOperation("查询价格")
     @PostMapping("/queryPrice")
-    public ApiResponse queryPrice(@RequestBody GoodsPriceQueryReq queryPriceData) {
+    public ApiResponse<BigDecimal> queryPrice(@RequestBody GoodsPriceQueryReq queryPriceData) {
         return goodsService.queryPrice(queryPriceData);
     }
 }

src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java

@@ -36,8 +36,8 @@ public class AppMemberController {
     @ApiOperation("登录")
     @PostMapping("/login")
     @IgnoreToken
-    public ApiResponse<?> login(@RequestParam(value = "code", required = false) String code,
-                                @RequestParam(value = "userInfoDTO", required = false) WeChatUserInfoDTO userInfoDTO) throws Exception {
+    public ApiResponse<?> login(@RequestParam(value = "code") String code,
+                                @RequestParam(value = "userInfoDTO") WeChatUserInfoDTO userInfoDTO) throws Exception {
         return memberService.login(code, userInfoDTO);
     }
 

src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java

@@ -2,6 +2,7 @@ package com.ycwl.basic.controller.mobile;
 
 import com.ycwl.basic.annotation.IgnoreToken;
 import com.ycwl.basic.constant.BaseContextHandler;
+import com.ycwl.basic.model.mobile.order.RefundOrderReq;
 import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
 import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
 import com.ycwl.basic.model.pc.order.resp.OrderAppRespVO;
@@ -29,10 +30,11 @@ public class AppOrderController {
     @PostMapping("/page")
     @IgnoreToken
     public ApiResponse pageQuery(@RequestBody OrderReqQuery orderReqQuery) {
-        //TODO 添加用户openid查询条件,仅查询当前用户自己的订单
+        // TODO 添加用户openid查询条件,仅查询当前用户自己的订单
 
         return orderService.appPageQuery(orderReqQuery);
     }
+
     @ApiOperation("用户端订单详情查询")
     @GetMapping("getOrderDetails/{id}")
     @IgnoreToken
@@ -43,7 +45,7 @@ public class AppOrderController {
     @ApiOperation("用户端订单新增")
     @PostMapping("/addOrder")
     public ApiResponse<WxPayRespVO> addOrder(@RequestBody OrderAddOrUpdateReq orderAddReq) throws Exception {
-        return  orderService.add(orderAddReq);
+        return orderService.add(orderAddReq);
     }
 
 
@@ -55,4 +57,10 @@ public class AppOrderController {
         return orderService.getOrderCountByUserId(userId);
     }
 
+    @ApiOperation(value = "发起退款", notes = "发起退款")
+    @PostMapping("/refundOrder")
+    public ApiResponse<?> refundOrder(@RequestBody RefundOrderReq refundOrderReq) {
+        return orderService.refundOrder(refundOrderReq);
+    }
+
 }

src/main/java/com/ycwl/basic/controller/pc/OrderController.java

@@ -1,6 +1,7 @@
 package com.ycwl.basic.controller.pc;
 
 import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.model.mobile.order.RefundOrderReq;
 import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
 import com.ycwl.basic.model.pc.order.resp.OrderRespVO;
 import com.ycwl.basic.service.pc.OrderService;
@@ -24,6 +25,13 @@ public class OrderController {
     @Autowired
     private OrderService orderService;
 
+    @ApiOperation(value = "审核退款", notes = "审核退款")
+    @PostMapping("/auditRefundOrder")
+    public ApiResponse<?> auditRefundOrder(@RequestBody RefundOrderReq refundOrderReq) {
+        return orderService.auditRefundOrder(refundOrderReq);
+    }
+
+
     @ApiOperation("分页查询订单")
     @PostMapping("page")
     public ApiResponse<PageInfo<OrderRespVO>> pageQuery(@RequestBody OrderReqQuery query) {