week3_11-29

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

bwie-common/src/main/java/com/bwie/common/domain/dto/SalesDTO.java

@@ -0,0 +1,16 @@
+package com.bwie.common.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName SalesDTO
+ * @Description 描述
+ * @Author XingHua.Han
+ * @Date 2023/11/29 13:58
+ */
+@Data
+public class SalesDTO {
+    private Integer orderId;
+    private Integer scenicId;
+    private Integer orderNum;
+}

bwie-models/bwie-system/src/main/java/com/bwie/system/controller/SystemController.java

@@ -1,9 +1,9 @@
 package com.bwie.system.controller;
 
-import com.bwie.common.domain.Order;
 import com.bwie.common.domain.User;
 import com.bwie.common.domain.dto.BuyDTO;
 import com.bwie.common.domain.dto.ComputeDTO;
+import com.bwie.common.domain.dto.SalesDTO;
 import com.bwie.common.domain.dto.ShowDTO;
 import com.bwie.common.result.Result;
 import com.bwie.system.service.SystemService;
@@ -48,8 +48,8 @@ public class SystemController {
         return result;
     }
     @PostMapping("sales")
-    public Result sales(@RequestBody Order order){
+    public Result sales(@RequestBody SalesDTO salesDTO){
-        Result result = service.sales(order);
+        Result result = service.sales(salesDTO);
         return result;
     }
     @PostMapping("allShowOrder")

bwie-models/bwie-system/src/main/java/com/bwie/system/mapper/SystemMapper.java

@@ -4,6 +4,7 @@ import com.bwie.common.domain.Order;
 import com.bwie.common.domain.Scenic;
 import com.bwie.common.domain.User;
 import com.bwie.common.domain.dto.BuyDTO;
+import com.bwie.common.domain.dto.SalesDTO;
 import com.bwie.common.domain.dto.ShowDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -28,7 +29,7 @@ public interface SystemMapper {
 
     void updateOrder(@Param("orderId") Integer orderId);
 
-    void updateScenic(Order order);
+    void updateScenic(SalesDTO order);
 
     List<Order> allShowOrder();
 

bwie-models/bwie-system/src/main/java/com/bwie/system/service/SystemService.java

@@ -1,9 +1,9 @@
 package com.bwie.system.service;
 
-import com.bwie.common.domain.Order;
 import com.bwie.common.domain.User;
 import com.bwie.common.domain.dto.BuyDTO;
 import com.bwie.common.domain.dto.ComputeDTO;
+import com.bwie.common.domain.dto.SalesDTO;
 import com.bwie.common.domain.dto.ShowDTO;
 import com.bwie.common.result.Result;
 
@@ -24,7 +24,7 @@ public interface SystemService {
 
     Result buy(BuyDTO buyDTO);
 
-    Result sales(Order order);
+    Result sales(SalesDTO order);
 
     Result allShowOrder();
 }

bwie-models/bwie-system/src/main/java/com/bwie/system/service/impl/SystemServiceImpl.java

@@ -5,6 +5,7 @@ import com.bwie.common.domain.Scenic;
 import com.bwie.common.domain.User;
 import com.bwie.common.domain.dto.BuyDTO;
 import com.bwie.common.domain.dto.ComputeDTO;
+import com.bwie.common.domain.dto.SalesDTO;
 import com.bwie.common.domain.dto.ShowDTO;
 import com.bwie.common.result.Result;
 import com.bwie.system.mapper.SystemMapper;
@@ -65,10 +66,10 @@ public class SystemServiceImpl implements SystemService {
     }
 
     @Override
-    public Result sales(Order order) {
+    public Result sales(SalesDTO order) {
         systemMapper.updateOrder(order.getOrderId());
         systemMapper.updateScenic(order);
-        return null;
+        return Result.success();
     }
 
     @Override

bwie-models/bwie-system/src/main/resources/mapper/SystemMapper.xml

@@ -27,11 +27,11 @@
     <update id="updateOrder">
         update w3_order set order_status = 2 where order_id = #{orderId}
     </update>
-    <update id="updateScenic">
-        update w3_scenic set scenic_num+=#{orderNum} where scenic_id = #{scenicId}
-    </update>
     <update id="updateNum">
-        update w3_scenic set scenic_num-=#{orderNum} where scenic_id = #{scenicId}
+        update w3_scenic set scenic_num=scenic_num-#{orderNum} where scenic_id = #{scenicId}
+    </update>
+    <update id="updateScenic">
+        update w3_scenic set scenic_num=scenic_num+#{orderNum} where scenic_id = #{scenicId}
     </update>
     <!-- 添加 -->
 
@@ -62,6 +62,6 @@
     </select>
     <select id="allShowOrder" resultType="com.bwie.common.domain.Order">
         select * from w3_order o left join w3_scenic s on o.scenic_id = s.scenic_id
-                                 left join w3_bank b on o.bank_id = b.bank_id
+                                 left join w3_bank b on o.bank_id = b.bank_id where o.order_status = 1
     </select>
 </mapper>