Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into…

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -43,22 +43,30 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_CHILD_STATUS_CHANGED(1302, "运单状态已变更，请重新刷新页面"),
     ORDER_CHILD_CANCELED(1303, "运单状态已取消"),
     ORDER_CHILD_COMPLETE(1304, "运单状态已完成"),
-    ORDER_CHILD_LOAD_TIMEOUT(1305, "超过最晚到达货源地时间"),
-    ORDER_CHILD_CANCEL_FORBID(1306, "运单无法取消"),
-    ORDER_CHILD_CANCEL_FORBID_COUNT(1307, "今日取消运单次数超过上限，暂时无法取消"),
-    ORDER_CHILD_POUND_AUDIT(1308, "磅单审核中"),
-    ORDER_CHILD_POUND_REJECT(1309, "磅单审核驳回，请重新提交信息"),
-    ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR(1310, "请选择定向车辆"),
-    ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR1(1311, "请选择非定向车辆"),
-    ORDER_CHILD_DIRECT_REJECT_TRUCK_ERROR(1312, "非定向车辆无法取消"),
-    ORDER_CHILD_TRUCK_MODEL_ERROR(1313, "请选择合适的车型"),
-
-    ORDER_CHILD_LOAD_WEIGHT_ERROR(1314, "装货净重超过载重的1.5倍"),
-    ORDER_CHILD_UNLOAD_WEIGHT_ERROR(1315, "卸货净重超过载重的1.5倍"),
-    ORDER_CHILD_LOAD_TIME_ERROR(1316, "非装车时间段"),
-    ORDER_CHILD_UNLOAD_TIME_ERROR(1317, "非卸车时间段"),
-    ORDER_CHILD_ARRIVE_SEND_ADDRESS_DISTANCE_ERROR(1318, "没有到达货源地"),
-    ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_DISTANCE_ERROR(1319, "没有到达目的地"),
+    ORDER_CHILD_OPERATION_FORBID(1305, "没有权限操作"),
+
+    ORDER_CHILD_SAVE_FAIL(1321, "接单失败,请稍后再试"),
+    ORDER_CHILD_SAVE_FREQUENCY_ERROR(1322, "请误频繁点击"),
+    ORDER_CHILD_TRUCK_MODEL_ERROR(1323, "请选择合适的车型"),
+    ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR(1324, "请选择定向车辆"),
+    ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR1(1325, "请选择非定向车辆"),
+
+    ORDER_CHILD_LOAD_TIME_ERROR(1341, "非装车时间段"),
+    ORDER_CHILD_UNLOAD_TIME_ERROR(1342, "非卸车时间段"),
+    ORDER_CHILD_ARRIVE_SEND_ADDRESS_DISTANCE_ERROR(1343, "没有到达货源地"),
+    ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_DISTANCE_ERROR(1344, "没有到达目的地"),
+    ORDER_CHILD_LOAD_TIMEOUT(1345, "超过最晚到达货源地时间"),
+    ORDER_CHILD_LOAD_WEIGHT_ERROR(1346, "装货净重超过载重的1.5倍"),
+    ORDER_CHILD_UNLOAD_WEIGHT_ERROR(1347, "卸货净重超过载重的1.5倍"),
+
+    ORDER_CHILD_POUND_AUDIT(1361, "磅单审核中"),
+    ORDER_CHILD_POUND_REJECT(1362, "磅单审核驳回，请重新提交信息"),
+
+    ORDER_CHILD_DIRECT_REJECT_TRUCK_ERROR(1381, "非定向车辆无法取消"),
+    ORDER_CHILD_CANCEL_FORBID(1382, "运单无法取消"),
+    ORDER_CHILD_CANCEL_FORBID_COUNT(1383, "今日取消运单次数超过上限，暂时无法取消"),
+
+
 
     ;
     private final int code;

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildFreightInfoVO.java

