Procházet zdrojové kódy

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

anderx před 3 roky
rodič
revize
c100b116e1

+ 0 - 9
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -756,14 +756,5 @@ public class PublicController extends CertifyApiController {
 
 
 
-	@RequestMapping("/pushOrderMid")
-	public Result pushOrderMid() {
-		List<TOrderMid> list = tOrderMidMapper.selectAll();
-		for (TOrderMid mid : list) {
-			tOrderMidMapper.updateCostAmount(mid.getOrderNo());
-			orderProjectService.updateMidServiceProject(mid.getOrderNo());
-		}
-		return new Result().data(1);
-	}
 
 }

+ 0 - 3
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -701,9 +701,6 @@
     where d.sort =6 and a.order_no = #{orderNo}
   </select>
 
-
-
-
   <select id="selectAll" resultType="com.goafanti.common.model.TOrderMid">
     select order_no orderNo
     from t_order_mid

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

@@ -392,7 +392,7 @@ public class OrderDunTask {
 			o.setStartTime(date);
 			if (t.getMoney()==null)t.setMoney(new BigDecimal(0));
 			newOrderDunService.updateDun(o);
-			TOrderMid tm=orderNewService.pushOrderMidDun(t.getOrderNo(),orderNew.getSettlementAmount(),date,t);
+			TOrderMid tm=orderNewService.pushOrderMidDun(t.getOrderNo(),orderNew.getSettlementAmount(),date);
 			TArrearsDun td=new TArrearsDun();
 			td.setOrderArrears(tm.getOrderArrears());
 			td.setOrderReceivables(tm.getOrderReceivables());

+ 2 - 3
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -194,12 +194,11 @@ public interface OrderNewService {
 	 * @param orderNo 订单编号
 	 * @param settlementAmount 已收金额
 	 * @param date 日期
-	 * @param o	订单催款类实对线
 	 * @return
 	 */
-	TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o);
-
+	TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date);
 
+	TOrderMid pushOrderMidDun(TOrderNew t);
 	/**
 	 *  发送邮件
 	 * @param type 消息类型

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

@@ -815,6 +815,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				newOrderDunMapper.deleteByPrimaryKey(cd.getDid());
 			}
 		}
+		orderNewService.pushOrderMidDun(o);
 	}
 
 	/**

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

@@ -968,7 +968,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					o.setStartTime(date);
 					newOrderDunMapper.updateByPrimaryKeySelective(o);
 					//催款统计算
-					TOrderMid tm = pushOrderMidDun(orderNo, b.getSettlementAmount(), date, o);
+					TOrderMid tm = pushOrderMidDun(orderNo, b.getSettlementAmount(), date);
 					TArrearsDun t=new TArrearsDun();
 					t.setOrderArrears(tm.getOrderArrears());
 					t.setOrderReceivables(tm.getOrderReceivables());
@@ -991,12 +991,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 * @param orderNo 订单编号
 	 * @param settlementAmount 已收金额
 	 * @param date 日期
-	 * @param o	订单催款类实对线
 	 * @return
 	 */
 	@Override
 	@Synchronized
-	public TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o) {
+	public TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date) {
 		TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
 //		代码看不出异常,但是计算会出现重复,则修改方案,每一次触发,则重新统计
 //		tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));
@@ -1018,6 +1017,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		tOrderMidMapper.updateByPrimaryKeySelective(tm);
 		return tm;
 	}
+	@Override
+	public TOrderMid pushOrderMidDun(TOrderNew t) {
+		return pushOrderMidDun(t.getOrderNo(),t.getSettlementAmount(),new Date());
+	}
+
+
 
 	@Override
 	public void addNewDunNoticAndSendEmail(String  orderNo, OutNewOrderDunBo o) {

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

@@ -637,7 +637,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 						ob.setStatus(1);
 						ob.setStartTime(new Date());
 						newOrderDunMapper.updateByPrimaryKeySelective(ob);
-						TOrderMid tm=orderNewService.pushOrderMidDun(task2.getOrderNo(),tn.getSettlementAmount(),new Date(),ob);
+						TOrderMid tm=orderNewService.pushOrderMidDun(task2.getOrderNo(),tn.getSettlementAmount(),new Date());
 						TArrearsDun td=new TArrearsDun();
 						td.setOrderArrears(tm.getOrderArrears());
 						td.setOrderReceivables(tm.getOrderReceivables());