Przeglądaj źródła

新增自动移交和主动移交日志

anderx 4 lat temu
rodzic
commit
72c9102a5c

+ 1 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -183,5 +183,5 @@ public class AFTConstants {
 	
 	public static final String DEFAULT_RESULT="签单-自动触发";
 
-    public static final long DUN_START_LIMIT_MS						= 24*3600*1000*30L;
+    public static final long DUN_START_LIMIT_MS						= 24*3600*1000*900L;
 }

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

@@ -90,6 +90,8 @@ public class OrderDunTask {
 	@RequestMapping(value = "/open/pushLegalAffairs", method = RequestMethod.GET)
 	public void pushLegalAffairs() {
 		InputOrderListBo in = new InputOrderListBo();
+		in.setType(0);
+		in.setLegalAffairs(0);
 		List<OutOrderLegalAffairsListBo>  list=legalAffairsService.getLegalAffairsOrder(in);
 		ArrayList<String> addList = new ArrayList<>();
 		Date now=new Date();

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

@@ -85,7 +85,7 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
                 map.put("shiro",3);
             }else {
                 map.put("shiro",0);
-                map.put("aid", TokenManager.getAdminId());
+                if(TokenManager.getAdminId()!=null)map.put("aid", TokenManager.getAdminId());
             }
             map.put("type", in.getType());
         }else{
@@ -116,9 +116,9 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
     @Override
     public List<OutOrderLegalAffairsListBo> getLegalAffairsOrder(InputOrderListBo in) {
         HashMap<String, Object> params = new HashMap<>();
-        params.put("type",0);
-        params.put("legalAffairs",0);
+        addParams(in,params);
         List<OutOrderLegalAffairsListBo> list =(List<OutOrderLegalAffairsListBo>) findList("legalAffairsOrderList",params,1,999999);
+        sumDaysRemaining(list);
         return list;
     }
 

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -50,7 +50,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 #avatar.host=//172.16.0.253
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.98
+static.host=//static.jishutao.com/1.1.97
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7