Merge remote-tracking branch 'origin/feature/六月需求'

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

 package com.gic.haoban.manage.service.service.out.impl.licence;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -450,10 +451,24 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
     private TabHaobanAppOrder toTabHaobanAppOrder(AppOrderInfoResponseDTO dto,String wxEnterpriseId ){
         TabHaobanAppOrder appOrder = JSONObject.parseObject(JSONObject.toJSONString(dto), TabHaobanAppOrder.class);
         Date now = new Date();
+        if (ObjectUtil.isNotNull(dto.getBeginTime())){
             Date beginTime = new Date(dto.getBeginTime());
+            appOrder.setBeginTime(beginTime);
+        }
+        if(ObjectUtil.isNotNull(dto.getEndTime())){
             Date endTime = new Date(dto.getEndTime());
+            appOrder.setEndTime(endTime);
+        }
+        if(ObjectUtil.isNotNull(dto.getPaidTime())){
             Date paidTime = new Date(dto.getPaidTime());
+            appOrder.setPayTime(paidTime);
+        }
+        if(ObjectUtil.isNotNull(dto.getOrderTime())){
             Date orderTime = new Date(dto.getOrderTime());
+            appOrder.setCreateTime(orderTime);
+        }else {
+            appOrder.setCreateTime(now);
+        }
         appOrder.setOriginPrice(dto.getPrice());
         appOrder.setPaidPrice(dto.getPrice());
         appOrder.setUserNum(dto.getUserCount());
@@ -461,10 +476,6 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
         appOrder.setCreatorId(dto.getOperatorId());
         appOrder.setId(UniqueIdUtils.uniqueLong());
         appOrder.setWxEnterpriseId(wxEnterpriseId);
-        appOrder.setBeginTime(beginTime);
-        appOrder.setEndTime(endTime);
-        appOrder.setPayTime(paidTime);
-        appOrder.setCreateTime(orderTime);
         appOrder.setUpdateTime(now);
         appOrder.setDeleteFlag(0);
         //默认6天支付有效期