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

# Conflicts:
#	haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderVO.java

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/LicenceOrderController.java

@@ -196,6 +196,18 @@ public class LicenceOrderController {
         }
         return RestResponse.failure(response.getCode(), response.getMessage());
     }
+    /**
+     * 获取当前系统时间
+     */
+    @RequestMapping("get-system-date")
+    public RestResponse<Date> getSystemDate(HttpServletRequest request) {
+        AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request);
+        if (loginUser == null) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
+        }
+        return RestResponse.successResult(new Date());
+    }
+
 
 
 }

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderVO.java

@@ -154,5 +154,9 @@ public class LicenceOrderVO implements Serializable {
      * 订单进度list
      */
     private List<LicenceOrderProgressVO> OrderProgressList;
+    /**
+     * 企业微信订单过期时间
+     */
+    private Date qywxExpireTime;
 
 }

haoban-manage3-service/src/main/resources/mapper/licence/TabHaobanLicenceOrderMapper.xml

@@ -100,7 +100,8 @@
                                              update_time,
                                              creator_id,
                                              creator_name,
-                                             expire_time)
+                                             expire_time,
+                                             qywx_expire_time)
         VALUES (#{orderId,jdbcType=BIGINT},
                 #{enterpriseId,jdbcType=VARCHAR},
                 #{wxEnterpriseId,jdbcType=VARCHAR},
@@ -128,7 +129,8 @@
                 now(),
                 #{creatorId,jdbcType=VARCHAR},
                 #{creatorName,jdbcType=VARCHAR},
-                #{expireTime,jdbcType=VARCHAR})
+                #{expireTime,jdbcType=TIMESTAMP},
+                #{qywx_expire_time,jdbcType=TIMESTAMP})
         ]]>
   </insert>