Browse Source

新催款开发

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
1b8283b095

+ 2 - 0
src/main/java/com/goafanti/common/dao/NewOrderDunMapper.java

@@ -80,4 +80,6 @@ public interface NewOrderDunMapper {
 
 	List<OutNewOrderDunBo> selectByTid(String id);
 
+	void deleteByTid(Integer tid);
+
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -136,6 +136,12 @@
     delete from new_order_dun
     where id = #{id,jdbcType=INTEGER}
   </delete>
+  <delete id="deleteByTid" parameterType="java.lang.Integer">
+    
+    delete from new_order_dun
+    where tid = #{tid,jdbcType=INTEGER}
+  </delete>
+  
   <delete id="deleteByExample" parameterType="com.goafanti.common.model.NewOrderDunExample">
     <!--
       WARNING - @mbg.generated

+ 0 - 1
src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java

@@ -1,7 +1,6 @@
 package com.goafanti.order.bo;
 
 import java.util.Calendar;
-import java.util.Date;
 
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.NewOrderDun;

+ 10 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -13,9 +13,7 @@ import java.util.UUID;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -27,6 +25,7 @@ import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.NewOrderChangeMapper;
+import com.goafanti.common.dao.NewOrderDunMapper;
 import com.goafanti.common.dao.OrderChangeLogMapper;
 import com.goafanti.common.dao.OrderExamineMapper;
 import com.goafanti.common.dao.OrderRefundInvoiceMapper;
@@ -57,6 +56,7 @@ import com.goafanti.order.bo.InvoiceBo;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
+import com.goafanti.order.bo.OutNewOrderDunBo;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.enums.OrderChangeType;
@@ -92,6 +92,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private OrderService	orderService;
 	@Autowired
+	private NewOrderDunMapper	newOrderDunMapper;
+	@Autowired
 	private JDBCIdGenerator	idGenerator;
 	@Autowired
 	private AdminMapper	adminMapper;
@@ -337,6 +339,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	private void changgeAdopt(NewOrderChangeBo nb) {
 		TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
 		List<TOrderDun> td1=tOrderDunMapper.selectByOrderNo(nb.getOrderNo());
+		List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(), null, null);
 		List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTask(nb.getOrderNo());
 		List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
 		String newOrderNo=idGenerator.generateId().toString();
@@ -348,6 +351,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			tOrderTaskBo.setOrderNo(newOrderNo);
 			tOrderTaskMapper.insertSelective(tOrderTaskBo);
 		}
+		for (OutNewOrderDunBo outNewOrderDunBo : td2) {
+			outNewOrderDunBo.setId(null);
+			outNewOrderDunBo.setOrderNo(newOrderNo);
+			newOrderDunMapper.insertSelective(outNewOrderDunBo);
+		}
 		for (TOrderDun tOrderDun : td1) {
 			tOrderDun.setId(UUID.randomUUID().toString());
 			tOrderDun.setOrderNo(newOrderNo);

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -221,6 +221,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int delectOrderTask(Integer id) {
+		//连带催款一起删除
+		newOrderDunMapper.deleteByTid(id);
 		return tOrderTaskMapper.deleteByPrimaryKey(id);
 	}