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

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

@@ -282,9 +282,9 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
             }else {
                 result.setUserNum(num);
             }
-            if (now.before(endTime)){
+            if (now.before(appOrderEndTime)){
                 result.setType(2);
-                result.setEndTime(endTime);
+                result.setEndTime(appOrderEndTime);
                 result.setBeginTime(beginTime);
             }else {
                 result.setType(1);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/AppOrderController.java

@@ -127,5 +127,19 @@ public class AppOrderController {
         return RestResponse.successResult(vo);
     }
 
+    @RequestMapping("app-order-test")
+    public RestResponse<Boolean> test(String param) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        if (loginUser == null || StringUtils.isBlank(loginUser.getEnterpriseId())) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
+        }
+        ServiceResponse<Boolean> response = appOrderApiService.qywxCallBack(param);
+        if (response.isSuccess()){
+            logger.info("定时数据返回结果测试");
+            return RestResponse.successResult(true);
+        }
+        return RestResponse.failure(response.getCode(),response.getMessage());
+    }
+
 
 }