From 43b9a301e9ca612301a4848303d5f6825bbce583 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Wed, 28 Sep 2022 01:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=9C=9F=E5=A7=94=E6=89=98=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8A=E6=9E=B6=E3=80=81=E4=B8=8B=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/service/impl/GoodsServiceImpl.java   | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index 6b3f889..c47e660 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -539,19 +539,20 @@ public class GoodsServiceImpl implements GoodsService {
                     int istatus = 0;
                     if (sdjson.getInteger("status") == 1 || sdjson.getInteger("status") == 4 ||
                             sdjson.getInteger("status") == 5) {
-                        istatus = 1;
+                        istatus = 1;//上架
                     } else if (sdjson.getInteger("status") == 2) {
-                        istatus = 2;
+                        istatus = 2; //下架
                     } else {
-                        istatus = 4;
+                        istatus = 4;//失效
                     }
                     // 取今年的年份数字
                     Calendar calendar = Calendar.getInstance();
                     int iyear = calendar.get(Calendar.YEAR);
                     // 组装到goods对象
                     Goods goods = new Goods();
+                    //提取和处理，委托周期
                     String contractualPeriod = nsdjson.getString("contractualPeriod");
-                    int iperiod = 0;
+                    int iperiod = ApiGoodsUtils.convertProid(contractualPeriod);
                     //商品起止时间
                     String cstart = nsdjson.getString("contractualPeriodStart");
                     String curTime = new SimpleDateFormat("HH:mm:ss").format(new Date());
@@ -575,7 +576,21 @@ public class GoodsServiceImpl implements GoodsService {
                                 Date fwtEnd= DateUtils.daysAgoOrAfter(wtEnd,fdays);
                                 cend = fwtEnd.toString();
                             } catch (Exception ex) {
-                                ex.printStackTrace();
+                                log.error("一次性委托日期转码出错："+ex.getStackTrace());
+                            }
+                        }
+                        // 周期委托
+                        if(iperiod==3){
+                            //当前时间
+                            SimpleDateFormat nowDateSdf = new SimpleDateFormat("yyyy-MM-dd");
+                            String nowStr = nowDateSdf.format(new Date());
+                            // 判断是否为当前时间 上架状态
+                            if(nowStr.equals(cstart)){
+                                istatus=1;
+                            }
+                            // 到期自动下架
+                            if(nowStr.equals(cend)){
+                                istatus=2;
                             }
                         }
                     }