投递单 结算 -fix

nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java

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

nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleCleanOrder.java

@@ -68,6 +68,9 @@ public class RecycleCleanOrder {
     @TableField(value = "BAG_NO")
     @ApiModelProperty("垃圾袋编号")
     private String bagNo;
+    @TableField(value = "ADJUST_SET")
+    @ApiModelProperty("审核设置")
+    private Integer adjustSet;
     @TableField(value = "ADJUST_STATUS")
     @ApiModelProperty("审核状态 0 待审核 1 通过 3 调整通过 4 拒绝")
     private Integer adjustStatus;

nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleDeliveryOrder.java

@@ -1,9 +1,6 @@
 package cc.yunxi.domain.po;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -21,8 +18,8 @@ import java.util.Date;
 @Data
 @TableName("nx_recycle_delivery_order")
 public class RecycleDeliveryOrder {
-    @TableId(value = "ID")
-    @ApiModelProperty("主键")
+    @ApiModelProperty("主键id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
     @TableField(value = "ORDER_NO")
     @ApiModelProperty("订单号")

nxhs-service/src/main/java/cc/yunxi/service/IRecycleCleanOrderService.java

@@ -22,4 +22,6 @@ public interface IRecycleCleanOrderService extends IService<RecycleCleanOrder> {
      * @return vo
      */
     RecycleCleanOrderVO detailById(String id);
+
+    RecycleCleanOrder getByDeviceOrderNo(String deviceOrderNo);
 }

nxhs-service/src/main/java/cc/yunxi/service/IRecycleDeliveryOrderService.java

@@ -26,4 +26,6 @@ public interface IRecycleDeliveryOrderService extends IService<RecycleDeliveryOr
     RecycleDeliveryOrderVO detailById(String id);
 
     void settlement(RecycleDeliveryOrder order);
+
+    RecycleDeliveryOrder getByDeviceOrderNo(String deviceOrderNo);
 }

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleCleanOrderServiceImpl.java

@@ -34,4 +34,13 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
         RecycleCleanOrder order = this.getById(id);
         return BeanUtil.copyProperties(order, RecycleCleanOrderVO.class);
     }
+
+    @Override
+    public RecycleCleanOrder getByDeviceOrderNo(String deviceOrderNo) {
+        log.info("根据设备订单号查询订单，deviceOrderNo：{}", deviceOrderNo);
+        LambdaQueryWrapper<RecycleCleanOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RecycleCleanOrder::getDeviceOrderNo, deviceOrderNo)
+                .last("limit 1");
+        return this.getOne(wrapper);
+    }
 }

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java

@@ -51,4 +51,12 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
         String companyId = order.getCompanyId();
         clientService.addBalance(client, amount, orderNo, companyId);
     }
+
+    @Override
+    public RecycleDeliveryOrder getByDeviceOrderNo(String deviceOrderNo) {
+        LambdaQueryWrapper<RecycleDeliveryOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RecycleDeliveryOrder::getDeviceOrderNo, deviceOrderNo)
+                .last("limit 1");
+        return this.getOne(wrapper);
+    }
 }