Browse Source

客户释放数量修改

anderx 6 years ago
parent
commit
106692312a

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

@@ -1289,6 +1289,9 @@
   	<if test="depId != null">
   	and dep.id= #{depId,jdbcType=VARCHAR}
   	</if>
+  	<if test="aid != null">
+  	and c.aid= #{aid,jdbcType=VARCHAR}
+  	</if>
   	<if test="starTime !=null and endTime !=null">
   	and b.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
@@ -1316,6 +1319,9 @@
   	<if test="orderNo != null">
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="aid != null">
+  	and c.aid= #{aid,jdbcType=VARCHAR}
+  	</if>
   	<if test="starTime !=null and endTime !=null">
   	and b.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>

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

@@ -41,14 +41,14 @@ public class OrderDunTask {
 	 * 每天凌晨2点轮询处理需要催款的信息
 	 */
 	@Scheduled(cron = "0 0 2  * * ?") 
-	@RequestMapping(value = "/open/updateorderDun", method = RequestMethod.GET)
+	//@RequestMapping(value = "/open/updateorderDun", method = RequestMethod.GET)
   	@Transactional(rollbackFor=Exception.class)
 	public void updateorderDun(){
   		try {
   			LoggerUtils.debug(logger, "======================催款任务轮询启动===================");
   		List<OrderDunTaskBo> list=orderNewService.selectAllOrderDun();
   		for (OrderDunTaskBo t : list) {
-			if (t.getDunSubject()/10==1) {
+			if (t.getDunSubject()/10==1) {//1则为订单催款信息否则为项目催款信息
 				if (t.getDunSubject()%10==t.getOrderStatus()&&t.getSettlementAmount().compareTo(t.getMoney()) == -1) {
 					 updateOrderDun(t);
 						Thread.sleep(2000);

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

@@ -19,7 +19,7 @@ public class ReleaseUserTask {
 	@Resource
 	private UserService userServiceImpl;
 	
-	int pointsDataLimit=100;
+	int pointsDataLimit=50;
 	
 	/**
 	 * 每天凌晨一点将客户和业务转为待释放

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

@@ -354,6 +354,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if(pageNo==null||pageNo<0)pageNo=1;
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if(specially!=null&&specially==1) params.put("aid", TokenManager.getAdminId());;
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);

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

@@ -60,7 +60,7 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.0.95
+static.host=//sb.jishutao.com/1.0.96
 avatar.host=//sb.jishutao.com
 
 #连生产