From 422cb68afe1975a29779f8fdcbc12f6160a65c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 9 Jul 2022 16:24:10 +0800
Subject: [PATCH] bug

---
 .../main/java/com/xm/core/ctrl/XmTaskOrderController.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java
index e621a006..410f0237 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java
@@ -156,9 +156,14 @@ public class XmTaskOrderController {
 			order.setObranchId(user.getBranchId());
 			BigDecimal originFee=BigDecimal.ZERO;
 			if("1".equals(xmTaskOrder.getBizType())){
-				if("1".equals(xmTaskDb.getEstate())){
+				if("1".equals(xmTaskDb.getEstate())||"0".equals(xmTaskDb.getEstate())||"4".equals(xmTaskDb.getEstate())){
 					order.setEfunds(xmTaskDb.getQuoteFinalAt());
 					originFee=originFee.add(order.getEfunds());
+					if(xmTaskDb.getQuoteFinalAt()==null || xmTaskDb.getQuoteFinalAt().compareTo(BigDecimal.ZERO)<=0){
+						return ResponseHelper.failed("quoteFinalAt-0","保证金金额计算错误，原因为中标人报价金额为空。");
+					}
+				}else{
+					return ResponseHelper.failed("estate-not-2-3","保证金已支付过，不能重复缴纳");
 				}
 			}else if("2".equals(xmTaskOrder.getBizType())){
 				ItemVo itemVo=itemService.getDict("sysParam","crowd_task_market");