anderx лет назад: 3
Родитель
Сommit
249251e323

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

@@ -77,7 +77,7 @@ public interface NewOrderDunMapper {
 	 */
 	int updateByPrimaryKey(NewOrderDun record);
 
-	List<OutNewOrderDunBo> selectListNewOrderDun(@Param("orderNo")String orderNo,@Param("aid") String aid,@Param("status")Integer status);
+	List<OutNewOrderDunBo> selectListNewOrderDun(@Param("orderNo")String orderNo,@Param("status")Integer status);
 
 	List<OutNewOrderDunBo> selectAllOrderDun();
 
@@ -91,4 +91,4 @@ public interface NewOrderDunMapper {
 
 	List<OutSelectOrderDun> selectOrderDun(@Param("depId") String depId,@Param("aid") String aid,@Param("sort") Integer sort,@Param("province") Integer province,
 										   @Param("startDate") String startDate, @Param("endDate")  String endDate);
-}
+}

+ 2 - 3
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -72,9 +72,9 @@ public class OrderDunTask {
 	/**
 	 * 	每天凌晨3点轮
 	 */
-	@ResponseBody
+//	@ResponseBody
 	@Scheduled(cron = "0 0 3  * * ?")
-	@RequestMapping(value = "/open/test", method = RequestMethod.GET)
+//	@RequestMapping(value = "/open/test", method = RequestMethod.GET)
 	@Transactional(rollbackFor=Exception.class)
 	public void startTask() throws InterruptedException {
 		updateNewOrderDun();
@@ -118,7 +118,6 @@ public class OrderDunTask {
 	 * 询处理需要新催款的信息
 	 */
 	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
-	@Transactional
 	public void updateNewOrderDun(){
   		try {
   			LoggerUtils.debug(logger, "======================新催款任务轮询启动===================");

+ 7 - 7
src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java

@@ -26,8 +26,8 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 
 	@Autowired
 	private NewOrderDunMapper	newOrderDunMapper;
-	
-	
+
+
 	@Override
 	public int createDun(InputNewOrderDunBo ib) {
 		ib.setAid(TokenManager.getAdminId());
@@ -43,8 +43,8 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 		}else 	newOrderDunMapper.insertSelective(ib);
 		return 0;
 	}
-	
-	
+
+
 	@Override
 	public int updateDun(InputNewOrderDunBo ib) {
 		if (ib.getAppropriationRatio()!=null)ib.setMoney(null);
@@ -57,7 +57,7 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 	}
 	@Override
 	public List<OutNewOrderDunBo> selectListNewOrderDun(String orderNo) {
-		return newOrderDunMapper.selectListNewOrderDun(orderNo,null,null);
+		return newOrderDunMapper.selectListNewOrderDun(orderNo,null);
 	}
 	@Override
 	public OutNewOrderDunBo selectDun(Integer id) {
@@ -70,8 +70,8 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 		}
 		return ob;
 	}
-	
-	
+
+
 	@Override
 	public List<OutNewOrderDunBo> selectAllOrderDun() {
 		return newOrderDunMapper.selectAllOrderDun();

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

@@ -144,7 +144,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		newOrderChangeMapper.insertSelective(t);
 		NewOrderChangeBo ncb=newOrderChangeMapper.selectByorderNoAndStatus(t.getOrderNo());
 
-			List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null,null);
+			List<OutNewOrderDunBo> listDun=newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null);
 			List<TChangeDun> listcd=new ArrayList<>();
 			if (listDun!=null&&!listDun.isEmpty()) {
 				for (OutNewOrderDunBo d : listDun) {
@@ -428,7 +428,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	 */
 	private void changeAdopt(NewOrderChangeBo nb) {
 		TOrderNew t1=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
-		List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(), null, null);
+		List<OutNewOrderDunBo> td2=newOrderDunMapper.selectListNewOrderDun(nb.getOrderNo(),  null);
 		List<TOrderTaskBo> tt1=tOrderTaskMapper.selectOrderTaskAll(nb.getOrderNo());
 		List<TOrderLogBo> tl1=tOrderLogMapper.selectOrderByNo(nb.getOrderNo());
 		String newOrderNo=idGenerator.generateId().toString();

+ 10 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -646,7 +646,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNew b=tOrderNewMapper.selectByPrimaryKey(orderNo);
 		if(b.getApproval()==0){
 			Date date = new Date();
-			List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,null,0);
+			List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,0);
 			for (OutNewOrderDunBo o : list) {
 				if (o.getDunType()==1) {
 					o.setStatus(1);
@@ -682,7 +682,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Synchronized
 	public TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o) {
 		TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
-		tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));
+//		代码看不出异常,但是计算会出现重复,则修改方案,每一次触发,则重新统计
+//		tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));
+		List<OutNewOrderDunBo>  list =newOrderDunMapper.selectListNewOrderDun(orderNo,1);
+		BigDecimal cout=new BigDecimal(0);
+		for (OutNewOrderDunBo bo : list) {
+			cout=cout.add(bo.getMoney());
+		}
+		tm.setOrderReceivables(cout);
 		BigDecimal sum=tm.getOrderReceivables().subtract(settlementAmount);
 		//如果金额大于欠款修改欠款为0
 		if (sum.compareTo(new BigDecimal(0))<0)sum=new BigDecimal(0);
@@ -995,7 +1002,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 	@Override
 	public boolean checkORderDun(String orderNo) {
-		List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo, null, null);
+		List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,  null);
 		if (list==null||list.size()<1) {
 			return true;
 		}else {