scottpan/MER-2.2_2601
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 平台商户订单列表支持显示使用积分

Browse Source 
补齐商户订单分页接口的 useIntegral 返回字段，并在平台商户订单列表新增“使用积分”列与列显隐配置，便于运营查看积分抵扣使用情况。

Made-with: Cursor
This commit is contained in:
AriadenCaseblg
2026-04-12 11:05:36 +08:00
parent b3d80c3c50
commit b097837aa3
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml
View File

@@ -124,7 +124,7 @@
<select id="getMerchantAdminPage" resultType="com.zbkj.common.response.MerchantOrderPageResponse" parameterType="Map">
select o.mer_id as merId, o.order_no as orderNo, o.uid, o.pay_price as payPrice, o.pay_type as payType, o.paid,
o.status, o.refund_status as refundStatus, o.is_user_del as isUserDel, o.total_num as totalNum,
o.status, o.refund_status as refundStatus, o.is_user_del as isUserDel, o.total_num as totalNum, o.use_integral as useIntegral,
o.cancel_status as cancelStatus, o.level, o.type, o.create_time as createTime,o.second_type as secondType, o.group_buy_record_status as groupBuyRecordStatus,
o.cancel_status as cancelStatus, o.level, o.type, o.create_time as createTime,o.second_type as secondType,
mo.merchant_remark as merchantRemark, mo.verify_code as verifyCode, mo.shipping_type as shippingType,