From 02f9c97b283eea9a986c2dc71d8b6094b90402fc Mon Sep 17 00:00:00 2001
From: zhangds <c664256297.com>
Date: Tue, 1 Nov 2022 18:25:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8D=A1=E5=AF=86=E5=85=91=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UseCouponAddEdit/index.jsx | 20 +-------------------
 src/pages/plan/add/add.js                 |  2 ++
 src/pages/plan/add/edit.js                |  8 +++++++-
 src/pages/plan/add/step2.js               | 11 +++++++++++
 src/tools/index.js                        | 22 ++++++++++++++++++++++
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/components/UseCouponAddEdit/index.jsx b/src/components/UseCouponAddEdit/index.jsx
index 71474741..a848d782 100644
--- a/src/components/UseCouponAddEdit/index.jsx
+++ b/src/components/UseCouponAddEdit/index.jsx
@@ -22,7 +22,7 @@ import _ from "lodash";
 import { isSameDay } from "date-fns";
 import { isAmount } from "@/tools/validate";
 import { mulNum } from "@/tools/number";
-import { knockGoldFun } from "@/tools/index";
+import { knockGoldFun, submitIsKm } from "@/tools/index";
 import {
   handelResponse,
   queryKeyBatch,
@@ -602,24 +602,6 @@ const UseCouponAddEdit = forwardRef((props, ref) => {
     });
   };
 
-  // 判断卡密是否能提交
-  const submitIsKm = (data) => {
-    let visible = true;
-    let deDateTime = JSON.parse(sessionStorage.getItem("datetime"));
-    let end_time = new Date(deDateTime[1]).getTime(); // 计划结束时间
-    // 校验 卡密商品数据 结束时间
-    let legal_km = data.filter((item) => item.product_type === 2);
-    for (let i = 0; i < legal_km.length; i++) {
-      let end_time_km = new Date(legal_km[i].end_time).getTime();
-      if (end_time < end_time_km) {
-        Notify.error("卡密兑换有效期，不能超过计划时间");
-        return false;
-      }
-    }
-
-    return visible;
-  };
-
   const onAuditSubmit = () => {
     setState({
       isLoadingBtn: true,
diff --git a/src/pages/plan/add/add.js b/src/pages/plan/add/add.js
index f8af64e4..28ad4f15 100644
--- a/src/pages/plan/add/add.js
+++ b/src/pages/plan/add/add.js
@@ -104,6 +104,8 @@ export default class add extends React.Component {
       payment_direction: this.state.payment_direction[this.state.paytype - 1],
     };
 
+    console.log("大提交 =>", data);
+    return;
     approvals(plan_id, data).then((res) => {
       handelResponse(
         res,
diff --git a/src/pages/plan/add/edit.js b/src/pages/plan/add/edit.js
index 4ed149a8..44a14eb7 100644
--- a/src/pages/plan/add/edit.js
+++ b/src/pages/plan/add/edit.js
@@ -231,6 +231,7 @@ export default class add extends React.Component {
     sessionStorage.setItem("keyType", type);
     return req.keys;
   }
+
   async onNextStep() {
     if (this.state.curstep >= 1) {
       if (await this.refs.step1.submit()) {
@@ -253,7 +254,6 @@ export default class add extends React.Component {
 
         if (data) {
           temp.push(data);
-          console.log("大提交 =>", temp);
         } else {
           return;
         }
@@ -271,6 +271,10 @@ export default class add extends React.Component {
       };
       let plan_id = sessionStorage.getItem("plan_id");
 
+      console.log("key批次提交 =>", obj);
+      // 校验key批次卡密时间
+
+      return;
       await addPlanStep(plan_id, obj).then((res) => {
         handelResponse(
           res,
@@ -477,6 +481,8 @@ export default class add extends React.Component {
         payment_direction: this.state.payment_direction[this.state.paytype - 1],
       };
 
+      console.log("大提交 =>", data);
+      return;
       approvals(plan_id, data).then((res) => {
         handelResponse(
           res,
diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js
index 5c63c3a6..1f11d62d 100644
--- a/src/pages/plan/add/step2.js
+++ b/src/pages/plan/add/step2.js
@@ -34,6 +34,7 @@ import UseCouponAddEdit from "@/components/UseCouponAddEdit"; // 优惠券
 import UseExchangeAddEdit from "@/components/UseExchangeAddEdit"; // 兑换码
 import moment from "moment";
 import { uploadImg } from "@/assets/api.js";
+import { submitIsKm } from "@/tools/index";
 import "./add.less";
 import { isSameDay } from "date-fns";
 import _ from "lodash";
@@ -294,6 +295,16 @@ export default class acclist extends React.Component {
         data.coupon = param;
         data.mobile_excel = this.state.mobile_excel;
         data.mobile_repeat = this.state.mobile_repeat;
+        console.log("data =>", data);
+
+        // 校验 卡密时间判断
+
+        for (let i = 0; i < param.length; i++) {
+          if (submitIsKm(param[i].product.legal) === false) {
+            return valide;
+          }
+        }
+
         return data;
       }
     }
diff --git a/src/tools/index.js b/src/tools/index.js
index 2117281d..8d1207f2 100644
--- a/src/tools/index.js
+++ b/src/tools/index.js
@@ -1,4 +1,5 @@
 import { divNum } from "./number";
+import { Notify } from "zent";
 
 // 判断
 const kgType = (item) => {
@@ -33,3 +34,24 @@ export const knockGoldFun = (item) => {
   table_obj.create_time = item.create_time; // 创建时间
   return table_obj;
 };
+
+// 卡密判断
+export const submitIsKm = (data) => {
+  console.log("submitIsKm =>", data);
+  let visible = true;
+  let deDateTime = JSON.parse(sessionStorage.getItem("datetime"));
+  console.log("计划时间 =>", deDateTime[1]);
+
+  let end_time = new Date(deDateTime[1]).getTime(); // 计划结束时间
+  // 校验 卡密商品数据 结束时间
+  let legal_km = data.filter((item) => Number(item.product_type) === 2);
+  for (let i = 0; i < legal_km.length; i++) {
+    console.log("卡密时间 =>", legal_km[i].end_time);
+    let end_time_km = new Date(legal_km[i].end_time).getTime();
+    if (end_time < end_time_km) {
+      Notify.error("卡密兑换有效期，不能超过计划时间");
+      return false;
+    }
+  }
+  return visible;
+};