Merge branch 'master_chw_publish' into dev-chw

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -121,8 +121,8 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
             throw  new BaseException("参数不能为空", ResultCode.FAILED_CODE);
         }
         VehiclePublish vehiclePublish = vehiclePublishBiz.selectById(publishId);
-        if (vehiclePublish == null ){
-            throw  new BaseException("需求不存在或无效", ResultCode.FAILED_CODE);
+        if (vehiclePublish == null || (vehiclePublish.getWaitConfirmNumber()+vehiclePublish.getConfirmNumber()) >= vehiclePublish.getNumber()){
+            throw  new BaseException("需求不存在或已满", ResultCode.FAILED_CODE);
         }
         publishReceiveDTO.setVehiclePublish(vehiclePublish);
         Integer type = vehiclePublish.getType() == null ? 0 : vehiclePublish.getType();
@@ -141,8 +141,12 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
                     }
                     Integer publishGoodsId = vehiclePublishReceive.getPublishGoodsId() == null ? 0 : vehiclePublishReceive.getPublishGoodsId();
                     VehiclePublishGoods publishGoods = publishGoodsBiz.selectById(publishGoodsId);
-                    if (publishGoods == null ){
-                        throw  new BaseException("子需求不存在", ResultCode.FAILED_CODE);
+                    if (publishGoods == null || publishGoods.getReceiveNumber() >= publishGoods.getNumber()){
+                        throw  new BaseException("子需求不存在或已满", ResultCode.FAILED_CODE);
+                    }
+                    VehiclePublishReceive publishReceive = getReceivByVehicleId(vehicleId);
+                    if (publishReceive != null ){
+                        throw  new BaseException(vehicle.getName()+"已接单",ResultCode.FAILED_CODE);
                     }
                     goodsAmount = publishGoods.getReceiveAmount();
                     payAmount = payAmount.add(goodsAmount);