Forráskód Böngészése

订单催款修改

Signed-off-by: anderx <312518615@qq.com>
anderx 5 éve%!(EXTRA string=óta)
szülő
commit
9d7ddccedc

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

@@ -1604,7 +1604,7 @@ where super_id is null ) e on e.order_no=a.order_no
     a.proof_aid as proofAid,contract_picture_url as contractPictureUrl, c.name as salesmanName,dep.name as depName,d.name as financeName,
     c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName ,e.back_status as backStatus,f.name as initiateName,
     e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
-    g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,
+    g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.agreement_url agreementUrl,
     h.name NowFinance,h.contact_mobile NowFinanceMobile,a.additional_order additionalOrder,i.name as oldSalesmanName, i.contact_mobile oldSalesmanMobile
     from t_order_new a left join `user` b on a.buyer_id=b.id left join admin i on a.old_salesman_id=i.id
     left join admin c on a.salesman_id=c.id left join department dep on a.order_dep=dep.id left join admin d on a.finance_id=d.id

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

@@ -96,7 +96,6 @@ public class OrderDunTask {
   			if(o.getProjectType()==OrderDunProjectType.HY.getCode()&&o.getDunType()==2) {
   				calendar2.add(Calendar.DATE, o.getEffectiveCount()*180);
   				CalendarTimeCleared(calendar2);
-  				System.out.println(DateUtils.formatDate(calendar2.getTime(), AFTConstants.YYYYMMDDHHMMSS));
   				if (calendar.getTimeInMillis() > calendar2.getTimeInMillis()) {//当前时间大于计算后时间则触发
   	  	  			updateOrderDun(o);
   	  	  			Thread.sleep(2000);
@@ -118,6 +117,7 @@ public class OrderDunTask {
   			}
   	  		if (o.getDunType()==0) {
   	  		calendar2.setTime(o.getCustomizeTime());
+  	  		CalendarTimeCleared(calendar);
   	  			if (calendar.equals(calendar2)) {
   	  				updateOrderDun(o);
 	  	  			Thread.sleep(2000);