1.修改皮阿诺 数据推送返回数据

2.增加数据皮阿诺数据推送接口订单自编号重复校验

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;
 	}
 }

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");
 	}