Commit 50d4be8a authored by hezhen's avatar hezhen

123

parent 118361d8
...@@ -75,6 +75,11 @@ public class VehiclePublishReceive implements Serializable { ...@@ -75,6 +75,11 @@ public class VehiclePublishReceive implements Serializable {
private Integer publishGoodsId; private Integer publishGoodsId;
@Column(name = "receive_user_id")
@ApiModelProperty(value = "接单人id")
private Integer receiveUserId;
@Column(name = "receive_company_id") @Column(name = "receive_company_id")
@ApiModelProperty(value = "接单公司id") @ApiModelProperty(value = "接单公司id")
private Integer receiveCompanyId; private Integer receiveCompanyId;
......
...@@ -37,7 +37,7 @@ public class VehiclePublishReceiveDTO{ ...@@ -37,7 +37,7 @@ public class VehiclePublishReceiveDTO{
@ApiModelProperty("接单用户Id") @ApiModelProperty("接单用户Id")
private Integer userId; private Long userId;
List<Integer> ids; List<Integer> ids;
......
...@@ -108,6 +108,7 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe ...@@ -108,6 +108,7 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
vehiclePublishReceive.setBrandId(brandId); vehiclePublishReceive.setBrandId(brandId);
vehiclePublishReceive.setCategoryId(categoryId); vehiclePublishReceive.setCategoryId(categoryId);
vehiclePublishReceive.setExtensionList(extensionList); vehiclePublishReceive.setExtensionList(extensionList);
vehiclePublishReceive.setReceiveUserId(publishReceiveDTO.getUserId());
insertSelective(vehiclePublishReceive); insertSelective(vehiclePublishReceive);
id = vehiclePublishReceive.getId(); id = vehiclePublishReceive.getId();
}else { }else {
......
...@@ -26,13 +26,14 @@ public class AppVehiclePublishReceiveController extends BaseController<VehiclePu ...@@ -26,13 +26,14 @@ public class AppVehiclePublishReceiveController extends BaseController<VehiclePu
@PostMapping("meet") @PostMapping("meet")
@ApiModelProperty("接单") @ApiModelProperty("接单")
public ObjectRestResponse meet(@RequestBody VehiclePublishReceiveDTO publishReceiveDTO) { public ObjectRestResponse meet(@RequestBody VehiclePublishReceiveDTO publishReceiveDTO) throws Exception {
if (publishReceiveDTO.getCompanyId() == null || publishReceiveDTO.getCompanyId() == 0){ if (publishReceiveDTO.getCompanyId() == null || publishReceiveDTO.getCompanyId() == 0){
List<Integer> companyIds = getBusinessUserCompanyIds(); List<Integer> companyIds = getBusinessUserCompanyIds();
if (companyIds != null && companyIds.size() > 0){ if (companyIds != null && companyIds.size() > 0){
publishReceiveDTO.setCompanyId(companyIds.get(0)); publishReceiveDTO.setCompanyId(companyIds.get(0));
} }
} }
publishReceiveDTO.setUserId(Long.parseLong(getUserId()));
return ObjectRestResponse.succ(baseBiz.receive(publishReceiveDTO)); return ObjectRestResponse.succ(baseBiz.receive(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