From 6063e73c25c76b172299115ad44b5e73c90de9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 20 Dec 2022 18:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BA=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=85=B3=E4=BA=8E=E6=89=98=E7=A6=8F=E8=B5=8F=E9=87=91?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD,=E6=94=AF=E6=8C=81=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E8=B5=8F=E9=87=91=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/ctrl/XmTaskOrderController.java   | 11 +++++++++
 .../xm/core/service/XmTaskOrderService.java   |  3 +--
 .../com/xm/core/service/XmTaskService.java    |  4 ++++
 .../mapper/xm/core/dao/XmTaskMapper.xml       | 23 +++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

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 6ffb256f..c90a331c 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
@@ -164,6 +164,17 @@ public class XmTaskOrderController {
 					if(xmTaskDb.getQuoteFinalAt()==null || xmTaskDb.getQuoteFinalAt().compareTo(BigDecimal.ZERO)<=0){
 						return ResponseHelper.failed("quoteFinalAt-0","保证金金额计算错误，原因为中标人报价金额为空。");
 					}
+				}else if("2".equals(xmTaskDb.getEstate()) ){
+					if(xmTaskDb.getQuoteFinalAt()==null || xmTaskDb.getQuoteFinalAt().compareTo(BigDecimal.ZERO)<=0){
+						return ResponseHelper.failed("quoteFinalAt-0","保证金金额计算错误，原因为中标人报价金额为空。");
+					}
+					if(xmTaskDb.getEfunds().compareTo(xmTaskDb.getQuoteFinalAt())>=0){
+						return ResponseHelper.failed("estate-not-2-3","保证金已支付过，不能重复缴纳");
+					}else{
+						order.setEfunds(xmTaskDb.getQuoteFinalAt().subtract(xmTaskDb.getEfunds()));
+						order.setEstate("1");
+						originFee=originFee.add(order.getEfunds());
+					}
 				}else{
 					return ResponseHelper.failed("estate-not-2-3","保证金已支付过，不能重复缴纳");
 				}
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java
index 748d3cf0..c8a4d9fd 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java
@@ -110,9 +110,8 @@ public class XmTaskOrderService extends BaseService {
 			xmTaskUpdate.setBidStep("5");
 			xmTaskUpdate.setEfunds(payAt);
 		}
-		this.xmTaskService.updateSomeFieldByPk(xmTaskUpdate);
 		this.updateSomeFieldByPk(order);
-
+		this.xmTaskService.updateSomeFieldByPkAfterPaySuccess(xmTaskUpdate);
 		if("1".equals(taskOrderDb.getBizType()) && "5".equals(xmTaskUpdate.getBidStep())){
 			XmTask xmTaskDb=this.xmTaskService.selectOneById(taskOrderDb.getTaskId());
 			msgService.pushMsg(taskOrderDb.getObranchId(),taskOrderDb.getOuserid(),xmTaskDb.getExecutorUserid(),"2",xmTaskDb.getProjectId(),xmTaskDb.getId(),"雇主成功托管佣金【"+taskOrderDb.getEfunds()+"】，实际到账金额【"+payAt+"】，当前任务进入用户工作阶段，请尽快开展工作。");
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
index 0a1f59cb..5acb709b 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
@@ -842,5 +842,9 @@ public class XmTaskService extends BaseService {
     public void upBrowseTimes(String id,Integer nums) {
 		super.update("upBrowseTimes",map("id",id,"nums",nums));
     }
+
+	public void updateSomeFieldByPkAfterPaySuccess(XmTask xmTaskUpdate) {
+		super.update("updateSomeFieldByPkAfterPaySuccess",xmTaskUpdate);
+	}
 }
 
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
index 5d6d19eb..69527126 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
@@ -395,6 +395,29 @@
 		where id = #{id}
 	</update>
 
+	<update id="updateSomeFieldByPkAfterPaySuccess" parameterType="com.xm.core.entity.XmTask">
+		update  xm_task
+		<set>
+			<if test="hot != null and hot != ''"> hot = #{hot},     </if>
+			<if test="top != null and top != ''"> top = #{top},     </if>
+			<if test="urgent != null and urgent != ''"> urgent = #{urgent},     </if>
+			<if test="crmSup != null and crmSup != ''"> crm_sup = #{crmSup},     </if>
+			<if test="bidStep != null and bidStep != ''"> bid_step = #{bidStep},     </if>
+			<if test="interestLvls != null and interestLvls != ''"> interest_lvls = #{interestLvls},     </if>
+			<if test="estate != null and estate != ''"> estate = #{estate},     </if>
+			<if test="efunds != null and efunds != ''"> efunds = ( select sum(ifnull(efunds,0)) as efunds from xm_task_order o where o.task_id=#{id} and o.estate='2' ),     </if>
+			<if test="etoPlatTime != null"> eto_plat_time = #{etoPlatTime},     </if>
+			<if test="etoDevTime != null"> eto_dev_time = #{etoDevTime},     </if>
+			<if test="ebackTime != null"> eback_time = #{ebackTime},     </if>
+			<if test="topStime != null"> top_stime = #{topStime},     </if>
+			<if test="topEtime != null"> top_etime = #{topEtime},     </if>
+			<if test="hotStime != null"> hot_stime = #{hotStime},     </if>
+			<if test="hotEtime != null"> hot_etime = #{hotEtime},     </if>
+			<if test="urgentStime != null"> urgent_stime = #{urgentStime},     </if>
+			<if test="urgentEtime != null"> urgent_etime = #{urgentEtime},     </if>
+		</set>
+		where id=#{id}
+	</update>
 	<!--结束 自定义sql函数区域-->