plan-java v0.62

(cherry picked from commit 04851493cc251ef669e20bf18a5fce8f103d9f6e)

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewOutController.java

@@ -152,11 +152,12 @@ public class PlanNewOutController {
             // //类型 1素材分类2清水分类
             Mono<List<Image>> image = template.select(Query.query(Criteria.where("type").is(1).and("deleted_at").isNull()), Image.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"7"))).collectList();
             Mono<List<Material>> text = template.select(Query.query(Criteria.where("type").is(4).and("deleted_at").isNull()), Material.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"8"))).collectList();
-            Mono<UserVisits> insert = template.insert(new UserVisits(null, request.getWx_user_id(), 1));
+
             Mono<UserVisits> wx_user_id ;
             if (Objects.isNull(request.getWx_user_id()) || "".equals(request.getWx_user_id())) {
                 wx_user_id=Mono.just(new UserVisits(null,null,null));
             }else{
+                Mono<UserVisits> insert = template.insert(new UserVisits(null, request.getWx_user_id(), 1));
                  wx_user_id = template.selectOne(Query.query(Criteria.where("wx_user_id").is(request.getWx_user_id())), UserVisits.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"9")))
                         .flatMap(f -> {
                             if (f.num() >= 4) {
@@ -219,11 +220,14 @@ public class PlanNewOutController {
                     dataLists.setReturnLoop(null);
                 }
                 dataLists.setImages(f.getT5());
-
-                if (f.getT8().num() >= 4 && Objects.nonNull(request.getWx_user_id()) && !"".equals(request.getWx_user_id())) {
-                    dataLists.setIsRet(1);
-                } else {
+                if(  Objects.isNull(request.getWx_user_id()) || "".equals(request.getWx_user_id())){
                     dataLists.setIsRet(-1);
+                }else {
+                    if (f.getT8().num() >= 4) {
+                        dataLists.setIsRet(1);
+                    }else{
+                        dataLists.setIsRet(-1);
+                    }
                 }
                 if (f.getT1().topAdvBl() == 1) {
                     List<Ad> ads = f.getT6().subList(0, f.getT1().topAdvNum());