From cd2ea798de94b94085ab82f9d69fcd8504572058 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 11:51:57 +0800
Subject: [PATCH] task_order

---
 .../com/xm/core/ctrl/XmTaskOrderController.java | 17 ++++++++++++++---
 .../com/xm/core/service/XmTaskOrderService.java | 12 ++++++++++++
 .../java/com/xm/core/vo/AddXmTaskOrderVo.java   |  5 +++++
 3 files changed, 31 insertions(+), 3 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 f0bbda82..c345aa9e 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
@@ -84,8 +84,16 @@ public class XmTaskOrderController {
 		m.put("tips", tips);
 		return m;
 	}
-	
- 
+
+	@ApiOperation( value = "计算订单金额",notes=" ")
+	@ApiResponses({
+			@ApiResponse(code = 200,response= AddXmTaskOrderVo.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
+	})
+	@RequestMapping(value="/calcOrder",method= RequestMethod.GET)
+	public Map<String,Object> calcOrder(  AddXmTaskOrderVo xmTaskOrder) {
+		xmTaskOrder.setCalc(true);
+		return  addXmTaskOrder(xmTaskOrder);
+	}
 
 	@ApiOperation( value = "新增一条任务相关费用订单表信息",notes=" ")
 	@ApiResponses({
@@ -151,7 +159,10 @@ public class XmTaskOrderController {
 			order.setOriginFee(originFee);
 			order.setDiscount(100);
 			order.setFinalFee(originFee.add(order.getOthFee()));
-			xmTaskOrderService.insert(order);
+			order.setPayType(xmTaskOrder.getPayType());
+			if(!xmTaskOrder.isCalc()){
+				xmTaskOrderService.insert(order);
+			}
 			m.put("data",order);
 		}catch (BizException e) { 
 			tips=e.getTips();
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 fb3779d7..fe27f60b 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
@@ -2,10 +2,13 @@ package com.xm.core.service;
 
 import com.mdp.core.err.BizException;
 import com.mdp.core.service.BaseService;
+import com.xm.core.entity.XmTask;
 import com.xm.core.entity.XmTaskOrder;
 import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -22,6 +25,9 @@ import java.util.Date;
 public class XmTaskOrderService extends BaseService {
 	static Logger logger =LoggerFactory.getLogger(XmTaskOrderService.class);
 
+	@Autowired
+	XmTaskService xmTaskService;
+
 
 	@Transactional
 	public void orderPaySuccess(String orderId, String payId, String prepayId, String tranId, BigDecimal payAt, String remarks) {
@@ -31,6 +37,8 @@ public class XmTaskOrderService extends BaseService {
 			throw new BizException("payId-0", "参数不正确，payId不能为空");
 		}
 		XmTaskOrder taskOrderDb = this.selectOneById(orderId);
+		XmTask xmTaskUpdate=new XmTask();
+		xmTaskUpdate.setId(taskOrderDb.getTaskId());
 		if (!payId.equals(taskOrderDb.getPayId())) {
 			throw new BizException("payId-err", "参数不正确，payId与实际不匹配");
 		}
@@ -72,6 +80,10 @@ public class XmTaskOrderService extends BaseService {
 		if("1".equals(taskOrderDb.getCrmSup())){
 			order.setCrmSup("2");
 		}
+
+		BeanUtils.copyProperties(order,xmTaskUpdate);
+		xmTaskUpdate.setId(taskOrderDb.getTaskId());
+		this.xmTaskService.updateSomeFieldByPk(xmTaskUpdate);
 		this.updateSomeFieldByPk(order);
 	}
 
diff --git a/xm-core/src/main/java/com/xm/core/vo/AddXmTaskOrderVo.java b/xm-core/src/main/java/com/xm/core/vo/AddXmTaskOrderVo.java
index b6e6a12a..11fe9d9f 100644
--- a/xm-core/src/main/java/com/xm/core/vo/AddXmTaskOrderVo.java
+++ b/xm-core/src/main/java/com/xm/core/vo/AddXmTaskOrderVo.java
@@ -21,6 +21,11 @@ public class AddXmTaskOrderVo implements java.io.Serializable {
 	@ApiModelProperty(notes="任务编号",allowEmptyValue=true,example="",allowableValues="")
 	String taskId;
 
+	@ApiModelProperty(notes="付款方式1微信2支付宝",allowEmptyValue=true,example="",allowableValues="")
+	String payType;
+
+	boolean calc=false;
+
     /**
      * 任务相关费用订单表
      **/