commit commit

src/main/java/com/example/afrishop_v3/controllers/OrderController.java

@@ -368,6 +368,7 @@ public class OrderController extends Controller {
 
 
     @GetMapping("/cancelOrder")
+    @Transactional
     public Result cancelOrder(@RequestParam("orderId") String orderId,
                               @RequestParam("reason") String reason) {
         Optional<TbCfOrder> byId = repository.findById(orderId);
@@ -386,6 +387,9 @@ public class OrderController extends Controller {
                 }
             }
 
+            repository.returnItemQuantity(orderId);
+            repository.returnSkuQuantity(orderId);
+
             repository.save(order);
 
             return new Result();

src/main/java/com/example/afrishop_v3/models/TbCfCartRecordR.java

@@ -216,7 +216,7 @@ public class TbCfCartRecordR {
 
     TbCfItemOrderR getOrderItem(String orderId){
         if( template == null ) System.out.println("Template is null");
-        return new TbCfItemOrderR(cartRecordId,orderId,itemId,itemNum,getItemPrice(),template,itemImg,itemSku,itemTitle,shopId,shopName,shopUrl);
+        return new TbCfItemOrderR(cartRecordId,orderId,itemId,itemNum,getItemPrice(),template,itemImg,itemSku,itemTitle,shopId,shopName,shopUrl,itemSkuId);
     }
 
     public void setTemplate(TbCfExpressTemplate template) {

src/main/java/com/example/afrishop_v3/models/TbCfItemOrderR.java

@@ -81,7 +81,9 @@ public class TbCfItemOrderR {
     @Transient
     private String cartRecordId;
 
-    TbCfItemOrderR(String id,String orderId,String itemId,Integer itemNum,BigDecimal itemPrice,TbCfExpressTemplate template,String itemImg,String itemSku,String itemTitle,String shopId,String shopName,String shopUrl){
+    private String itemSkuId;
+
+    TbCfItemOrderR(String id,String orderId,String itemId,Integer itemNum,BigDecimal itemPrice,TbCfExpressTemplate template,String itemImg,String itemSku,String itemTitle,String shopId,String shopName,String shopUrl,String itemSkuId){
         this.itemNum = itemNum;
         this.cartRecordId = id;
         this.orderId = orderId;
@@ -91,6 +93,7 @@ public class TbCfItemOrderR {
         this.itemId = itemId;
         this.itemImg = itemImg;
         this.itemSku = itemSku;
+        this.itemSkuId = itemSkuId;
         this.itemTitle = itemTitle;
         this.enableFlag = StateConstant.VALID;
         this.orderStatus = OrderStatusEnum.PENDING_PAY.getValue();

src/main/java/com/example/afrishop_v3/repository/TbCfOrderRepository.java

@@ -5,6 +5,7 @@ import com.example.afrishop_v3.models.TbCfOrder;
 import com.example.afrishop_v3.models.TbCfUserInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
@@ -21,4 +22,13 @@ public interface TbCfOrderRepository extends PagingAndSortingRepository<TbCfOrde
 //    List<TbCfOrder> getTimeoutOrders(@Param("now") Date date);
 
     List<TbCfOrder> findAllByOrderTimeLessThanAndOrderStatus(Date orderTime, Integer orderStatus);
+
+
+    @Modifying
+    @Query(value = "update tb_cf_item_skus sk INNER JOIN tb_cf_item_order_r r ON r.item_sku_id=sk.id set sk.sku_count=sk.sku_count+r.item_num WHERE r.order_id = :orderId ",nativeQuery = true)
+    void returnSkuQuantity(@Param("orderId") String orderId);
+
+    @Modifying
+    @Query(value = "update tb_cf_station_item sk INNER JOIN tb_cf_item_order_r r ON r.item_id=sk.item_id set sk.item_count=sk.item_count+r.item_num WHERE r.order_id = :orderId ",nativeQuery = true)
+    void returnItemQuantity(@Param("orderId") String orderId);
 }