解决冲突

src/api/inviteFirend.js

@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+/**
+ * 获取店铺设置
+ * @returns
+ */
+export function byShopId() {
+  let shopId = localStorage.getItem("shopId");
+  return request({
+    url: `/tbShopShare/byShopId`,
+    method: "get",
+    params: {
+      shopId: shopId
+    }
+  });
+}
+
+/**
+ * 分享-新增/编辑
+ * @returns
+ */
+export function tbShopShare(data) {
+  return request({
+    url: "/tbShopShare",
+    method: data.id ? "put" : "post",
+    data
+  });
+}
+
+/**
+ * 邀请记录
+ * @returns
+ */
+export function byShare(data) {
+  let shopId = localStorage.getItem("shopId");
+  return request({
+    url: `/tbShopShare/byShare`,
+    method: "post",
+    data: {
+      shopId: shopId,
+      ...data
+    }
+  });
+}

src/api/table.js

@@ -471,4 +471,50 @@ export function $activateByOrderId(data) {
       ...data
     }
   });
+}
+
+//会员积分列表
+export function $returnMemberPointsList(data) {
+  return request({
+    url: '/api/points/member-points/page',
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+
+// 会员积分账户信息
+export function $returnMemberPoints(memberId) {
+  return request({
+    url: '/api/points/member-points/'+memberId,
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+//002-获取订单可用积分及抵扣金额（支付页面使用）
+export function $calcUsablePoints(data) {
+  return request({
+    url: '/api/points/member-points/calc-usable-points',
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+// 003-根据积分计算可抵扣金额
+export function $calcDeDuctionPoints(data) {
+  return request({
+    url: '/api/points/member-points/calc-deduction-amount',
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
 }