shawenguan 1 год назад
Родитель
Сommit
1d7875a51c
1 измененных файлов с 17 добавлено и 11 удалено
  1. 17 11
      Scripts/jhsh/jhshHelper.js

+ 17 - 11
Scripts/jhsh/jhshHelper.js

@@ -165,17 +165,6 @@ function handleCommonCoupon(){
     let MSPS_ENTITY = rspData.MSPS_ENTITY;
     let KHHK_ENTITY = rspData.KHHK_ENTITY;
     let detail = MSPS_ENTITY || KHHK_ENTITY;
-    if(detail){
-        let couponName = detail.Coupon_NAME+`#采集#`;
-        detail.Need_White_List = '0';
-        detail.Coupon_NAME = couponName;
-
-        let drawTmDescText = `${detail.Drw_Tm_Dsc}`;
-        drawTmDescText += `\n今日领取时间:${lk.formatDate(actStartDate, "HH:mm:ss")}`;
-        drawTmDescText += `\n当前系统时间:${newTimeStamp}`;
-        detail.Drw_Tm_Dsc = drawTmDescText;
-        detail.Remain_Num = '1';
-    }
 
     if(MSPS_ENTITY){
         let drawCntDescText = `${detail.Drw_Cnt_Dsc}`;
@@ -187,6 +176,11 @@ function handleCommonCoupon(){
         let actStartDate = lk.parseDate(detail.EFFECT_PERIOD_START, 'yyyyMMddHHmmss');
         actStartDate = new Date(actStartDate.getTime()-1000);
         detail.EFFECT_PERIOD_START = lk.formatDate(actStartDate, "yyyyMMddHHmmss");
+
+        let drawTmDescText = `${detail.Drw_Tm_Dsc}`;
+        drawTmDescText += `\n今日领取时间:${lk.formatDate(actStartDate, "HH:mm:ss")}`;
+        drawTmDescText += `\n当前系统时间:${newTimeStamp}`;
+        detail.Drw_Tm_Dsc = drawTmDescText;
     }
 
     if(KHHK_ENTITY){
@@ -194,6 +188,18 @@ function handleCommonCoupon(){
         drawCntDescText += `\n库存:${detail.Cmdty_Srpls_Num}/${surplusStock}`;
         drawCntDescText += `\n限制领取数量:${rspData.PERSON_GET_LIMIT}`;
         detail.Drw_Cnt_Dsc = drawCntDescText;
+
+        let drawTmDescText = `${detail.Drw_Tm_Dsc}`;
+        drawTmDescText += `\n当前系统时间:${newTimeStamp}`;
+        detail.Drw_Tm_Dsc = drawTmDescText;
+    }
+
+    if(detail){
+        let couponName = detail.Coupon_NAME+`#采集#`;
+        detail.Need_White_List = '0';
+        detail.Coupon_NAME = couponName;
+
+        detail.Remain_Num = '1';
     }
 
     if(perGetLimit < 0){