@@ -47,14 +47,12 @@ public class OrderChildFreightInfoVO {
     private BigDecimal lossPrice;
 
     @ApiModelProperty(value = "总运费（元）", example = "1.23")
-    @MoneyOutConvert
     private BigDecimal totalFreight;
     public BigDecimal getTotalFreight() {
-        return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
+        return freightPrice.multiply(weight).setScale(2, RoundingMode.HALF_UP);
     }
 
     @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")
-    @MoneyOutConvert
     private BigDecimal lossFreight;
     public BigDecimal getLossFreight() {
         return (loadNet==null || unloadNet==null || unloadNet.compareTo(loadNet)>0)? BigDecimal.ZERO : lossPrice.multiply(loadNet.subtract(unloadNet)).setScale(2, RoundingMode.HALF_UP);

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -150,10 +150,9 @@ public class OrderChildVO {
     private Address receiveAddressInfo;
 
     @ApiModelProperty(value = "总运费（元）", example = "1.23")
-    @MoneyOutConvert
     private BigDecimal totalFreight;
     public BigDecimal getTotalFreight() {
-        return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
+        return freightPrice.multiply(weight).setScale(2, RoundingMode.HALF_UP);
     }
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/component/OrderGoodsIdGenerate.java

@@ -29,7 +29,7 @@ public class OrderGoodsIdGenerate {
             Long maxOrderGoodsId = null;
             String maxID = orderGoodsDao.getMaxOrderGoodsId(type);
             if (StringUtils.isNotBlank(maxID)) {
-                maxOrderGoodsId = Long.valueOf(maxID);
+                maxOrderGoodsId = Long.valueOf(maxID.substring(2));
             }
 
             if (maxOrderGoodsId == null) {

performance-web/src/main/java/com/clx/performance/constant/RedissonConstants.java

+package com.clx.performance.constant;
+
+public class RedissonConstants {
+
+    // 接单锁
+    public static final String ORDER_CHILD_SAVE_USER_TRUCK_LOCK = "clx-performance:orderChild:save:userTruck:";
+    public static final String ORDER_CHILD_SAVE_ORDER_GOODS_NO_LOCK = "clx-performance:orderChild:save:orderGoodsNo:";
+
+}

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -21,6 +21,7 @@ import java.util.List;
 public interface OrderChildService {
 
     SaveOrderChildVO saveOrderChild(OrderChildSaveParam param);
+    SaveOrderChildVO doSaveOrderChild(OrderChildSaveParam param);
 
     void updateReject(OrderChildRejectParam param);
 

performance-web/src/main/java/com/clx/performance/utils/spring/ApplicationContextUtils.java

+package com.clx.performance.utils.spring;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ApplicationContextUtils implements ApplicationContextAware {
+ 
+ 
+    private static ApplicationContext context;
+ 
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        context = applicationContext;
+    }
+ 
+    /**
+     * 根据Bean名称获取Bean对象
+     */
+    public static Object getBean(String name) {
+        return context.getBean(name);
+    }
+ 
+    /**
+     * 根据Bean的类型获取对应的Bean
+     */
+    public static <T> T getBean(Class<T> requiredType) {
+        return context.getBean(requiredType);
+    }
+ 
+    /**
+     * 根据Bean名称获取指定类型的Bean对象
+     */
+    public static <T> T getBean(String name, Class<T> requiredType) {
+        return context.getBean(name, requiredType);
+    }
+ 
+    /**
+     * 判断是否包含对应名称的Bean对象
+     */
+    public static boolean containsBean(String name) {
+        return context.containsBean(name);
+    }
+ 
+    /**
+     * 获取对应Bean名称的类型
+     */
+    public static Class<?> getType(String name) {
+        return context.getType(name);
+    }
+ 
+    /**
+     * 获取上下文对象，可进行各种Spring的上下文操作
+     */
+    public static ApplicationContext getContext() {
+        return context;
+    }
+
+}
\ No newline at end of file