From a7b10c7fb28552e71e980d97a6b23c21cbcb212a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 14:37:47 +0800
Subject: [PATCH] 20210528

---
 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
index ab06c0e..9c8c051 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
@@ -110,6 +110,14 @@
                 if(ydProductVo.getSurplusT().compareTo(BigDecimal.ZERO) < 1) {
                     ydProductVo.setStatus(2);
                 }
+
+                Integer shelvesDays = ydProductVo.getShelvesDays();
+                String proUnit = ydProductVo.getProUnit();
+                if(shelvesDays == 0){
+                    ydProductVo.setShelvesDaysStr("待定");
+                }else{
+                    ydProductVo.setShelvesDaysStr(proUnit+"+"+shelvesDays);
+                }
             }
         }
 
@@ -135,10 +143,19 @@
         /**
          *产出规则
          */
-        Date date = DateUtil.date();
-        ydProductVo.setNowTime(date);
         //上架天数
         Integer shelvesDays = ydProductVo.getShelvesDays();
+        String proUnit = ydProductVo.getProUnit();
+        if(shelvesDays == 0){
+            ydProductVo.setGetType(2);
+            ydProductVo.setShelvesDaysStr("待定");
+        }else{
+            ydProductVo.setGetType(1);
+            ydProductVo.setShelvesDaysStr(proUnit+"+"+shelvesDays);
+        }
+
+        Date date = DateUtil.date();
+        ydProductVo.setNowTime(date);
         Date workTime = DateUtil.offsetDay(date, shelvesDays);
         ydProductVo.setWorkTime(workTime);
         //服务周期

--
Gitblit v1.9.1