Merge branch 'feature/activity' of...

Merge branch 'feature/activity' of https://git.yidian-inc.com:8021/bp/op-web-service into feature/activity

server/controllers/groupmeal.js

@@ -140,7 +140,7 @@ exports.orderRefundReject = async ctx => {
 
 // 获取订单管理列表
 exports.newGetOrderList = async ctx => {
-  const url = `${GROUPMEAL_URI}/order/background/order_list`;
+  const url = `${GROUPMEAL_URI}/order/oldbackground/op_order_list`;
   const opts = {
     url,
     method: "GET"

server/router.js

@@ -102,7 +102,7 @@ router.get(`${API_VERSION}/order/oldbackground/order_refund_reject`, groupmeal.o
 router.post(`${API_VERSION}/order/oldbackground/order_refund`, groupmeal.orderRefund);
 
 // 新订单管理
-router.get(`${API_VERSION}/order/background/order_list`, groupmeal.newGetOrderList);
+router.get(`${API_VERSION}/order/oldbackground/op_order_list`, groupmeal.newGetOrderList);
 router.get(`${API_VERSION}/order/background/marketing_list`, groupmeal.newGetMarketingList);
 router.get(`${API_VERSION}/order/background/goods_list`, groupmeal.newGetGoodsList);
 router.get(`${API_VERSION}/order/background/sub_shop_list`, groupmeal.newGetSubShopList);

src/pages/Groupmeal/newOrderManagement/index.vue

@@ -181,7 +181,6 @@
           />
         </el-tab-pane>
         <el-tab-pane label="售后" name="afterSale">
-          <!-- start -->
           <el-table :data="orderTableData" border stripe style="width: 100%">
             <el-table-column prop="marketing_name" label="活动名称">
               <template #default="scope">
@@ -267,7 +266,6 @@
             :page-size="orderQueryObj.page_size"
             :total="totalNum"
           />
-          <!-- end -->
         </el-tab-pane>
       </el-tabs>
       <!-- 导出弹窗 -->
@@ -291,19 +289,7 @@
               >配送表</el-button
             ></a
           >
-          <!-- <el-checkbox-group v-model="exportSel">
-            <el-checkbox
-              v-for="i in exportSelOpt"
-              :label="i.type"
-              :key="i.type"
-              >{{ i.name }}</el-checkbox
-            >
-          </el-checkbox-group> -->
         </el-form-item>
-        <!-- <el-form-item class="exportBtn">
-          <el-button @click="exportShow = false">取消</el-button>
-          <a :href="exportURL" style="margin-left: 20px"><el-button type="primary" @click="exportShow = false">确定导出</el-button></a>
-        </el-form-item> -->
       </el-dialog>
       <!-- 退款弹窗 -->
       <el-dialog title="退款" width="30%" top="10%" v-model="refundShow">
@@ -366,17 +352,16 @@
 <script>
 import Layout from "../layout/index.vue";
 import {
-  getOrderList,
-  getMarketingList,
-  getGoodsList,
-  getSubShopList,
-  orderPrint,
-  orderItemList,
-  orderRefundReject,
-  refundOrder,
-  getOrderExportURL,
+  newGetOrderList,
+  newGetMarketingList,
+  newGetGoodsList,
+  newGetSubShopList,
+  newOrderPrint,
+  newOrderItemList,
+  newOrderRefundReject,
+  newRefundOrder,
+  newGetOrderExportURL,
 } from "@/service/Groupmeal/groupmeal";
-// import page from "../../components/Pagination.vue";
 import page from "../components/Pagination/index.vue";
 
 export default {
@@ -448,13 +433,6 @@ export default {
       exportShow: false,
       exportType: "",
 
-      // exportSel: [],
-      // exportSelOpt: [
-      //   { type: "1", name: "总表" },
-      //   { type: "2", name: "商品表" },
-      //   { type: "3", name: "配送表" },
-      // ],
-
       // 表格数据
       orderTableData: [],
       totalNum: null, //总条数
@@ -480,13 +458,13 @@ export default {
 
   computed: {
     exportURL1() {
-      return getOrderExportURL(this.orderQueryObj.marketing_id, "1");
+      return newGetOrderExportURL(this.orderQueryObj.marketing_id, "1");
     },
     exportURL2() {
-      return getOrderExportURL(this.orderQueryObj.marketing_id, "2");
+      return newGetOrderExportURL(this.orderQueryObj.marketing_id, "2");
     },
     exportURL3() {
-      return getOrderExportURL(this.orderQueryObj.marketing_id, "3");
+      return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3");
     },
   },
 
@@ -498,7 +476,7 @@ export default {
     // 获取活动名称
     async getMarketingListMet() {
       try {
-        const res = await getMarketingList();
+        const res = await newGetMarketingList();
         this.activityNameArr = res.result;
       } catch (error) {
         this.$message.error("发生未知错误,请稍后再试一下吧~~~");
@@ -512,7 +490,7 @@ export default {
       const params = {
         marketing_id: val,
       };
-      const res = await getGoodsList(params); // 商品名称
+      const res = await newGetGoodsList(params); // 商品名称
       this.getSubShopListMet(val) //自提点
       // const res = await getSubShopList(params);
       this.tradeNameArr = res.result;
@@ -526,7 +504,7 @@ export default {
         if(params){
            marketing_id = params
         }
-        const res = await getSubShopList({'marketing_id':marketing_id});
+        const res = await newGetSubShopList({'marketing_id':marketing_id});
         this.selLiftPoinArr = res.result;
       } catch (error) {
         this.$message.error("发生未知错误,请稍后再试一下吧~~~");
@@ -578,7 +556,7 @@ export default {
         // marketing_id: "1NJETU",
         force_print: forcePrint ? "1" : "",
       };
-      const res = await orderPrint(params);
+      const res = await newOrderPrint(params);
       return res;
     },
 
@@ -634,7 +612,7 @@ export default {
             this.orderQueryObj.marketing_id =  this.$route.query.marketing_id;
       }
       try {
-        const res = await getOrderList(this.orderQueryObj);
+        const res = await newGetOrderList(this.orderQueryObj);
         this.goodsNum = res.goods_num; // 商品共计
         this.totalNum = res.count; // 商品总数
         this.orderTableData = res.result;
@@ -664,7 +642,7 @@ export default {
       const params = {
         order_id: val.order_id,
       };
-      const res = await orderRefundReject(params);
+      const res = await newOrderRefundReject(params);
 
       if (res.code === 0) {
         this.$message({
@@ -698,7 +676,7 @@ export default {
       const params = {
         order_id: val.order_id,
       };
-      const res = await orderItemList(params);
+      const res = await newOrderItemList(params);
       this.refundGoods = res.result;
       for (var i in res.result) {
         this.refundGoods[i].refundableQuantity = Number(
@@ -749,7 +727,7 @@ export default {
       //   this.$message.error("请选择退款商品");
       //   return;
       // }
-      const res = await refundOrder(orderId, itemsToRefund);
+      const res = await newRefundOrder(orderId, itemsToRefund);
       if (res.code === 0) {
         this.$message.success("退款成功");
         this.refundShow = false;

src/service/Groupmeal/groupmeal.js

@@ -119,7 +119,7 @@ export function getOrderExportURL(eventId, type) {
 
 // 获取订单列表
 export async function newGetOrderList(params) {
-  const res = await axios.get("/api/v1/order/background/order_list", {
+  const res = await axios.get("/api/v1/order/oldbackground/op_order_list", {
     params
   });
   return res;
@@ -147,14 +147,6 @@ export async function newGetSubShopList(params) {
   return res;
 }
 
-// 导出订单
-export async function newOrderExport(params) {
-  const res = await axios.get("/api/v1/order/background/order_export", {
-    params
-  });
-  return res;
-}
-
 // 打印订单
 export async function newOrderPrint(params) {
   const res = await axios.get("/api/v1/order/background/order_print", {
@@ -173,10 +165,6 @@ export async function newOrderItemList(params) {
 
 // 订单退款
 export async function newRefundOrder(orderId, itemsToRefund) {
-  // const params = {
-  //   order_id: orderId,
-  //   refund_list: itemsToRefund
-  // };
   const res = await axios.post("/api/v1/order/background/order_refund", {
     order_id: orderId,
     refund_list: itemsToRefund