xucaiqin 2 mēneši atpakaļ
vecāks
revīzija
1d6f385383

+ 2 - 0
sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/base/BaseModel.java

@@ -1,5 +1,6 @@
 package com.sckw.core.model.base;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Size;
@@ -23,6 +24,7 @@ public class BaseModel implements Serializable {
 	/**
 	 * 主键
 	 */
+	@TableId(value = "id", type = IdType.AUTO)
 	private Long id;
 
 	/**

+ 1 - 1
sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTradeOrderController.java

@@ -110,7 +110,7 @@ public class KwoTradeOrderController {
     /**
      * 门户贸易订单下单
      */
-    @GlobalTransactional(name = "default_tx_group")
+//    @GlobalTransactional(name = "default_tx_group")
     @RepeatSubmit(interval = 1000, message = "前方拥堵,请稍后尝试")
     @PostMapping(value = "/addOrder", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "门户贸易订单下单", description = "门户贸易订单下单")

+ 3 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -1,6 +1,8 @@
 package com.sckw.order.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
@@ -33,6 +35,7 @@ public class KwoTradeOrder extends BaseModel implements Serializable {
     /**
      * 订单id
      */
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     private Long entId;

+ 3 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderTransport.java

@@ -1,5 +1,7 @@
 package com.sckw.order.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
 import lombok.Setter;
@@ -23,6 +25,7 @@ public class KwoTradeOrderTransport {
     /**
     * 主键
     */
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

+ 1 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2072,6 +2072,7 @@ public class KwoTradeOrderService {
      *
      * @param tradeOrderParam
      */
+    @Transactional(rollbackFor = Exception.class)
     public void addTradeOrder(TradeOrderParam tradeOrderParam) {
         KwoTradeOrder order = new KwoTradeOrder();
         order.setId(new IdWorker(1).nextId());