Merge branch 'feature/xgh/11月零散迭代' into developer

# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/offline/OfflinePreInfoVO.java

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/offline/OfflinePreController.java

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.DateUtil;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.manage.web.qo.offline.PageOfflinePreQO;
 import com.gic.haoban.manage.web.qo.offline.WriteOffOfflinePreQO;
@@ -16,18 +18,23 @@ import com.gic.marketing.pro.api.qdto.offline.PageOfflinePreQDTO;
 import com.gic.marketing.pro.api.qdto.offline.WriteOffOfflinePreQDTO;
 import com.gic.marketing.pro.api.service.offline.OfflinePreApiService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 好办小程序-线下预约
  */
 @Controller
 public class OfflinePreController {
-
+    private final Logger logger = LogManager.getLogger(this.getClass());
     @Autowired
     private OfflinePreApiService offlinePreApiService;
 
@@ -39,11 +46,41 @@ public class OfflinePreController {
     @RequestMapping("/page-offline-pre")
     @ResponseBody
     public RestResponse<Page<OfflinePreInfoVO>> pageOfflinePre(@RequestBody PageOfflinePreQO qo){
-
-        ServiceResponse<Page<OfflinePreInfoDTO>> offlinePreInfoDTO = offlinePreApiService.pageOfflinePre(JSONObject.parseObject(JSONObject.toJSONString(qo), PageOfflinePreQDTO.class));
-        return JSONObject.parseObject(JSONObject.toJSONString(offlinePreInfoDTO, SerializerFeature.WriteMapNullValue), RestResponse.class);
+        ServiceResponse<Page<OfflinePreInfoDTO>> resp = offlinePreApiService.pageOfflinePre(JSONObject.parseObject(JSONObject.toJSONString(qo), PageOfflinePreQDTO.class));
+        Page<OfflinePreInfoVO> pageVO = new Page<>() ;
+        pageVO.setCurrentPage(resp.getResult().getCurrentPage());
+        pageVO.setTotalCount(resp.getResult().getTotalCount());
+        pageVO.setPageSize(resp.getResult().getPageSize());
+        if(null != resp.getResult() && null != resp.getResult().getResult()) {
+            List<OfflinePreInfoDTO> list = resp.getResult().getResult() ;
+            List<OfflinePreInfoVO> voList = new ArrayList<>() ;
+            for(OfflinePreInfoDTO dto : list) {
+                OfflinePreInfoVO vo = EntityUtil.changeEntityByJSON(OfflinePreInfoVO.class,dto) ;
+                if(null != qo.getType() && qo.getType()==1) {
+                    if ((dto.getPreTime().getTime() < System.currentTimeMillis() || this.getAheadSignFlag(dto.getAheadSignFlag()) == 1)
+                            && DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() >= DateUtil.getStartTimeOfDay().getTime()) {
+                        vo.setCanSign(1);
+                    } else {
+                        if (DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() < DateUtil.getStartTimeOfDay().getTime()) {
+                            logger.info("已过期");
+                            continue;
+                        } else if (this.getAheadSignFlag(dto.getAheadSignFlag()) == 0 && dto.getPreTime().getTime() > System.currentTimeMillis()) {
+                            vo.setReason("不可提前签到");
+                        }
+                    }
+                }
+                voList.add(vo) ;
+            }
+            pageVO.setResult(voList);
+        }
+        return RestResponse.successResult(pageVO) ;
+    }
+    private int getAheadSignFlag(Integer flag) {
+        if(null == flag) {
+            return  1 ;
+        }
+        return flag ;
     }
-
     /**
      * 获取预约详情
      * @param offlinePreId 预约ID