查询订单详细信息修改

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderVo.java

@@ -1,7 +1,9 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 import com.yonge.cooleshow.biz.dal.entity.UserOrderDetail;
+import com.yonge.cooleshow.biz.dal.enums.PayChannelEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -25,6 +27,8 @@ public class UserOrderVo extends UserOrder {
 	private String username;
 	@ApiModelProperty(value = "手机号")
 	private String phone;
+	@ApiModelProperty("支付渠道:  alipay 支付宝  wx_lite 微信 ")
+	private PayChannelEnum payChannel;
 
 	public List<UserOrderDetailVo> getOrderDetailList() {
 		return orderDetailList;
@@ -65,4 +69,12 @@ public class UserOrderVo extends UserOrder {
 	public void setPhone(String phone) {
 		this.phone = phone;
 	}
+
+	public PayChannelEnum getPayChannel() {
+		return payChannel;
+	}
+
+	public void setPayChannel(PayChannelEnum payChannel) {
+		this.payChannel = payChannel;
+	}
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -68,7 +68,9 @@
             , t.coupon_amount_ as couponAmount
             , t.user_note_ as userNote
             , t.pay_time_ as payTime
+            , t.create_time_ as createTime
             , p.trans_no_ as transNo
+            , p.pay_channel_ as payChannel
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_
         left join sys_user u on t.user_id_ = u.id_

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountController.java

@@ -45,8 +45,8 @@ public class UserAccountController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入id")
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情")
     public HttpResponseResult<UserAccountVo> detail() {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {