Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui...

Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui into feature/20230327_public_takeaway

src/pages/GoodsManage/Takeaway/index.jsx

@@ -74,20 +74,23 @@ const Takeaway = options => {
 
   const onSortEnd = async ({ oldIndex, newIndex }) => {
     if (oldIndex !== newIndex) {
-      const newData = arrayMoveImmutable(tableData.slice(), oldIndex, newIndex).filter(el => !!el);
-      const skuSorts = newData.map((item, index) => ({
-        skuId: item.skuId,
-        sort: pageSize * (pageNo - 1) + index + 1,
-      }));
+      const sourceGoods = tableData[oldIndex];
+      const targetGoods = tableData[newIndex];
+      // const newData = arrayMoveImmutable(tableData.slice(), oldIndex, newIndex).filter(el => !!el);
+      // const skuSorts = newData.map((item, index) => ({
+      //   skuId: item.skuId,
+      //   sort: pageSize * (pageNo - 1) + index + 1,
+      // }));
+      if (sourceGoods && sourceGoods.skuId && targetGoods && targetGoods.skuId) {
         const params = {
           storageRackId: groupId,
-        type: 1,
           shopId,
-        skuSorts,
+          sourceSkuId: sourceGoods.skuId,
+          targetSkuId: targetGoods.skuId,
         };
         await apiSortTakeawayGoods(params);
         getDataList(pageNo, pageSize);
-      // setTableData(newData);
+      }
     }
   };
 

src/pages/GoodsManage/service.js

@@ -306,8 +306,18 @@ export async function apiTakeawayGoods(params) {
   });
 }
 // 外卖商品排序
+// export async function apiSortTakeawayGoods(data) {
+//   return request.post('/api/merchants/products/sku/batchSort', {
+//     prefix: goodsApi,
+//     data,
+//   });
+// }
+/**
+ * 外卖商品排序
+ * yapi: http://yapi.quantgroups.com/project/389/interface/api/58174
+ */
 export async function apiSortTakeawayGoods(data) {
-  return request.post('/api/merchants/products/sku/batchSort', {
+  return request.post('/api/merchants/products/sku/range/sort', {
     prefix: goodsApi,
     data,
   });