Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-02-28 69283b5a4559509187516355602e32e4bdac9d5d

 admin/src/api/business/combo.js

@@ -10,6 +10,15 @@
    trim: true
  })
}
export function comboUpdatePost(data) {
  return request.post('/business/discount/updStatus', data, {
    trim: true
  })
}

export function comboDelPost(id) {
  return request.get(`/business/discount/delete/${id}`)
}
export function comboListPost(data) {
  return request.post('/business/discount/page', data, {
    trim: true
@@ -34,7 +43,7 @@
}

export function comboReDetailPost(params) {
  return request.get('/business/goodsorder/getGoodsorderCanBanlanceDTO', {params})
  return request.get('/business/goodsorder/getGoodsorderCanBanlanceDTO', { params })
}
export function comboOrderRefundPost(data) {
  return request.post('/business/goodsorder/backGoodsorder', data, {
@@ -42,7 +51,7 @@
  })
}
export function comboOrderDetailPost(params) {
  return request.get('/business/goodsorder/discountOrderDetail', {params})
  return request.get('/business/goodsorder/discountOrderDetail', { params })
}

export function comboListOrderEx(data) {
@@ -50,4 +59,34 @@
    trim: true,
    download: true
  })
}

export function comboSalePage(data) {
  return request.post('/business/discountMember/page', data, {
    trim: true
  })
}
export function comboSaleEx(data) {
  return request.post('/business/discountMember/exportExcel', data, {
    trim: true,
    download: true
  })
}
export function comboSaleAdjust(data) {
  return request.post('/business/discountMember/adjust', data, {
    trim: true
  })
}
export function comboSaleCancel(data) {
  return request.post('/business/discountMember/cancel', data, {
    trim: true
  })
}
export function comboSalerDetailPost(id) {
  return request.get('/business/discountMember/' + id)
}
export function discountLogLog(data) {
  return request.post('/business/discountLog/page', data, {
    trim: true
  })
}