修改

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

@@ -13,11 +13,9 @@ 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.OrderAddResponseVo;
 import com.llisoft.pay.vo.OrderInfoRequestVo;
 import com.llisoft.pay.vo.OrderInfoResponseVo;
 import com.llisoft.pay.vo.OrderPayRequestVo;
-import com.llisoft.pay.vo.OrderPayResponseVo;
 import com.llisoft.pay.vo.ResponseVo;
 
 import io.swagger.annotations.Api;
@@ -36,14 +34,14 @@ public class OrderController{
 	
 	@ApiOperation(value="订单添加")
 	@PostMapping("/add")
-	public ResponseVo<OrderAddResponseVo> add(@Valid @RequestBody OrderAddRequestVo vo) throws Exception{
+	public ResponseVo<String> add(@Valid @RequestBody OrderAddRequestVo vo) throws Exception{
 		logger.info("收到订单添加请求: {}", JsonUtil.toJson(vo));
 		return ResponseVo.success(orderService.add(vo.getAppKey(), vo.getMoney(), vo.getTitle()));
 	}
 	
 	@ApiOperation(value="订单支付")
 	@PostMapping("/pay")
-	public ResponseVo<OrderPayResponseVo> pay(@Valid @RequestBody OrderPayRequestVo vo) throws Exception{
+	public ResponseVo<String> pay(@Valid @RequestBody OrderPayRequestVo vo) throws Exception{
 		logger.info("收到订单支付请求: {}", JsonUtil.toJson(vo));
 		return ResponseVo.success(orderService.pay(vo.getOrderNum(), vo.getPayType(), vo.isMobile()));
 	}

src/main/java/com/llisoft/pay/dao/OrderDao.java

@@ -15,7 +15,7 @@ public interface OrderDao {
 	@Select("select * from mta_pay_order where order_id=#{orderId}")
 	Order select(int orderId);
 	
-	@Select("select * from mta_pay_order where order_num=#{order}")
+	@Select("select * from mta_pay_order where order_num=#{orderNum}")
 	Order selectByOrderNum(String orderNum);
 	
     @Insert("insert into mta_pay_order (order_id,order_num,order_status,order_money,order_title,app_id,create_time) "
@@ -23,7 +23,7 @@ public interface OrderDao {
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="orderId", before=false, resultType=Integer.class)
     boolean insert(Order order);
 
-    @Update("update mta_pay_order set order_status=#{orderStatus},pay_time=now() where auth_id=#{authId}")
+    @Update("update mta_pay_order set order_status=#{orderStatus},pay_time=now() where order_id=#{orderId}")
 	boolean updatePay(@Param("orderId")int orderId, @Param("orderStatus")byte orderStatus);
 	
 }

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

@@ -12,9 +12,7 @@ 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.vo.OrderAddResponseVo;
 import com.llisoft.pay.vo.OrderInfoResponseVo;
-import com.llisoft.pay.vo.OrderPayResponseVo;
 
 
 @Service
@@ -43,7 +41,7 @@ public class OrderService {
 	 * @return
 	 * @throws Exception 
 	 */
-	public OrderAddResponseVo add(String appKey, int orderMoney, String orderTitle) throws Exception{
+	public String add(String appKey, int orderMoney, String orderTitle) throws Exception{
 		// 验证appKey合法性
 		App app = appService.get(appKey);
 		if (Objects.isNull(app)) {
@@ -63,10 +61,7 @@ public class OrderService {
 		order.setAppId(app.getAppId());
 		orderDao.insert(order);
 		logger.info("添加订单成功: {}", orderNum);
-		// 返回结果
-		OrderAddResponseVo vo = new OrderAddResponseVo();
-		vo.setOrderNum(orderNum);
-		return vo;
+		return orderNum;
 	}
 	
 	/**
@@ -76,18 +71,14 @@ public class OrderService {
 	 * @return
 	 * @throws Exception
 	 */
-	public OrderPayResponseVo pay(String orderNum, byte payType, boolean isMobile) throws Exception{
+	public String pay(String orderNum, byte payType, boolean isMobile) throws Exception{
 		Order order = orderDao.selectByOrderNum(orderNum);
 		if(order.getOrderStatus() == STATUS_PAYED){
 			throw new Exception("订单已经支付过: " + orderNum);
 		}
 		// 添加支付记录
 		String payNum = payService.add(order.getOrderId(), payType);
-		String html = payService.pay(payNum, isMobile);
-		// 返回结果
-		OrderPayResponseVo vo = new OrderPayResponseVo();
-		vo.setHtml(html);
-		return vo;
+		return payService.pay(payNum, isMobile);
 	}
 	
 	/**

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

@@ -1,21 +0,0 @@
-package com.llisoft.pay.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-@ApiModel("订单添加返回实体")
-public class OrderAddResponseVo {
-	
-	@ApiModelProperty("订单号")
-    private String orderNum;
-
-	public String getOrderNum() {
-		return orderNum;
-	}
-
-	public void setOrderNum(String orderNum) {
-		this.orderNum = orderNum;
-	}
-
- 
-}

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

@@ -1,20 +0,0 @@
-package com.llisoft.pay.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-@ApiModel("订单支付返回实体")
-public class OrderPayResponseVo {
-	
-	@ApiModelProperty("HTML文本")
-    private String html;
-
-	public String getHtml() {
-		return html;
-	}
-
-	public void setHtml(String html) {
-		this.html = html;
-	}
- 
-}

src/main/resources/application.yml

@@ -20,7 +20,7 @@ server.port: 6666 #监听端口
 ##数据源配置
 spring.datasource: 
   driverClassName: com.mysql.jdbc.Driver
-  url: jdbc:mysql://192.168.0.178:3306/mta_platform?useUnicode=true&characterEncoding=utf8&useSSL=false
+  url: jdbc:mysql://192.168.0.178:3306/mta_pay?useUnicode=true&characterEncoding=utf8&useSSL=false
   username: dkuser
   password: dkuser
   initialSize: 3        ##初始化连接数, 默认: 10