From 30ddf6570494f77a3dde98e5cd85c07cb340f51a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 14:42:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 18 ++-
/dev/null | 11 --
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/VerifiableShopVo.java | 18 +++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java | 30 ++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java | 20 ++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java | 22 ++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java | 62 ++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java | 42 ++++++++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 5
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/SetGoodsNumber.java | 18 +++
10 files changed, 228 insertions(+), 18 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
new file mode 100644
index 0000000..e6444db
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
@@ -0,0 +1,62 @@
+package com.ruoyi.order.controller;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BaseTable;
+import com.ruoyi.order.vo.*;
+import com.ruoyi.other.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/shopping-cart")
+@Api(tags = "购物车")
+public class ShoppingCartController {
+
+
+
+
+ @ResponseBody
+ @GetMapping("/getMyShoppingCart/{type}/{shopId}")
+ @ApiOperation(value = "获取购物车列表", tags = {"购物车-小程序"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", value = "商品类型（1=服务商品，2=单品商品）", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "shopId", value = "核销门店id", required = true, dataType = "int")
+ })
+ public AjaxResult<BaseTable<MyShoppingCartVo>> getMyShoppingCart(@PathVariable("type") Integer type, @PathVariable("shopId") Integer shopId){
+ // todo 待完善 pu
+ return AjaxResult.success();
+ }
+
+
+ @ResponseBody
+ @PostMapping("/setGoodsNumber")
+ @ApiOperation(value = "修改购物车数量", tags = {"购物车-小程序"})
+ public AjaxResult setGoodsNumber(@RequestBody SetGoodsNumber setGoodsNumber){
+ // todo 待完善 pu
+ return AjaxResult.success();
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/confirmOrder")
+ @ApiOperation(value = "确定购物车订单", tags = {"购物车-小程序"})
+ public AjaxResult<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrder confirmOrder){
+ // todo 待完善 pu
+ return AjaxResult.success();
+ }
+
+
+ @ResponseBody
+ @PostMapping("/shoppingCartPayment")
+ @ApiOperation(value = "购物车订单支付", tags = {"购物车-小程序"})
+ public AjaxResult shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
+ // todo 待完善 pu
+ return AjaxResult.success();
+ }
+
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
new file mode 100644
index 0000000..7382984
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/25 12:12
+ */
+@Data
+@ApiModel
+public class ConfirmOrder {
+ @ApiModelProperty(value = "购物商品id JSON", required = true)
+ private String goodsJson;
+ @ApiModelProperty(value = "支付方式（1=现金，2=积分）", required = true)
+ private Integer paymentType;
+ @ApiModelProperty(value = "核销门店id", required = true)
+ private Integer shopId;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
new file mode 100644
index 0000000..b55429c
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
@@ -0,0 +1,42 @@
+package com.ruoyi.order.vo;
+
+import com.ruoyi.account.api.model.UserAddress;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/25 14:05
+ */
+@Data
+@ApiModel
+public class ConfirmOrderVo {
+ @ApiModelProperty("商品列表")
+ private List<MyShoppingCartVo> goodsList;
+ @ApiModelProperty("核销门店")
+ private String shopName;
+ @ApiModelProperty("核销门店id")
+ private Integer shopId;
+ @ApiModelProperty("订单金额")
+ private BigDecimal orderMoney;
+ @ApiModelProperty("优惠活动")
+ private String activityName;
+ @ApiModelProperty("优惠金额")
+ private BigDecimal discountAmount;
+ @ApiModelProperty("获得积分")
+ private Integer earnPoint;
+ @ApiModelProperty("支付金额")
+ private BigDecimal payMoney;
+ @ApiModelProperty("订单总金额")
+ private Integer orderPoint;
+ @ApiModelProperty("剩余积分")
+ private Integer residualPoint;
+ @ApiModelProperty("收货地址")
+ private UserAddress userAddress;
+ @ApiModelProperty("支付方式（1=现金，2=积分）")
+ private Integer paymentType;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
new file mode 100644
index 0000000..4e3fd25
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
@@ -0,0 +1,30 @@
+package com.ruoyi.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/25 11:51
+ */
+@Data
+@ApiModel
+public class MyShoppingCartVo {
+ @ApiModelProperty("商品id")
+ private Integer id;
+ @ApiModelProperty("封面图")
+ private String homePicture;
+ @ApiModelProperty("商品名称")
+ private String name;
+ @ApiModelProperty("售价")
+ private String sellingPrice;
+ @ApiModelProperty("原价")
+ private String originalPrice;
+ @ApiModelProperty("购买数量")
+ private Integer number;
+ @ApiModelProperty("结束时间")
+ private Long endTime;
+ @ApiModelProperty("是否可核销（0=否，1=是）")
+ private Boolean verifiable;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/SetGoodsNumber.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/SetGoodsNumber.java
new file mode 100644
index 0000000..7e375ab
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/SetGoodsNumber.java
@@ -0,0 +1,18 @@
+package com.ruoyi.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/25 12:04
+ */
+@Data
+@ApiModel
+public class SetGoodsNumber {
+ @ApiModelProperty(value = "商品id", required = true)
+ private Integer id;
+ @ApiModelProperty(value = "修改数量", required = true)
+ private Integer number;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java
new file mode 100644
index 0000000..02db9f0
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java
@@ -0,0 +1,22 @@
+package com.ruoyi.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/25 14:33
+ */
+@Data
+@ApiModel
+public class ShoppingCartPayment {
+ @ApiModelProperty(value = "购物商品id JSON", required = true)
+ private String goodsJson;
+ @ApiModelProperty(value = "支付方式（1=现金，2=积分）", required = true)
+ private Integer paymentType;
+ @ApiModelProperty(value = "核销门店id", required = true)
+ private Integer shopId;
+ @ApiModelProperty(value = "优惠券id", required = false)
+ private String userCouponId;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/VerifiableShopVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/VerifiableShopVo.java
new file mode 100644
index 0000000..6e75148
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/VerifiableShopVo.java
@@ -0,0 +1,18 @@
+package com.ruoyi.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/25 12:08
+ */
+@Data
+@ApiModel
+public class VerifiableShopVo {
+ @ApiModelProperty("门店id")
+ private Integer id;
+ @ApiModelProperty("门店名称")
+ private String name;
+}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
index 1a5b4f5..9789b16 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
@@ -34,7 +34,7 @@
* 商品列表
*/
@GetMapping("/goodsList")
- @ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表"})
+ @ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表", "首页热门商品-小程序"})
public TableDataInfo goodsList(Goods goods){
startPage();
return getDataTable(goodsService.goodsList(goods));
@@ -50,5 +50,8 @@
}
+
+
+
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index fd5ea9f..6531a59 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -12,13 +12,11 @@
import com.ruoyi.other.enums.ShopStatus;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.service.TechnicianService;
+import com.ruoyi.other.vo.VerifiableShopVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-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;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -88,7 +86,15 @@
appUserClient.editAppUserById(appUser);
return success();
}
-
-
+
+
+
+ @ResponseBody
+ @GetMapping("/getVerifiableShop")
+ @ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
+ public AjaxResult<List<VerifiableShopVo>> getVerifiableShop(){
+ // todo 待完善 pu
+ return AjaxResult.success();
+ }
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShoppingCartController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShoppingCartController.java
deleted file mode 100644
index 2a4fb7f..0000000
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShoppingCartController.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.ruoyi.other.controller;
-
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/shopping-cart")
-@Api(tags = "购物车")
-public class ShoppingCartController {
-}
--
Gitblit v1.7.1