查询订单详情接口问题修改

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -145,9 +145,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     @Override
     public UserOrderVo detailApp(UserOrder param) {
         UserOrderVo userOrderVo = baseMapper.detailApp(param);
-        userOrderVo.setFeeAmt(null);
-        userOrderVo.setPlantformFee(null);
         if (null != userOrderVo) {
+            userOrderVo.setFeeAmt(null);
+            userOrderVo.setPlantformFee(null);
             List<UserOrderDetailVo> orderDetilList = orderDetailService.getOrderDetilListByOrderNo(userOrderVo.getOrderNo());
             orderDetilList.forEach(o -> {
                 o.setPlantformFee(null);

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

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.UserOrderDao">
-	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.UserOrder">
-            <result column="id_" property="id" />
-	        <result column="order_no_" property="orderNo" />
-	        <result column="user_id_" property="userId" />
-	        <result column="order_name_" property="orderName" />
-            <result column="order_type_" property="orderType" />
-            <result column="order_desc_" property="orderDesc" />
-	        <result column="status_" property="status" />
-	        <result column="original_price_" property="originalPrice" />
-	        <result column="expect_price_" property="expectPrice" />
-	        <result column="actual_price_" property="actualPrice" />
-	        <result column="coupon_amount_" property="couponAmount" />
-	        <result column="plantform_fee_" property="plantformFee" />
-	        <result column="user_note_" property="userNote" />
-	        <result column="create_time_" property="createTime" />
-	        <result column="pay_time_" property="payTime" />
-	        <result column="update_time_" property="updateTime" />
-		</resultMap>  
-    
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.UserOrder">
+        <result column="id_" property="id"/>
+        <result column="order_no_" property="orderNo"/>
+        <result column="user_id_" property="userId"/>
+        <result column="order_name_" property="orderName"/>
+        <result column="order_type_" property="orderType"/>
+        <result column="order_desc_" property="orderDesc"/>
+        <result column="status_" property="status"/>
+        <result column="original_price_" property="originalPrice"/>
+        <result column="expect_price_" property="expectPrice"/>
+        <result column="actual_price_" property="actualPrice"/>
+        <result column="coupon_amount_" property="couponAmount"/>
+        <result column="plantform_fee_" property="plantformFee"/>
+        <result column="user_note_" property="userNote"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="pay_time_" property="payTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
     <!-- 表字段 -->
     <sql id="baseColumns">
          t.id_ as id
@@ -42,11 +42,11 @@
 
     <select id="detailById" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         SELECT
-            <include refid="baseColumns"/>,
-            p.trans_no_ as transNo,
-            p.fee_amt_ as feeAmt,
-            u.username_ as username,
-            u.phone_ as phone
+        <include refid="baseColumns"/>,
+        p.trans_no_ as transNo,
+        p.fee_amt_ as feeAmt,
+        u.username_ as username,
+        u.phone_ as phone
         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_
@@ -60,23 +60,22 @@
             p.pay_channel_ as payChannel
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_
-        <where>
-            <if test="param.id != null">
-                and t.id_ = #{param.id}
-            </if>
-            <if test="param.orderNo != null and param.orderNo != ''">
-                and t.order_no_ = #{param.orderNo}
-            </if>
-        </where>
+        where t.user_id_ = #{param.userId}
+        <if test="param.id != null">
+            and t.id_ = #{param.id}
+        </if>
+        <if test="param.orderNo != null and param.orderNo != ''">
+            and t.order_no_ = #{param.orderNo}
+        </if>
     </select>
 
     <select id="detailByOrderNo" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         SELECT
-            <include refid="baseColumns"/>,
-            p.trans_no_ as transNo,
-            p.fee_amt_ as feeAmt,
-            u.username_ as username,
-            u.phone_ as phone
+        <include refid="baseColumns"/>,
+        p.trans_no_ as transNo,
+        p.fee_amt_ as feeAmt,
+        u.username_ as username,
+        u.phone_ as phone
         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_
@@ -86,11 +85,11 @@
 
     <sql id="selectSql">
         SELECT
-            <include refid="baseColumns" />,
-            p.trans_no_ as transNo,
-            p.fee_amt_ as feeAmt,
-            u.username_ as username,
-            u.phone_ as phone
+        <include refid="baseColumns"/>,
+        p.trans_no_ as transNo,
+        p.fee_amt_ as feeAmt,
+        u.username_ as username,
+        u.phone_ as phone
         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_
@@ -125,11 +124,11 @@
             </if>
         </where>
         order by t.create_time_ desc
-        </sql>
+    </sql>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         <include refid="selectSql"/>
-	</select>
+    </select>
     <select id="selectList" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         <include refid="selectSql"/>
     </select>
@@ -142,24 +141,24 @@
     </select>
     <select id="getPendingOrder" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         SELECT
-            <include refid="baseColumns"/>,
-            p.trans_no_ as transNo,
-            p.pay_channel_ as payChannel
+        <include refid="baseColumns"/>,
+        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_
         where t.status_ in ('WAIT_PAY','PAYING')
         and t.user_id_ = #{param.userId}
         and exists (
-            select 1 from user_order_detail d where t.order_no_ = d.order_no_
-            and d.good_type_ = #{param.goodType}
-            <choose>
-                <when test="param.goodType != null and param.goodType == 'PRACTICE'">
-                    and d.merch_id_ = #{param.bizId}
-                </when>
-                <otherwise>
-                    and d.biz_id_ = #{param.bizId}
-                </otherwise>
-            </choose>
+        select 1 from user_order_detail d where t.order_no_ = d.order_no_
+        and d.good_type_ = #{param.goodType}
+        <choose>
+            <when test="param.goodType != null and param.goodType == 'PRACTICE'">
+                and d.merch_id_ = #{param.bizId}
+            </when>
+            <otherwise>
+                and d.biz_id_ = #{param.bizId}
+            </otherwise>
+        </choose>
         )
     </select>
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/UserOrderController.java

@@ -216,7 +216,12 @@ public class UserOrderController extends BaseController {
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "通过id查询详情", notes = "传入id")
     public HttpResponseResult<UserOrderVo> detail(@PathVariable("id") Long id) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
         UserOrder param = new UserOrder();
+        param.setUserId(user.getId());
         param.setId(id);
         UserOrderVo detail = userOrderService.detailApp(param);
         return succeed(detail);
@@ -228,7 +233,12 @@ public class UserOrderController extends BaseController {
     @GetMapping("/detailByOrderNo/{orderNo}")
     @ApiOperation(value = "通过订单号查询详情", notes = "传入orderNo")
     public HttpResponseResult<UserOrderVo> detailByOrderNo(@PathVariable("orderNo") String orderNo) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
         UserOrder param = new UserOrder();
+        param.setUserId(user.getId());
         param.setOrderNo(orderNo);
         UserOrderVo detail = userOrderService.detailApp(param);
         return succeed(detail);