anderx 7 vuotta sitten
vanhempi
commit
0f8b6e2890

+ 5 - 2
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -350,14 +350,17 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	/**
 	 * 订单结单
 	 */
-	@RequestMapping(value="/orderRefundList", method = RequestMethod.GET)
-	public Result orderRefundList(String orderNo){
+	@RequestMapping(value="/asdas", method = RequestMethod.GET)
+	public Result asdas(String orderNo){
 		Result res=new Result();
 		if (StringUtils.isBlank(orderNo)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号","订单编号"));
 			return res;
 		}
 		res.data(orderNewService.checkOrderOver(orderNo));
+		if ((int)res.getData()==-1) {
+			
+		}
 		return res;
 	}
 	

+ 4 - 0
src/main/java/com/goafanti/order/enums/TaskState.java

@@ -4,9 +4,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum TaskState {
+	/** 未分派**/
 	 WFP(0,"未分派"),
+	 /** 已分派 **/
 	 YFP(1,"已分派"),
+	 /** 材料已启动 **/
 	 CLYQD(2,"材料已启动"),
+	 /** 无效 **/
 	 CLYWC(2,"材料已完成"),
 	/** 无效 **/
 	INVALID(10, "无效");

+ 12 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -486,8 +486,18 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int checkOrderOver(String orderNo) {
-		
-		return 0;
+		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		if (t.getLiquidationStatus()!=LiquidationNewState.ALREADY_PAY.getCode()||
+				t.getProcessStatus()!=ProcessStatus.YQBFPZXSGLY.getCode()) {
+			return -1;
+		}
+		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
+		for (TOrderTaskBo task : list) {
+			if (task.getTaskStatus()!=TaskState.CLYWC.getCode()) {
+				return -1;
+			}
+		}
+		return 1;
 	}