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

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

@@ -450,6 +450,10 @@ 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();
+        Date beginTime = new Date(dto.getBeginTime());
+        Date endTime = new Date(dto.getEndTime());
+        Date paidTime = new Date(dto.getPaidTime());
+        Date orderTime = new Date(dto.getOrderTime());
         appOrder.setOriginPrice(dto.getPrice());
         appOrder.setPaidPrice(dto.getPrice());
         appOrder.setUserNum(dto.getUserCount());
@@ -457,7 +461,10 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
         appOrder.setCreatorId(dto.getOperatorId());
         appOrder.setId(UniqueIdUtils.uniqueLong());
         appOrder.setWxEnterpriseId(wxEnterpriseId);
-        appOrder.setCreateTime(now);
+        appOrder.setBeginTime(beginTime);
+        appOrder.setEndTime(endTime);
+        appOrder.setPayTime(paidTime);
+        appOrder.setCreateTime(orderTime);
         appOrder.setUpdateTime(now);
         appOrder.setDeleteFlag(0);
         //默认6天支付有效期