Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer

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

@@ -173,13 +173,13 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
             //判断订单状态，支付时间已过的订单的需要更改订单状态为已过期
             for (LicenceOrderPageDTO dto : list){
                 Date now = new Date();
-                if (dto.getExpireTime().before(now) && dto.getOrderStatus() == 0){
+                if (null!=dto.getExpireTime() && dto.getExpireTime().before(now) && dto.getOrderStatus() == 0){
                     dto.setOrderStatus(3);
                     updateLicenceOrderType(dto.getOrderId(), 3,dto.getEnterpriseId(), dto.getWxEnterpriseId(), "系统",1);
                     //取消企业微信订单
                     cancelQywxOrder(dto.getOrderId());
                 }
-                if (dto.getQywxExpireTime().before(now) && dto.getQywxOrderStatus() == 0){
+                if (null!=dto.getQywxExpireTime() && dto.getQywxExpireTime().before(now) && dto.getQywxOrderStatus() == 0){
                     dto.setQywxOrderStatus(3);
                     updateLicenceOrderType(dto.getOrderId(), 3,dto.getEnterpriseId(), dto.getWxEnterpriseId(), "系统",0);
                 }