From ce8dc138f97891a33fe125627a449311200f6c53 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 2 Sep 2024 15:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/OrderController.java | 10 ++++++++++
 .../cashierservice/dao/TbOrderInfoMapper.java      |  4 ++++
 .../cashierservice/service/OrderService.java       |  8 ++++++++
 src/main/resources/mapper/TbOrderInfoMapper.xml    | 14 ++++++++++----
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
index b43ec8a..64491fc 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
@@ -1,5 +1,6 @@
 package com.chaozhanggui.system.cashierservice.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.chaozhanggui.system.cashierservice.entity.TbShopTable;
 import com.chaozhanggui.system.cashierservice.entity.dto.OrderDto;
 import com.chaozhanggui.system.cashierservice.service.OrderService;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.Map;
 
 @CrossOrigin(origins = "*")
 @RestController
@@ -51,6 +53,14 @@ public class OrderController {
         return orderService.orderList(userId,page,size,status);
     }
 
+    @PostMapping("/rmOrder")
+    private Result rmOrder(@RequestBody Map<String, Object> map){
+        if (ObjectUtil.isEmpty(map) || map.size() <= 0 || !map.containsKey("orderId") || ObjectUtil.isEmpty(map.get("orderId"))) {
+            return Result.fail("订单号不允许为空");
+        }
+        return orderService.rmOrder(Integer.valueOf(map.get("orderId").toString()));
+    }
+
     @GetMapping("/tradeIntegral")
     private Result tradeIntegral(@RequestParam("userId") String userId, @RequestParam("id") String id) throws IOException, ParseException {
         return orderService.tradeIntegral(userId,id);
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java
index 20d3776..0affb60 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java
@@ -11,6 +11,10 @@ import java.util.List;
 @Component
 @Mapper
 public interface TbOrderInfoMapper {
+
+    /**
+     * 逻辑删除
+     */
     int deleteByPrimaryKey(Integer id);
 
     int insert(TbOrderInfo record);
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index ccb8505..23c2434 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -212,6 +212,14 @@ public class OrderService {
         return Result.success(CodeEnum.ENCRYPT, orderVo);
     }
 
+    public Result rmOrder(Integer orderId) {
+        int i = orderInfoMapper.deleteByPrimaryKey(orderId);
+        if (i > 0) {
+            return Result.success(CodeEnum.SUCCESS);
+        }
+        return Result.fail("删除失败");
+    }
+
 
     public Result orderList(Integer userId, Integer page, Integer size, String status) {
 //        TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(userId);
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index 97196ca..9eedfa9 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -65,10 +65,15 @@
         from tb_order_info
         where id = #{id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tb_order_info
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+<!--    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">-->
+<!--        delete from tb_order_info-->
+<!--        where id = #{id,jdbcType=INTEGER}-->
+<!--    </delete>-->
+    <update id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        update tb_order_info
+        set is_del = 1
+        where id = #{id,jdbcType=INTEGER}
+    </update>
 
     <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbOrderInfo"
             useGeneratedKeys="true" keyProperty="id">
@@ -550,6 +555,7 @@
 
         where user_id = #{userId}
         and order_type='miniapp'
+        and is_del != 1
         <if test="status != null and status != ''">
             <choose>
                 <when test="status == 'unpaid'">