有效状态

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/AppOrderPageDTO.java

@@ -236,16 +236,6 @@ public class AppOrderPageDTO implements Serializable {
     }
 
     public Integer getEffectiveState() {
-        Date now = new Date();
-        if(this.getOrderStatus() == 2){
-            if (now.before(this.beginTime)){
-                effectiveState = 1;
-            }else if (now.before(this.endTime)){
-                effectiveState = 2;
-            }else if (now.after(this.endTime)){
-                effectiveState = 3;
-            }
-        }
         return effectiveState;
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/AppOrderApiServiceImpl.java

@@ -79,6 +79,15 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
                     //需要取消订单
                     cancelAppOrder(dto.getId());
                 }
+                if (dto.getOrderStatus() == 2){
+                    if (now.before(dto.getBeginTime())){
+                        dto.setEffectiveState(1);
+                    }else if (now.before(dto.getEndTime())){
+                        dto.setEffectiveState(2);
+                    }else if (now.after(dto.getEndTime())){
+                        dto.setEffectiveState(3);
+                    }
+                }
             }
             orderPage.setResult(list);
         }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/AppOrderController.java

@@ -6,7 +6,6 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
-import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.licence.AppOrderCheckDTO;
@@ -14,7 +13,6 @@ import com.gic.haoban.manage.api.dto.licence.AppOrderNoticeDTO;
 import com.gic.haoban.manage.api.dto.licence.AppOrderPageDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.AppOrderPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.AppOrderQDTO;
-import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.licence.AppOrderApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.licence.AppOrderPageQO;