From 314dd86db7d01ea1c614fbab2fb8db98d96c1f08 Mon Sep 17 00:00:00 2001
From: guochaojie <guochaojie_1995@163.com>
Date: Fri, 28 Jun 2024 15:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E8=BF=90=E5=8D=95=20=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/yunxi/controller/DeviceController.java    | 11 +++++++++--
 .../java/cc/yunxi/domain/vo/device/CleanOrderVO.java  |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
index 6e68bc9..d6151fc 100644
--- a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
+++ b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
@@ -440,7 +440,7 @@ public class DeviceController {
             return CommonResult.success(orderVO.getDeviceOrderNo(), "success,订单已上传！");
         }
         //查询配置
-        RecycleDeviceConfig config = configService.getByCompanyId(user.getCompanyId());
+        RecycleDeviceConfig config = configService.getByCompanyId(device.getBeLongCompanyId());
         String adjustSet = config.getCleanAdjustSet();//审核配置
         //查询桶
 
@@ -449,9 +449,15 @@ public class DeviceController {
         order.setDeviceCode(orderVO.getDeviceCode());
         order.setBucketCode(orderVO.getBucketCode());
         order.setDoorNum(orderVO.getDoorNum());
+        order.setDeviceOrderNo(orderVO.getDeviceOrderNo());
         order.setProductCode(orderVO.getProductCode());
         order.setProductSubCode(orderVO.getProductSubCode());
         order.setPrice(orderVO.getPrice());
+        order.setWeight(orderVO.getTotalWeight());
+        order.setTotalPrice(orderVO.getTotalPrice());
+        order.setCleanUserId(orderVO.getUserId());
+        order.setPhone(orderVO.getPhone());
+        order.setBagNo(orderVO.getBagNo());
         List<Snap> images = orderVO.getImages();
         if (images == null || images.size() == 0) {
             throw new BizIllegalException("上传失败：未上传抓拍图片！！");
@@ -472,6 +478,7 @@ public class DeviceController {
             order.setAdjustComm("");
             order.setAdjustWeight(BigDecimal.ZERO);
             order.setAdjustPrice(BigDecimal.ZERO);
+            order.setEntryStatus(0);
         }
         if (StrUtil.isNotEmpty(orderVO.getStartTime())) {
             order.setStartTime(DateUtil.parse(orderVO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
@@ -486,7 +493,7 @@ public class DeviceController {
         order.setCreatorUserId(orderVO.getUserId());
         order.setCreatorTime(new Date());
         order.setPhone(orderVO.getPhone());
-        order.setCompanyId(user.getCompanyId());
+        order.setCompanyId(device.getBeLongCompanyId());
         cleanOrderService.save(order);
         return CommonResult.success(orderVO.getDeviceOrderNo());
     }
diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/CleanOrderVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/CleanOrderVO.java
index 4c60ae9..b09a743 100644
--- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/CleanOrderVO.java
+++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/device/CleanOrderVO.java
@@ -33,7 +33,7 @@ public class CleanOrderVO {
     private String startTime;
     @ApiModelProperty("完成时间")
     private String finishTime;
-    @ApiModelProperty("投递员id")
+    @ApiModelProperty("清运员id")
     private String userId;
     @ApiModelProperty("垃圾袋编号")
     private String bagNo;