bugfix:部分代码合并

alien-store/src/main/java/shop/alien/store/controller/LifeUserOrderController.java

@@ -29,7 +29,7 @@ public class LifeUserOrderController {
     @ApiOperation("创建订单")
     @ApiOperationSupport(order = 2)
     @PostMapping("/createUserOrder")
-    public R<Map<String, Object>> createUserOrder(@RequestBody LifeUserOrderDto LifeUserOrderDto) {
+    public R createUserOrder(@RequestBody LifeUserOrderDto LifeUserOrderDto) {
         log.info("userOrder.createUserOrder:{}", LifeUserOrderDto);
         return R.data(lifeUserOrderService.createUserOrder(LifeUserOrderDto));
     }
@@ -130,9 +130,9 @@ public class LifeUserOrderController {
     @ApiOperation("订单退款")
     @ApiOperationSupport(order = 5)
     @PostMapping("/requestRefund")
-    public R<Map<String, Object>> requestRefund(@RequestBody LifeRefundOrder refundOrder) {
+    public R<String> requestRefund(@RequestBody LifeRefundOrder refundOrder) {
         log.info("UserOrderController.requestRefund?refundOrder={}", refundOrder.toString());
-        return R.data(lifeUserOrderService.requestRefund(refundOrder));
+        return lifeUserOrderService.requestRefund(refundOrder);
     }
 
 

alien-store/src/main/java/shop/alien/store/controller/UserOrderController.java

@@ -89,9 +89,9 @@ public class UserOrderController {
     @ApiOperationSupport(order = 5)
     @PostMapping("/requestRefund")
     @Deprecated
-    public R<Map<String, Object>> requestRefund(LifeRefundOrder refundOrder) {
+    public R<String> requestRefund(LifeRefundOrder refundOrder) {
         log.info("UserOrderController.requestRefund?refundOrder={}", refundOrder.toString());
-        return R.data(userOrderService.requestRefund(refundOrder));
+        return userOrderService.requestRefund(refundOrder);
     }
 
     @GetMapping("getQuanCodeList")