修改

src/main/java/com/llisoft/pay/controller/OrderController.java

@@ -5,6 +5,8 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,10 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.llisoft.pay.service.OrderService;
 import com.llisoft.pay.util.JsonUtil;
 import com.llisoft.pay.vo.OrderAddRequestVo;
-import com.llisoft.pay.vo.OrderInfoRequestVo;
-import com.llisoft.pay.vo.OrderInfoResponseVo;
 import com.llisoft.pay.vo.OrderPayRequestVo;
-import com.llisoft.pay.vo.ResponseVo;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,23 +33,22 @@ public class OrderController{
 	
 	@ApiOperation(value="订单添加")
 	@PostMapping("/add")
-	public ResponseVo<String> add(@Valid @RequestBody OrderAddRequestVo vo) throws Exception{
+	public String add(@Valid @RequestBody OrderAddRequestVo vo) throws Exception{
 		logger.info("收到订单添加请求: {}", JsonUtil.toJson(vo));
-		return ResponseVo.success(orderService.add(vo.getAppKey(), vo.getMoney(), vo.getTitle()));
+		return orderService.add(vo.getAppKey(), vo.getMoney(), vo.getTitle());
 	}
 	
 	@ApiOperation(value="订单支付")
 	@PostMapping("/pay")
-	public ResponseVo<String> pay(@Valid @RequestBody OrderPayRequestVo vo) throws Exception{
+	public String pay(@Valid @RequestBody OrderPayRequestVo vo) throws Exception{
 		logger.info("收到订单支付请求: {}", JsonUtil.toJson(vo));
-		return ResponseVo.success(orderService.pay(vo.getOrderNum(), vo.getPayType(), vo.isMobile()));
+		return orderService.pay(vo.getOrderNum(), vo.getPayType(), vo.isMobile());
 	}
 	
-	@ApiOperation(value="订单详情")
-	@PostMapping("/info")
-	public ResponseVo<OrderInfoResponseVo> get(@Valid @RequestBody OrderInfoRequestVo vo) throws Exception{
-		logger.info("收到订单详情请求: {}", JsonUtil.toJson(vo));
-		return ResponseVo.success(orderService.info(vo.getOrderNum()));
+	@ApiOperation(value="订单核对")
+	@GetMapping("/check/{orderNum}")
+	public boolean check(@PathVariable String orderNum) throws Exception{
+		return orderService.check(orderNum);
 	}
 	
 }

src/main/java/com/llisoft/pay/service/OrderService.java

@@ -11,11 +11,9 @@ import org.springframework.transaction.annotation.Transactional;
 import com.llisoft.pay.dao.OrderDao;
 import com.llisoft.pay.entity.App;
 import com.llisoft.pay.entity.Order;
-import com.llisoft.pay.util.BeanUtil;
 import com.llisoft.pay.util.CodeUtil;
 import com.llisoft.pay.util.HttpUtil;
 import com.llisoft.pay.util.JsonUtil;
-import com.llisoft.pay.vo.OrderInfoResponseVo;
 
 
 @Service
@@ -85,16 +83,14 @@ public class OrderService {
 	}
 	
 	/**
-	 * 订单详情
+	 * 订单核对
 	 * @param orderNum
 	 * @return
 	 * @throws Exception 
 	 */
-	public OrderInfoResponseVo info(String orderNum) throws Exception {
+	public boolean check(String orderNum) throws Exception {
 		Order order = orderDao.selectByOrderNum(orderNum);
-		OrderInfoResponseVo vo = BeanUtil.transformBean(order, OrderInfoResponseVo.class);
-		vo.setPayed(order.getOrderStatus() == STATUS_PAYED);
-		return vo;
+		return order.getOrderStatus() == STATUS_PAYED;
 	}
 	
 	/**

src/main/java/com/llisoft/pay/vo/OrderInfoRequestVo.java

@@ -1,23 +0,0 @@
-package com.llisoft.pay.vo;
-
-import javax.validation.constraints.NotBlank;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-@ApiModel("订单详情请求实体")
-public class OrderInfoRequestVo {
-
-	@ApiModelProperty("订单号")
-	@NotBlank(message="订单号不能为空")
-    private String orderNum;
-
-	public String getOrderNum() {
-		return orderNum;
-	}
-
-	public void setOrderNum(String orderNum) {
-		this.orderNum = orderNum;
-	}
-  
-}

src/main/java/com/llisoft/pay/vo/OrderInfoResponseVo.java

@@ -1,67 +0,0 @@
-package com.llisoft.pay.vo;
-
-import java.util.Date;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-@ApiModel("订单详情返回实体")
-public class OrderInfoResponseVo {
-
-	@ApiModelProperty("订单号")
-    private String orderNum;
-
-	@ApiModelProperty("订单金额")
-    private int orderMoney;
-
-	@ApiModelProperty("下单时间")
-    private Date createTime;
-
-	@ApiModelProperty("支付时间")
-    private Date payTime;
-
-	@ApiModelProperty("是否支付")
-    private boolean payed;
-    
-
-	public String getOrderNum() {
-		return orderNum;
-	}
-
-	public void setOrderNum(String orderNum) {
-		this.orderNum = orderNum;
-	}
-
-	public int getOrderMoney() {
-		return orderMoney;
-	}
-
-	public void setOrderMoney(int orderMoney) {
-		this.orderMoney = orderMoney;
-	}
-
-	public boolean isPayed() {
-		return payed;
-	}
-
-	public void setPayed(boolean payed) {
-		this.payed = payed;
-	}
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-    
-}

src/main/java/com/llisoft/pay/vo/ResponseVo.java

@@ -1,122 +0,0 @@
-package com.llisoft.pay.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-@ApiModel("公共返回实体")
-public class ResponseVo<T> {
-
-	@ApiModelProperty(value="代码", required=true)
-	private int code;
-	@ApiModelProperty(value="信息", required=true)
-	private String msg; 
-	@ApiModelProperty("数据")
-    private T data;
-
-    
-    /**
-     * 默认成功方法
-     * @param data
-     * @return
-     */
-    public static <T> ResponseVo<T> success(T data){
-    	return ResponseVo.build(data, CodeEnum.SUCCESS); 
-    }
-
-    /**
-     * 默认成功方法
-     * @param data
-     * @return 
-     * @return
-     */
-    public static <T> ResponseVo<T> success(T data, String msg){
-    	return ResponseVo.build(data, CodeEnum.SUCCESS.getCode(), msg); 
-    }
-    
-    /**
-     * 默认失败方法
-     * @param data
-     * @return
-     */
-    public static <T> ResponseVo<T> fail(T data){
-    	return ResponseVo.build(data, CodeEnum.FAIL); 
-    }
-    
-    /**
-     * 默认失败方法
-     * @param data
-     * @return
-     */
-    public static <T> ResponseVo<T> fail(String msg){
-    	return ResponseVo.build(null, CodeEnum.FAIL.getCode(), msg); 
-    }
-    
-    /**
-     * 默认失败方法
-     * @param data
-     * @return
-     */
-    public static <T> ResponseVo<T> fail(T data, String msg){
-    	return ResponseVo.build(data, CodeEnum.FAIL.getCode(), msg); 
-    }
-	
-    /**
-     * 默认构建方法
-     * @param data
-     * @return
-     */
-    public static <T> ResponseVo<T> build(CodeEnum codeEnum){
-    	return ResponseVo.build(null, codeEnum); 
-    }
-    
-    /**
-     * 默认构建方法
-     * @param data
-     * @return
-     */
-    public static <T> ResponseVo<T> build(T data, CodeEnum codeEnum){
-    	return ResponseVo.build(data, codeEnum.getCode(), codeEnum.getMsg()); 
-    }
-    
-    /**
-     * 默认构建方法
-     * @param data
-     * @return
-     */
-    public static <T> ResponseVo<T> build(int code, String msg){
-    	return build(null, code, msg); 
-    }
-    
-    /**
-     * 默认构建方法
-     * @param data
-     * @return
-     */
-    public static <T> ResponseVo<T> build(T data, int code, String msg){
-    	ResponseVo<T> responseBean = new ResponseVo<>();
-    	responseBean.setCode(code);
-    	responseBean.setMsg(msg);
-    	responseBean.setData(data);
-    	return responseBean; 
-    }
-    
-	public int getCode() {
-		return code;
-	}
-	public void setCode(int code) {
-		this.code = code;
-	}
-	public String getMsg() {
-		return msg;
-	}
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-	public T getData() {
-		return data;
-	}
-	public void setData(T data) {
-		this.data = data;
-	}
-
-}