root/allLikeMall
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request '修改积分商城订单记录时间排序' (#51) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #51
This commit is contained in:
root 2024-10-17 11:24:41 +08:00
commit b9f0591578
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-admin-vue3/src/views/mall/promotion/point/activity/PointActivityForm.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog v-model="dialogVisible" :title="dialogTitle" width="65%"> <Dialog v-model="dialogVisible" :title="dialogTitle" width="95%">
<Form <Form
ref="formRef" ref="formRef"
v-loading="formLoading" v-loading="formLoading"

2
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
View File

@ -136,6 +136,6 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
" inner join trade_order_item b on a.id = b.order_id " + " inner join trade_order_item b on a.id = b.order_id " +
" inner join (SELECT sort, label, value, dict_type, css_class FROM system_dict_data WHERE dict_type = 'trade_order_status') d on d.sort = a.status "+ " inner join (SELECT sort, label, value, dict_type, css_class FROM system_dict_data WHERE dict_type = 'trade_order_status') d on d.sort = a.status "+
" inner join product_spu c on b.spu_id = c.id " + " inner join product_spu c on b.spu_id = c.id " +
" where a.user_id = #{userId} and a.use_point > 0 ") " where a.user_id = #{userId} and a.use_point > 0 order by a.create_time ASC ")
List<AppPointOrderVO> getPointOrder(Long userId); List<AppPointOrderVO> getPointOrder(Long userId);
} }