提交 9a258556 authored 作者: huningning's avatar huningning

增加司机接单钱包限制

上级 ba173e06
...@@ -288,7 +288,7 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -288,7 +288,7 @@ public class OrderChildServiceImpl implements OrderChildService {
} }
// 库存验证 // 库存验证
if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal("33")) < 0) { if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal("35")) < 0) {
throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK); throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
} }
// if (orderGoods.getResidueTransportWeight().compareTo(truckLoad) < 0) {throw new ServiceSystemException // if (orderGoods.getResidueTransportWeight().compareTo(truckLoad) < 0) {throw new ServiceSystemException
...@@ -340,10 +340,10 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -340,10 +340,10 @@ public class OrderChildServiceImpl implements OrderChildService {
Integer overWeight = orderInfo.getOverWeight(); Integer overWeight = orderInfo.getOverWeight();
if(Objects.equals(overWeight,OrderGoodsOverWeightEnum.NO.getCode())){ if(Objects.equals(overWeight,OrderGoodsOverWeightEnum.NO.getCode())){
if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(33)) < 0) { if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(35)) < 0) {
orderChild.setWeight(orderGoods.getResidueTransportWeight()); orderChild.setWeight(orderGoods.getResidueTransportWeight());
} else { } else {
orderChild.setWeight(new BigDecimal(33)); orderChild.setWeight(new BigDecimal(35));
} }
} else{ } else{
if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(50)) < 0) { if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(50)) < 0) {
......
...@@ -100,7 +100,7 @@ public class OrderGoodsSqlProvider { ...@@ -100,7 +100,7 @@ public class OrderGoodsSqlProvider {
WHERE("a.pending_order_way = " + PendingOrderWayStatusEnum.Status.GK.getCode()); WHERE("a.pending_order_way = " + PendingOrderWayStatusEnum.Status.GK.getCode());
WHERE("a.last_arrive_send_time >= now()"); WHERE("a.last_arrive_send_time >= now()");
WHERE("(a.order_goods_status = "+OrderGoodsStatusEnum.Status.PAYING.getCode()+" or a.order_goods_status = "+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")"); WHERE("(a.order_goods_status = "+OrderGoodsStatusEnum.Status.PAYING.getCode()+" or a.order_goods_status = "+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")");
WHERE("a.residue_transport_weight >=33"); WHERE("a.residue_transport_weight >=35");
ORDER_BY("a.pending_order_time desc"); ORDER_BY("a.pending_order_time desc");
}}.toString(); }}.toString();
return sql; return sql;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论