From 9d1b09f48020e2321693a0475cd87131dda57b22 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 14:35:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 4 ++--
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 2 +-
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java
index e037621..50e6938 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "主键")
@TableId("id")
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
@@ -77,7 +77,7 @@
private String idStr;
- public void setId(Integer id) {
+ public void setId(Long id) {
this.id = id;
this.idStr = String.valueOf(id);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 31860a6..e6123e4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -201,7 +201,7 @@
public void writeOff(String code,Integer shopId) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
- .eq(Order::getOrderNumber, code));
+ .eq(Order::getId, code));
boolean check = check(order, shopId, loginUserApplet.getUserid());
if (!check){
throw new ServiceException("订单不存在");
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
index bd26a85..8b38be4 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -34,14 +34,14 @@
@PostMapping("/addGoodsCategory")
@ApiOperation(value = "添加商品分类", tags = {"管理后台-商品分类"})
- public R<Void> addGoodsCategory(GoodsCategory goodsCategory){
+ public R<Void> addGoodsCategory(@RequestBody GoodsCategory goodsCategory){
goodsCategoryService.save(goodsCategory);
return R.ok();
}
@PutMapping("/updateGoodsCategory")
@ApiOperation(value = "修改商品分类", tags = {"管理后台-商品分类"})
- public R<Void> updateGoodsCategory(GoodsCategory goodsCategory){
+ public R<Void> updateGoodsCategory(@RequestBody GoodsCategory goodsCategory){
goodsCategoryService.updateById(goodsCategory);
return R.ok();
}
--
Gitblit v1.7.1