dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
齐天大圣 2024-10-31 10:28:37 +08:00
parent 2c68d58198
commit 2246eca9ee
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -88,15 +88,14 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" style="margin-right: 0px" prop="status"> <el-form-item label="" prop="paymentChannel">
<el-select <el-select v-model="queryParams.status" placeholder="请选择员工" clearable>
v-model="queryParams.status" <el-option
clearable v-for="dicts in this.staffList"
placeholder="请选择员工" :key="dicts.userId"
> :label="dicts.realName"
<el-option label="已支付" value="paid"/> :value="dicts.userId"
<el-option label="未支付" value="unpaid"/> />
<el-option label="已退款" value="refund"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="status"> <el-form-item label="" prop="status">

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
View File

@ -865,14 +865,16 @@
SELECT SELECT
ai.*, ai.*,
mu.NAME AS userName, mu.NAME AS userName,
mc.merchant_name as merchantName mc.merchant_name as merchantName,
mt.real_name as createBy
FROM FROM
all_order_info ai all_order_info ai
LEFT JOIN mt_user mu ON ai.user_id = mu.id LEFT JOIN mt_user mu ON ai.user_id = mu.id
LEFT JOIN merchant_config mc on mc.id = ai.m_id LEFT JOIN merchant_config mc on mc.id = ai.m_id
where left join mt_staff mt on ai.create_by=mt.id
where 1=1
<if test="obj.storeId != null and obj.storeId != ''"> <if test="obj.storeId != null and obj.storeId != ''">
ai.store_id = #{obj.storeId} and ai.store_id = #{obj.storeId}
</if> </if>
<if test="obj.storeId != null and obj.storeId != ''"> <if test="obj.storeId != null and obj.storeId != ''">
and ai.store_id = #{obj.storeId} and ai.store_id = #{obj.storeId}