Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 2 years ago
parent
commit
6b0f9909c5

+ 3 - 3
src/main/java/com/goafanti/common/dao/OrderExamineMapper.java

@@ -3,10 +3,10 @@ package com.goafanti.common.dao;
 import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.model.OrderExamine;
 import com.goafanti.common.model.OrderExamineExample;
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface OrderExamineMapper {
     /**
      * This method was generated by MyBatis Generator.
@@ -123,5 +123,5 @@ public interface OrderExamineMapper {
     void deleteByAidAndStatus(@Param("orderNo")String orderNo,@Param("aid")String aid,  @Param("type")Integer type);
 
 
-    void updateBack(@Param("aid")String aid, @Param("taskReceiverId")String taskReceiverId);
+    void updateBack(@Param("aid")String aid, @Param("taskReceiverId")String taskReceiverId,@Param("orderNo") String orderNo);
 }

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrderExamineMapper.xml

@@ -373,6 +373,6 @@
   <update id="updateBack">
     update order_examine
     set aid= #{taskReceiverId} ,`type` =1
-    where aid= #{aid}  and status =0
+    where aid= #{aid}  and status =0 and order_no=#{orderNo}
   </update>
 </mapper>

+ 26 - 29
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1,27 +1,33 @@
 package com.goafanti.order.service.impl;
 
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import javax.mail.MessagingException;
-
 import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.service.DepartmentService;
-import com.goafanti.common.bo.*;
 import com.goafanti.common.bo.Error;
+import com.goafanti.common.bo.*;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.*;
+import com.goafanti.common.enums.ChannelStatus;
+import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.NoticeTypes;
+import com.goafanti.common.enums.OrderLogProcess;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.*;
-import com.goafanti.common.utils.*;
+import com.goafanti.common.utils.AsyncUtils;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.SendEmailUtil;
 import com.goafanti.common.utils.excel.NewExcelUtil;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.controller.InputTaskStopLog;
 import com.goafanti.order.enums.*;
-import com.goafanti.order.service.OrderChangeService;
-import com.goafanti.organization.bo.ProjectTypePuls;
+import com.goafanti.order.service.OrderNewService;
+import com.goafanti.order.service.OrderProjectService;
+import com.goafanti.organization.bo.OutPaymentNode;
+import com.goafanti.techproject.enums.TaskState;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -32,20 +38,12 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.enums.ChannelStatus;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.OrderLogProcess;
-import com.goafanti.common.error.BusinessException;
-import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.order.bo.InputProjectCheck;
-import com.goafanti.order.service.OrderNewService;
-import com.goafanti.order.service.OrderProjectService;
-import com.goafanti.organization.bo.OutPaymentNode;
-import com.goafanti.techproject.enums.TaskState;
+import javax.mail.MessagingException;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Service
 public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> implements OrderProjectService {
@@ -123,8 +121,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	private TaskStopMapper taskStopMapper;
 	@Autowired
 	private TaskStopLogMapper taskStopLogMapper;
-	@Autowired
-	private OrderChangeService orderChangeService;
+
 
 
 
@@ -201,7 +198,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			o.setStatus(0);//正常
 			orderExamineMapper.insertSelective(o);
 		}else if (type==4){
-			orderExamineMapper.updateBack(aid,taskReceiverId);
+			orderExamineMapper.updateBack(aid,taskReceiverId,orderNo);
 		}
 		newOrderChangeMapper.updateTaskExamineName(aid,taskReceiverId,OrderChangeProcess.JSY.getCode());
 		newOrderChangeMapper.updateTaskExamineName(aid,taskReceiverId,OrderChangeProcess.JSJL.getCode());