Browse Source

Merge branch 'test' of http://git.jishutao.com/jishutao/kede-server.git into test

limin 7 years ago
parent
commit
e096b6351c

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

@@ -1164,7 +1164,11 @@
   	<if test="specially == 4">
   	a.process_status,
   	</if>
-  	a.order_status,a.create_time desc
+  	a.order_status,
+  	a.create_time 
+  	<if test="specially != 4">
+  	desc
+  	</if>
   	<if test="page_sql!=null">
 			${page_sql}
 	</if>

+ 10 - 3
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -169,10 +169,17 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "提条状态"));
 			return res;
 		}
-		if (isSubmit==1&&orderNewService.checkORderTask(t.getOrderNo())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "主项目"));
-			return res;
+		if (isSubmit==1) {
+			if (orderNewService.checkORderTask(t.getOrderNo())) {
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "主项目"));
+				return res;
+			}
+			if (orderNewService.checkORderDun(t.getOrderNo())) {
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "催款信息"));
+				return res;
+			}
 		}
+		
 		if (StringUtils.isNotBlank(signDate)) {
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			try {

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

@@ -163,6 +163,7 @@ public interface OrderNewService {
 	List<OrderDunTaskBo> selectAllOrderDun();
 	void updateOrderDun(TOrderDun tDun);
 	void addNoticAndSendEmail(String orderNo, OrderDunTaskBo t, Integer code)throws UnsupportedEncodingException, MessagingException;
+	boolean checkORderDun(String orderNo);
 	
 	
 }

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

@@ -524,6 +524,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		return true;
 	}
+	@Override
+	public boolean checkORderDun(String orderNo) {
+		List<TOrderDun> list=tOrderDunMapper.selectByOrderNoDunSubject(orderNo);
+		if (list==null||list.size()<1) {
+			return true;
+		}else {
+			return false;
+		}
+		
+	}
+	
 
 
 	/**