From 8ae06e25b2c1b5f1ea6d45e2b21046cfbe1ab4d3 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 24 Jun 2023 12:43:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=9A=AE=E9=98=BF=E8=AF=BA?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=202.=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=AE=E9=98=BF=E8=AF=BA=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AE=A2=E5=8D=95=E8=87=AA=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/logpm/factory/snm/bean/Resp.java | 12 +++++++++++-
 .../snm/controller/PanFactoryDataController.java   | 14 +++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/bean/Resp.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/bean/Resp.java
index 8ff501472..3e7383b06 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/bean/Resp.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/bean/Resp.java
@@ -7,13 +7,23 @@ import org.springblade.core.tool.api.R;
 public class Resp extends R {
 
 	private String orderNo;
+	private String deliveryNumber;
 
-	public static Resp successOrderNo(String orderNo,String msg){
+	public static Resp successOrderNo(String orderNo,String deliveryNumber,String msg){
 		Resp resp = new Resp();
 		resp.setMsg(msg);
 		resp.setCode(1);
 		resp.setSuccess(true);
 		resp.setOrderNo(orderNo);
+		resp.setDeliveryNumber(deliveryNumber);
+		return resp;
+	}
+
+	public static Resp fail(int code,String message){
+		Resp resp = new Resp();
+		resp.setMsg(message);
+		resp.setCode(code);
+		resp.setSuccess(false);
 		return resp;
 	}
 }
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/PanFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/PanFactoryDataController.java
index 92ee6f8d7..3c134eaaf 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/PanFactoryDataController.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/controller/PanFactoryDataController.java
@@ -18,6 +18,7 @@ package com.logpm.factory.snm.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.factory.snm.bean.Resp;
 import com.logpm.factory.snm.dto.*;
@@ -39,6 +40,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 皮阿诺数据 控制器
@@ -106,6 +108,16 @@ public class PanFactoryDataController extends BladeController {
 		panOrderStatusLog.setType(3);
 		panOrderStatusLogService.save(panOrderStatusLog);
 
+		//判断数据是否已存入
+		String orderNo = factoryOrderDTO.getOrderNo();
+		QueryWrapper<PanFactoryOrder> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("order_no",orderNo);
+		PanFactoryOrder one = factoryOrderService.getOne(queryWrapper);
+		if(!Objects.isNull(one)){
+			log.warn("############data: 订单数据已存在 orderNo={}",orderNo);
+			return Resp.fail(400,"订单数据已存在");
+		}
+
 		PanFactoryOrder factoryOrder = new PanFactoryOrder();
 		BeanUtil.copyProperties(factoryOrderDTO,factoryOrder);
 		factoryOrder.setCorpid(corpId);
@@ -141,7 +153,7 @@ public class PanFactoryDataController extends BladeController {
 		//开启异步线程处理数据
 		syncDataService.handlerPanDataToHt();
 
-		return Resp.successOrderNo(factoryOrder.getOrderNo(),"SUCCESS");
+		return Resp.successOrderNo(factoryOrder.getOrderNo(),factoryOrder.getDeliveryNumber(),"SUCCESS");
 	}