修改bug

performance-api/src/main/java/com/clx/order/params/OrderGoodsParams.java

@@ -13,6 +13,10 @@ public class OrderGoodsParams {
     @ApiModelProperty("订单编号")
     @NotBlank(message = "订单编号不能为空")
     private String orderNo;
+
+    @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
+    private Integer vehicleUsage;
+
     @Converted(isDynamic = true)
     private List<OrderGoodsChildParams> orderGoodsChildParams;
 }

performance-web/src/main/java/com/clx/performance/strategy/impl/OneGoodsOrderStrategy.java

@@ -25,6 +25,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -61,6 +62,7 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
     private RabbitTemplate rabbitTemplate;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo, LocalDateTime now) {
         String orderNo = orderGoodsParams.getOrderNo();
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
@@ -133,6 +135,7 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             orderGoods.setReceiveAddressShorter(orderInfo.getReveiveAddressShorter());
 
             orderGoods.setGoodsName(orderInfo.getGoodsName());
+            orderGoods.setGoodsId(orderInfo.getGoodsNameId());
             orderGoods.setCreateTime(now);
             orderGoods.setModifiedTime(now);
             orderGoods.setUserName(loginUserInfo.getUserName());
@@ -152,7 +155,7 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
     }
 
     @Override
-    public void afterPropertiesSet() throws Exception {
+    public void afterPropertiesSet() {
         goodsOrderStrategyContext.strategyContext.put(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode(), this);
     }
 

performance-web/src/main/java/com/clx/performance/strategy/impl/ThreeGoodsOrderStrategy.java

@@ -28,6 +28,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -65,6 +66,7 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
     private RabbitTemplate rabbitTemplate;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo, LocalDateTime now) {
         String orderNo = orderGoodsParams.getOrderNo();
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
@@ -123,6 +125,7 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
 
             orderGoods.setOrderNo(orderNo);
             orderGoods.setOrderGoodsNo(OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId);
+
             orderGoods.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CREATED.getCode());
             orderGoods.setSendAddressId(orderInfo.getSendAddressId());
             orderGoods.setSendAddressShorter(orderInfo.getSendAddressShorter());
@@ -134,6 +137,8 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
             orderGoods.setReceiveAddressId(orderInfo.getReveiveAddressId());
             orderGoods.setReceiveAddressShorter(orderInfo.getReveiveAddressShorter());
             orderGoods.setGoodsName(orderInfo.getGoodsName());
+            orderGoods.setGoodsId(orderInfo.getGoodsNameId());
+
             orderGoods.setCreateTime(now);
             orderGoods.setModifiedTime(now);
             orderGoods.setUserName(loginUserInfo.getUserName());
@@ -154,7 +159,7 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
     }
 
     @Override
-    public void afterPropertiesSet() throws Exception {
+    public void afterPropertiesSet() {
         goodsOrderStrategyContext.strategyContext.put(TruckDemandEnum.TruckType.OWNER_CAR.getCode(), this);
     }
 

performance-web/src/main/java/com/clx/performance/strategy/impl/TwoGoodsOrderStrategy.java

@@ -28,6 +28,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -66,6 +67,7 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
     private RabbitTemplate rabbitTemplate;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo, LocalDateTime now) {
         String orderNo = orderGoodsParams.getOrderNo();
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
@@ -128,6 +130,7 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
 
             orderGoods.setOrderNo(orderNo);
             orderGoods.setOrderGoodsNo(OrderGoodsTypeEnum.Status.PLATFORM.getCode() + beginOrderGoodsId);
+
             orderGoods.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CREATED.getCode());
             orderGoods.setSendAddressId(orderInfo.getSendAddressId());
             orderGoods.setSendAddressShorter(orderInfo.getSendAddressShorter());
@@ -139,6 +142,8 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             orderGoods.setReceiveAddressId(orderInfo.getReveiveAddressId());
             orderGoods.setReceiveAddressShorter(orderInfo.getReveiveAddressShorter());
             orderGoods.setGoodsName(orderInfo.getGoodsName());
+            orderGoods.setGoodsId(orderInfo.getGoodsNameId());
+
             orderGoods.setCreateTime(now);
             orderGoods.setModifiedTime(now);
             orderGoods.setUserName(loginUserInfo.getUserName());
@@ -152,10 +157,11 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             orderGoodsMapper.insert(orderGoods);
         }
 
-
-        if (childParamsList.size() > 1) {
+        //选平台车辆拉运扣除平台承接吨数
+        if (orderGoodsParams.getVehicleUsage().equals(1)) {
             orderFeign.updateOrderInfoResidueWeight(orderInfo.getId(), 2, new BigDecimal(orderInfo.getPlatformResidueCarryWeight()).subtract(childSum), residueWeight.subtract(childSum));
         } else {
+            //选自有车辆拉运扣除平台承接吨数
             orderFeign.updateOrderInfoResidueWeight(orderInfo.getId(), 3, new BigDecimal(orderInfo.getOwnResidueCarryWeight()).subtract(childSum), residueWeight.subtract(childSum));
 
         }
@@ -164,7 +170,7 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
     }
 
     @Override
-    public void afterPropertiesSet() throws Exception {
+    public void afterPropertiesSet() {
         goodsOrderStrategyContext.strategyContext.put(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode(), this);
     }