|
|
@@ -87,15 +87,15 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
|
|
|
public String unLoadingAdd(CarrierInfo carrierInfo) {
|
|
|
//根据id查询承运信息
|
|
|
CarrierInfo carrierInfo1 = this.selectById(carrierInfo.getId());
|
|
|
- if(carrierInfo1 != null){
|
|
|
+ if(carrierInfo != null){
|
|
|
//判断暂存提交（前端传参1暂存3提交）
|
|
|
- if ("1".equals(carrierInfo1.getStatusFlag())) {
|
|
|
- this.updateById(carrierInfo1);
|
|
|
+ if ("1".equals(carrierInfo.getStatusFlag())) {
|
|
|
+ this.updateById(carrierInfo);
|
|
|
}
|
|
|
else {
|
|
|
- carrierInfo1.setStatus(StatusEnum.SUBMITTED.getName());
|
|
|
- carrierInfo1.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
|
|
|
- this.updateById(carrierInfo1);
|
|
|
+ carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
|
|
|
+ carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
|
|
|
+ this.updateById(carrierInfo);
|
|
|
//司机确认卸车后，订单状态改为待货主确认卸车
|
|
|
OrderInfo orderInfo = orderInfoService.selectOne(new EntityWrapper<OrderInfo>()
|
|
|
.eq("id",carrierInfo1.getOrderId())
|
