订单详情信息

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

@@ -148,6 +148,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     @Autowired
     private UserOrderService userOrderService;
 
+    @Autowired
+    private TenantAlbumPurchaseService tenantAlbumPurchaseService;
+
     //验证订单是否可以下单,获取订单金额信息
     private static final Map<GoodTypeEnum, Function<OrderReq.OrderReqInfo, HttpResponseResult<OrderCreateRes>>> orderCreate = new HashMap<>();
     //插入订单后执行
@@ -262,6 +265,15 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             userOrderVo.setDiscountPrice(BigDecimal.valueOf(couponOrderWrapper.getDiscountedPrices()));
 
             List<UserOrderDetailVo> userOrderDetailVos = getUserOrderDetailVos(Lists.newArrayList(userOrderVo.getOrderNo()));
+
+            // 设置recordId
+            userOrderDetailVos.forEach(o -> {
+                if (o.getGoodType().equals(GoodTypeEnum.TENANT_ALBUM)) {
+                    TenantAlbumPurchase albumPurchase = tenantAlbumPurchaseService.getByOrderNo(userOrderVo.getOrderNo());
+                    o.getBizInfo().setRecordId(albumPurchase.getId());
+                }
+            });
+
             userOrderVo.setOrderDetailList(userOrderDetailVos);
         }
         return userOrderVo;

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

@@ -88,5 +88,8 @@ public class UserOrderDetailVo extends UserOrderDetail {
 
         @ApiModelProperty("机构专辑有效时长")
         private Integer bizValidTime;
+
+        @ApiModelProperty("购买关联记录ID")
+        private Long recordId;
     }
 }

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

@@ -99,13 +99,18 @@
             p.payment_no_ as paymentNo
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_ and (p.status_ = 'pending' or p.status_ = 'succeeded')
-        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>
+        <where>
+            <if test="param.userId != null">
+                and t.user_id_ = #{param.userId}
+            </if>
+            <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>
+
     </select>
 
     <sql id="selectSql">

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

@@ -214,7 +214,7 @@ public class UserOrderController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         UserOrder param = new UserOrder();
-        param.setUserId(user.getId());
+//        param.setUserId(user.getId());
         param.setOrderNo(orderNo);
         UserOrderVo detail = userOrderService.detailApp(param);
         return succeed(detail);