Commit acbade04 authored by hezhen's avatar hezhen

123

parent 9a207876
...@@ -7,6 +7,7 @@ import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishReceiveVo; ...@@ -7,6 +7,7 @@ import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishReceiveVo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
...@@ -68,6 +69,12 @@ public class VehiclePublishReceiveDTO{ ...@@ -68,6 +69,12 @@ public class VehiclePublishReceiveDTO{
private String orderNo; private String orderNo;
private BigDecimal goodsAmount;
private BigDecimal payAmount;
private Long nowTime; private Long nowTime;
......
...@@ -125,6 +125,8 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe ...@@ -125,6 +125,8 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
Integer type = vehiclePublish.getType() == null ? 0 : vehiclePublish.getType(); Integer type = vehiclePublish.getType() == null ? 0 : vehiclePublish.getType();
setVehiclePublishReceive(publishReceiveDTO,receiveIdStr); setVehiclePublishReceive(publishReceiveDTO,receiveIdStr);
List<VehiclePublishReceiveVo> receives = publishReceiveDTO.getReceiveVos(); List<VehiclePublishReceiveVo> receives = publishReceiveDTO.getReceiveVos();
BigDecimal goodsAmount = BigDecimal.ZERO;
BigDecimal payAmount = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(receives)){ if (CollectionUtils.isNotEmpty(receives)){
for (VehiclePublishReceiveVo vehiclePublishReceive : receives){ for (VehiclePublishReceiveVo vehiclePublishReceive : receives){
Integer id = vehiclePublishReceive.getId() == null ? 0 : vehiclePublishReceive.getId(); Integer id = vehiclePublishReceive.getId() == null ? 0 : vehiclePublishReceive.getId();
...@@ -139,6 +141,8 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe ...@@ -139,6 +141,8 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
if (publishGoods == null ){ if (publishGoods == null ){
throw new BaseException("子需求不存在", ResultCode.FAILED_CODE); throw new BaseException("子需求不存在", ResultCode.FAILED_CODE);
} }
goodsAmount = publishGoods.getReceiveAmount();
payAmount = payAmount.add(goodsAmount);
String cover = publishGoods.getCover(); String cover = publishGoods.getCover();
Integer brandId = publishGoods.getBrandId(); Integer brandId = publishGoods.getBrandId();
Integer categoryId = publishGoods.getCategoryId(); Integer categoryId = publishGoods.getCategoryId();
...@@ -174,6 +178,8 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe ...@@ -174,6 +178,8 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
vehiclePublishReceive.setExtensionVOS(vehicleExtensionBiz.getTreeByApply(Arrays.asList(vehiclePublishReceive.getExtensionList().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList()))); vehiclePublishReceive.setExtensionVOS(vehicleExtensionBiz.getTreeByApply(Arrays.asList(vehiclePublishReceive.getExtensionList().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList())));
} }
} }
publishReceiveDTO.setGoodsAmount(goodsAmount);
publishReceiveDTO.setPayAmount(payAmount);
return publishReceiveDTO; return publishReceiveDTO;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment