|
|
@ -17,6 +17,7 @@ import cc.yunxi.utils.UserContext;
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@ -354,6 +355,10 @@ public class DeviceController {
|
|
|
|
if (null == device || StrUtil.isEmpty(device.getBeLongCompanyId())) {
|
|
|
|
if (null == device || StrUtil.isEmpty(device.getBeLongCompanyId())) {
|
|
|
|
throw new BizIllegalException("上传失败:根据设备编号,未查询到设备信息!!");
|
|
|
|
throw new BizIllegalException("上传失败:根据设备编号,未查询到设备信息!!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
RecycleDeliveryOrder exist = deliveryOrderService.getByDeviceOrderNo(orderVO.getDeviceOrderNo());
|
|
|
|
|
|
|
|
if (null != exist) {
|
|
|
|
|
|
|
|
return CommonResult.success(orderVO.getDeviceOrderNo(), "success,订单已上传!");
|
|
|
|
|
|
|
|
}
|
|
|
|
String companyId = device.getBeLongCompanyId();
|
|
|
|
String companyId = device.getBeLongCompanyId();
|
|
|
|
//查询配置
|
|
|
|
//查询配置
|
|
|
|
RecycleDeviceConfig config = configService.getByCompanyId(companyId);
|
|
|
|
RecycleDeviceConfig config = configService.getByCompanyId(companyId);
|
|
|
@ -361,6 +366,7 @@ public class DeviceController {
|
|
|
|
|
|
|
|
|
|
|
|
RecycleDeliveryOrder order = new RecycleDeliveryOrder();
|
|
|
|
RecycleDeliveryOrder order = new RecycleDeliveryOrder();
|
|
|
|
order.setDeviceCode(orderVO.getDeviceCode());
|
|
|
|
order.setDeviceCode(orderVO.getDeviceCode());
|
|
|
|
|
|
|
|
order.setOrderNo(CommonUtil.getIdNumber(BusinessCodeEnum.DELIVERY.getCode()));
|
|
|
|
order.setBucketCode(orderVO.getBucketCode());
|
|
|
|
order.setBucketCode(orderVO.getBucketCode());
|
|
|
|
order.setDeviceOrderNo(orderVO.getDeviceOrderNo());
|
|
|
|
order.setDeviceOrderNo(orderVO.getDeviceOrderNo());
|
|
|
|
order.setDoorNum(orderVO.getDoorNum());
|
|
|
|
order.setDoorNum(orderVO.getDoorNum());
|
|
|
@ -377,6 +383,7 @@ public class DeviceController {
|
|
|
|
order.setAdjustPrice(orderVO.getTotalPrice());
|
|
|
|
order.setAdjustPrice(orderVO.getTotalPrice());
|
|
|
|
order.setAdjustComm("自动审核");
|
|
|
|
order.setAdjustComm("自动审核");
|
|
|
|
} else {//手动审核
|
|
|
|
} else {//手动审核
|
|
|
|
|
|
|
|
order.setAdjustSet(Integer.valueOf(adjustSet));
|
|
|
|
order.setAdjustStatus(0);
|
|
|
|
order.setAdjustStatus(0);
|
|
|
|
order.setAdjustWeight(BigDecimal.ZERO);
|
|
|
|
order.setAdjustWeight(BigDecimal.ZERO);
|
|
|
|
order.setAdjustPrice(BigDecimal.ZERO);
|
|
|
|
order.setAdjustPrice(BigDecimal.ZERO);
|
|
|
@ -427,7 +434,11 @@ public class DeviceController {
|
|
|
|
if (null == device) {
|
|
|
|
if (null == device) {
|
|
|
|
throw new BizIllegalException("上传失败:根据设备编号,未查询到设备信息!!");
|
|
|
|
throw new BizIllegalException("上传失败:根据设备编号,未查询到设备信息!!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//判断是否重复上传
|
|
|
|
|
|
|
|
RecycleCleanOrder exist = cleanOrderService.getByDeviceOrderNo(orderVO.getDeviceOrderNo());
|
|
|
|
|
|
|
|
if (exist != null) {
|
|
|
|
|
|
|
|
return CommonResult.success(orderVO.getDeviceOrderNo(), "success,订单已上传!");
|
|
|
|
|
|
|
|
}
|
|
|
|
//查询配置
|
|
|
|
//查询配置
|
|
|
|
RecycleDeviceConfig config = configService.getByCompanyId(user.getCompanyId());
|
|
|
|
RecycleDeviceConfig config = configService.getByCompanyId(user.getCompanyId());
|
|
|
|
String adjustSet = config.getCleanAdjustSet();//审核配置
|
|
|
|
String adjustSet = config.getCleanAdjustSet();//审核配置
|
|
|
@ -448,6 +459,7 @@ public class DeviceController {
|
|
|
|
String result = uploadImages(images);
|
|
|
|
String result = uploadImages(images);
|
|
|
|
order.setPhoto(result);
|
|
|
|
order.setPhoto(result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
order.setAdjustSet(Integer.valueOf(adjustSet));
|
|
|
|
//审核
|
|
|
|
//审核
|
|
|
|
if ("1".equals(adjustSet)) {
|
|
|
|
if ("1".equals(adjustSet)) {
|
|
|
|
order.setAdjustStatus(1);
|
|
|
|
order.setAdjustStatus(1);
|
|
|
|