Browse Source

Test问题处理

anderx 7 years ago
parent
commit
9c6e746084

+ 2 - 2
src/main/java/com/goafanti/core/auth/RestClient.java

@@ -2,7 +2,7 @@ package com.goafanti.core.auth;
 
 import java.util.Base64;
 
-import org.junit.Test;
+
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -36,7 +36,7 @@ public class RestClient {
 		return response.getBody();
 	}
 	
-	@Test
+//	@Test
 	public void testLogin() {
 		System.out.println(sendToBs("login", HttpMethod.GET, null));
 	}

+ 14 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -347,6 +347,20 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return res;
 	}
 	
+	/**
+	 * 订单结单
+	 */
+	@RequestMapping(value="/orderRefundList", method = RequestMethod.GET)
+	public Result orderRefundList(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));
+		return res;
+	}
+	
 	/** 退单文件上传 **/
 	@RequestMapping(value = "/uploadRefundOrderFile", method = RequestMethod.POST)
 	public Result uploadRefundOrderFile(HttpServletRequest req,String sign){

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

@@ -152,6 +152,7 @@ public interface OrderNewService {
 	boolean checkOderSettlementAmount(String orderNo);
 	boolean checkORderTask(String orderNo);
 	HSSFWorkbook exportOrderDunData(String name, String orderNo, String starTime, String endTime);
+	int checkOrderOver(String orderNo);
 	
 
 	

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

@@ -481,6 +481,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		HSSFWorkbook wb = ExportExcelUtil.exportOrderDunData(list, comment, filePath);
 		return wb;
 	}
+
+
+
+	@Override
+	public int checkOrderOver(String orderNo) {
+		
+		return 0;
+	}