From 4db7d08f3dfd6d2da3325e56e42fb9f7b55ddb9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 6 Jul 2022 10:34:14 +0800
Subject: [PATCH] task_order

---
 .../src/main/java/com/xm/core/ctrl/XmTaskOrderController.java | 4 ++++
 1 file changed, 4 insertions(+)

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 d117318d..f0bbda82 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
@@ -145,8 +145,12 @@ public class XmTaskOrderController {
 				order.setCrmSupFee(NumberUtil.getBigDecimal(itemVo.getExtInfo("crmSupFee").getValue(),BigDecimal.ZERO));
  				originFee=originFee.add(order.getCrmSupFee());
 			}
+			if(order.getOthFee()==null){
+				order.setOthFee(BigDecimal.ZERO);
+			}
 			order.setOriginFee(originFee);
 			order.setDiscount(100);
+			order.setFinalFee(originFee.add(order.getOthFee()));
 			xmTaskOrderService.insert(order);
 			m.put("data",order);
 		}catch (BizException e) {