Merge branch 'pro' of http://git.mokasz.com/liuwei/launch-webFlux-platform into pro

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

@@ -183,9 +183,9 @@ public class PlanNewOutController {
                 throw new BaseException("未获取到计划信息");
             }
             ListeningPlanNew planInfo = com.alibaba.fastjson.JSONObject.parseObject(planCache.toString(),ListeningPlanNew.class);
-            String idKey = RedisKey.DOMAIN_RAND_ID + ":" + planInfo.groupId().toString() + ":" + type.toString();
+            String idKey = RedisKey.DOMAIN_RAND_ID + planInfo.groupId().toString() + ":" + type.toString();
             String domainId = stringRedisTemplate.opsForSet().randomMember(idKey);
-            if (domainId == null || domainId.isEmpty()){
+            if (domainId.isEmpty()){
                 throw new BaseException("缓存"+ idKey + "不存在");
             }
             Object domainInfoCache = stringRedisTemplate.opsForHash().get(RedisKey.DOMAIN_INFO,domainId);

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/takeaway/TakeawayServicesImpl.java

@@ -125,7 +125,7 @@ public class TakeawayServicesImpl implements TakeawayServicesInterface{
             List<ColItem> collect = jsonArray.stream().map(map -> {
                 ColItem colItem = new ColItem();
                 JSONObject jsonObject = JSONUtil.parseObj(map);
-                BeanUtil.copyProperties(jsonObject, colItem);
+                BeanUtil.copyProperties(colItem, jsonObject);
                 return colItem;
             }).collect(Collectors.toList());
             List<Long>  collectType =collect.stream().map(ColItem::getType).filter(Objects::nonNull).distinct().collect(Collectors.toList());
@@ -168,7 +168,7 @@ public class TakeawayServicesImpl implements TakeawayServicesInterface{
             List<ColItem> collect = jsonArray.stream().map(map -> {
                 ColItem colItem = new ColItem();
                 JSONObject jsonObject = JSONUtil.parseObj(map);
-                BeanUtil.copyProperties(jsonObject, colItem);
+                BeanUtil.copyProperties(colItem, jsonObject);
                 return colItem;
             }).sorted(Comparator.comparing(ColItem::getIndex))
                     .collect(Collectors.toList());