多语言-rebase peko多语言注解

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/flowteam/FlowTeamStatisticParams.java

@@ -33,6 +33,15 @@ public class FlowTeamStatisticParams {
      */
     private String app;
 
+    /**
+     * 充值开始时间
+     */
+    private String chargeStartTime;
+    /**
+     * 充值结束时间
+     */
+    private String chargeEndTime;
+
     /**
      * 由“app”参数转化成的AppEnum中的组合（如果app=PlanetStar,则这里对应PlanetStar和PlanetStar66）
      */

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserCarportVo.java

@@ -1,11 +1,10 @@
 package com.accompany.admin.vo;
 
-
 import com.accompany.business.model.CarCarport;
 
 import java.util.List;
 
-public class UserCarportAdminVo {
+public class UserCarportVo {
 
     private UsersVo usersVo;
 

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/HomeRiseAdminService.java

@@ -11,7 +11,7 @@ import com.accompany.business.service.user.UsersService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
 import com.accompany.common.utils.StringUtils;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UpLoadImgService.java

@@ -1,44 +0,0 @@
-package com.accompany.admin.service;
-
-import com.accompany.business.mybatismapper.GiftMapper;
-import com.accompany.business.service.BannerService;
-import com.accompany.business.service.ErBanNetEaseService;
-import com.accompany.core.service.common.JedisService;
-import com.accompany.business.service.gift.GiftService;
-import com.google.gson.Gson;
-import com.accompany.common.netease.neteaseacc.result.FileUploadRet;
-import com.accompany.core.result.BusiResult;
-import com.accompany.common.status.BusiStatus;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-@Service
-public class UpLoadImgService {
-
-    @Autowired
-    private BannerService bannerService;
-    @Autowired
-    private ErBanNetEaseService erBanNetEaseService;
-    @Autowired
-    private GiftMapper giftMapper;
-    @Autowired
-    private JedisService jedisService;
-    @Autowired
-    private GiftService giftService;
-
-    private Gson gson = new Gson();
-
-    public void addBanner(MultipartFile file, String title, Byte type, Integer seqNo) throws Exception {
-        FileUploadRet fileUploadRet = erBanNetEaseService.uploadMultipartFile(file);
-        bannerService.addBanner(fileUploadRet, title, type, seqNo);
-    }
-
-    public BusiResult updateGift(Integer giftId, MultipartFile file) throws Exception {
-        BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS);
-        FileUploadRet fileUploadRet = erBanNetEaseService.uploadMultipartFile(file);
-        busiResult = giftService.updateGift(fileUploadRet, giftId);
-        return new BusiResult(BusiStatus.SUCCESS);
-    }
-
-}

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java

@@ -17,7 +17,7 @@ import com.accompany.business.vo.UserPurseVo;
 import com.accompany.common.constant.ApplicationConstant;
 import com.accompany.common.netease.neteaseacc.result.BaseNetEaseRet;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.BlankUtil;
 import com.accompany.common.utils.CommonUtil;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/block/BlockAdminService.java

@@ -7,7 +7,7 @@ import com.accompany.admin.model.BlockConfigExample;
 import com.accompany.admin.service.base.BaseService;
 import com.accompany.admin.service.system.AdminUserService;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.core.constant.BlockTypeEnum;
 import com.accompany.core.model.AccountLoginRecord;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/car/CarAdminService.java

@@ -1,12 +1,9 @@
 package com.accompany.admin.service.car;
 
-import com.accompany.admin.util.I18NMessageSourceUtil;
-import com.accompany.admin.vo.dress.CarGoodsAdminVo;
-import com.accompany.business.service.car.CarGoodsService;
 import com.accompany.core.model.Users;
 import com.alibaba.fastjson.JSONObject;
 import com.accompany.admin.service.base.BaseService;
-import com.accompany.admin.vo.UserCarportAdminVo;
+import com.accompany.admin.vo.UserCarportVo;
 import com.accompany.admin.vo.UsersVo;
 import com.accompany.business.model.*;
 import com.accompany.business.mybatismapper.CarCarportMapper;
@@ -19,21 +16,19 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.accompany.common.constant.Constant;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class CarAdminService extends BaseService {
 
-    @Autowired
-    private CarGoodsService carGoodsService;
     @Autowired
     private CarCarportMapper carCarportMapper;
     @Autowired
@@ -43,77 +38,7 @@ public class CarAdminService extends BaseService {
     @Autowired
     private CarRecordMapperMgr carRecordMapperMgr;
 
-    public Map<String, Object> page(Integer page, Integer pageSize, Byte enable, Boolean goldSale, Byte carGoodsType) {
-        Map<String, Object> map = new HashMap<>();
-        Integer total = carGoodsService.countCarGoods(enable);
-        map.put("total", total);
-
-        List<CarGoodsAdminVo> voList = getCarGoodsList(page, pageSize, enable, goldSale, carGoodsType);
-        map.put("rows", voList);
-
-        return map;
-    }
-
-    /**
-     * 查询座驾列表
-     *
-     * @param page
-     * @param pageSize
-     * @param status
-     * @return
-     */
-    public List<CarGoodsAdminVo> getCarGoodsList(Integer page, Integer pageSize, Byte status, Boolean goldSale, Byte carGoodsType) {
-        List<CarGoodsAdminVo> voList = new ArrayList<>();
-        List<CarGoods> list = carGoodsService.getCarGoodsList(page, pageSize, status, goldSale, carGoodsType);
-        for (CarGoods carGoods: list) {
-            CarGoodsAdminVo vo = new CarGoodsAdminVo();
-            BeanUtils.copyProperties(carGoods, vo);
-            voList.add(vo);
-        }
-        return voList;
-    }
-
-    /**
-     * 根据ID读取座驾
-     *
-     * @param id
-     * @return
-     */
-    public CarGoodsAdminVo getCarGoods(Integer id) {
-        CarGoods carGoods = carGoodsService.getCarGoods(id);
-
-        CarGoodsAdminVo vo = new CarGoodsAdminVo();
-        BeanUtils.copyProperties(carGoods, vo);
-        return vo;
-    }
-
-    /**
-     * 添加新座驾
-     *
-     * @param carGoods
-     */
-    public void addCarGoods(CarGoods carGoods) {
-        carGoods.setCreateTime(new Date());
-        carGoodsService.addCarGoods(carGoods);
-        I18NMessageSourceUtil.deserialization(carGoods, String.valueOf(carGoods.getId()), Collections.singletonList("name"));
-        carGoodsService.updateCarGoods(carGoods);
-    }
-
-    /**
-     * 修改座驾
-     *
-     * @param carGoods
-     */
-    public void updateCarGoods(CarGoods carGoods) {
-        I18NMessageSourceUtil.deserialization(carGoods, String.valueOf(carGoods.getId()), Collections.singletonList("name"));
-        carGoodsService.updateCarGoods(carGoods);
-    }
-
-    public List<CarGoods> getTotalCarGoodsList(){
-        return carGoodsService.getTotalCarGoodsList();
-    }
-
-    public UserCarportAdminVo getUserCarPort(Long uid, Integer page, Integer pageSize) {
+    public UserCarportVo getUserCarPort(Long uid, Integer page, Integer pageSize) {
 
 //        BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS);
         int offSet = (page - 1) * pageSize;
@@ -143,12 +68,12 @@ public class CarAdminService extends BaseService {
 
         List<CarCarport> list = carCarportMapper.selectByExample(example);
         if (!CollectionUtils.isEmpty(list)) {
-            userCarportAdminVo.setCarCarportList(list);
+            userCarportVo.setCarCarportList(list);
         }
 
 //        busiResult.setData(userCarportVo);
 //        return busiResult;
-        return userCarportAdminVo;
+        return userCarportVo;
     }
 
     public Integer countUserCar(Long uid) {
@@ -206,5 +131,4 @@ public class CarAdminService extends BaseService {
         busiResult.setData(data);
         return busiResult;
     }
-
 }

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/dress/ChatBubbleAdminService.java

@@ -1,8 +1,6 @@
 package com.accompany.admin.service.dress;
 
 import com.accompany.admin.base.Pagination;
-import com.accompany.admin.util.I18NMessageSourceUtil;
-import com.accompany.admin.vo.dress.ChatBubbleAdminVo;
 import com.accompany.admin.vo.dress.UserChatBubbleRecordAdminVO;
 import com.accompany.business.model.dress.ChatBubble;
 import com.accompany.business.model.dress.UserChatBubble;
@@ -31,7 +29,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
  * <br>类描述:
@@ -57,6 +58,8 @@ public class ChatBubbleAdminService {
     @Autowired
     private JedisService jedisService;
 
+
+
     public final static Integer ONE_TIME_SEND_BUBBLE_MAX_NUM = 100;
 
 
@@ -75,17 +78,7 @@ public class ChatBubbleAdminService {
         queryWrapper.lambda().orderByDesc(ChatBubble::getId);
         List<ChatBubble> bubbleList = chatBubbleService.list(queryWrapper);
         PageInfo<ChatBubble> pageInfo = new PageInfo<>(bubbleList);
-
-        List<ChatBubbleAdminVo> voList = new ArrayList<>();
-        for (ChatBubble cb: bubbleList) {
-            ChatBubbleAdminVo vo = new ChatBubbleAdminVo();
-            BeanUtils.copyProperties(cb, vo);
-            voList.add(vo);
-        }
-        PageInfo<ChatBubbleAdminVo> voPageInfo = new PageInfo<>(voList);
-        voPageInfo.setTotal(pageInfo.getTotal());
-
-        return new Pagination(voPageInfo);
+        return new Pagination(pageInfo);
     }
 
     public void saveOrUpdate(ChatBubble chatBubble) {
@@ -109,9 +102,6 @@ public class ChatBubbleAdminService {
         }
         chatBubble.setUpdateTime(new Date());
         chatBubbleService.saveOrUpdate(chatBubble);
-        // 国际化
-        I18NMessageSourceUtil.deserialization(chatBubble, String.valueOf(chatBubble.getId()), Collections.singletonList("name"));
-        chatBubbleService.saveOrUpdate(chatBubble);
         jedisService.hdel(RedisKey.chat_bubble_info.getKey(), chatBubble.getId().toString());
     }
 

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/dress/InfoCardAdminService.java

@@ -1,9 +1,7 @@
 package com.accompany.admin.service.dress;
 
 import com.accompany.admin.base.Pagination;
-import com.accompany.admin.util.I18NMessageSourceUtil;
 import com.accompany.admin.vo.dress.UserInfoCardRecordAdminVO;
-import com.accompany.admin.vo.dress.InfoCardAdminVo;
 import com.accompany.business.model.dress.InfoCard;
 import com.accompany.business.model.dress.UserInfoCard;
 import com.accompany.business.model.dress.UserInfoCardRecord;
@@ -31,7 +29,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
  * <br>类描述:
@@ -79,17 +80,7 @@ public class InfoCardAdminService {
         queryWrapper.lambda().orderByDesc(InfoCard::getId);
         List<InfoCard> cardList = infoCardService.list(queryWrapper);
         PageInfo<InfoCard> pageInfo = new PageInfo<>(cardList);
-
-        List<InfoCardAdminVo> voList = new ArrayList<>();
-        for (InfoCard infoCard: cardList) {
-            InfoCardAdminVo vo = new InfoCardAdminVo();
-            BeanUtils.copyProperties(infoCard, vo);
-            voList.add(vo);
-        }
-        PageInfo<InfoCardAdminVo> voPageInfo = new PageInfo<>(voList);
-        voPageInfo.setTotal(pageInfo.getTotal());
-
-        return new Pagination(voPageInfo);
+        return new Pagination(pageInfo);
     }
 
     public void saveOrUpdateInfoCard(InfoCard infoCard) {
@@ -110,8 +101,6 @@ public class InfoCardAdminService {
         }
         infoCard.setUpdateTime(new Date());
         infoCardService.saveOrUpdate(infoCard);
-        I18NMessageSourceUtil.deserialization(infoCard, String.valueOf(infoCard.getId()), Collections.singletonList("name"));
-        infoCardService.saveOrUpdate(infoCard);
     }
 
     public BaseResponseVO sendInfoCard(String erbanNos, Long cardId, Integer days, String remark) {
@@ -190,7 +179,9 @@ public class InfoCardAdminService {
                             vo.setNick(user.getNick());
                         }
                         InfoCard card = infoCardService.getInfoCardById(record.getCardId());
-                        vo.setCardName(card.getName());
+                        if (card != null) {
+                            vo.setCardName(card.getName());
+                        }
                         resList.add(vo);
                     }
             );

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/facejson/FaceJsonAdminService.java

@@ -8,7 +8,7 @@ import com.accompany.business.model.FaceJsonPicInfo;
 import com.accompany.business.service.room.FaceJsonService;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.tencent.cos.TencentCosUploadService;
 import com.accompany.common.utils.*;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/finance/FinanceAdminService.java

@@ -12,7 +12,7 @@ import com.accompany.core.service.common.JedisService;
 import com.accompany.business.service.record.BillRecordService;
 import com.github.pagehelper.PageHelper;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
 import com.accompany.common.utils.StringUtils;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAchievementAdminService.java

@@ -13,7 +13,7 @@ import com.accompany.business.vo.giftAchievement.GiftAchievementExpandVo;
 import com.accompany.business.vo.giftAchievement.UserGiftAchievementTypeExpandVo;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftAdminService.java

@@ -2,12 +2,9 @@ package com.accompany.admin.service.gift;
 
 import com.accompany.admin.base.AbstractCoreService;
 import com.accompany.admin.common.BusinessException;
-import com.accompany.admin.model.AdminUser;
 import com.accompany.admin.params.RoomFreeGiftConfigParams;
 import com.accompany.admin.service.system.AdminUserService;
 import com.accompany.admin.service.system.SysConfAdminService;
-import com.accompany.admin.util.I18NMessageSourceUtil;
-import com.accompany.admin.vo.gift.GiftAdminVo;
 import com.accompany.business.constant.PrizeTypeEnum;
 import com.accompany.business.dto.room.RoomFreeGiftConfigDto;
 import com.accompany.business.message.BoxPrizeEntity;
@@ -27,7 +24,7 @@ import com.accompany.business.service.user.UsersService;
 import com.accompany.business.vo.room.RoomExclusiveGiftVo;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
 import com.accompany.common.utils.GsonUtil;
@@ -40,9 +37,7 @@ import com.accompany.core.model.Users;
 import com.accompany.core.service.SysConfService;
 import com.accompany.core.service.common.JedisService;
 import com.accompany.core.util.StringUtils;
-import com.accompany.sms.result.AliyunSmsRet;
 import com.accompany.sms.service.AliyunSmsService;
-import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/headwear/HeadwearAdminService.java

@@ -1,8 +1,6 @@
 package com.accompany.admin.service.headwear;
 
 import com.accompany.admin.service.base.BaseService;
-import com.accompany.admin.util.I18NMessageSourceUtil;
-import com.accompany.admin.vo.dress.HeadwearAdminVo;
 import com.accompany.business.model.Headwear;
 import com.accompany.business.model.HeadwearExample;
 import com.accompany.business.mybatismapper.HeadwearMapper;
@@ -10,18 +8,22 @@ import com.accompany.core.service.common.JedisService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.accompany.common.redis.RedisKey;
-import org.springframework.beans.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author yangziwen
  * @description
  * @date 2018/5/15 10:44
  */
+@Slf4j
 @Service
 public class HeadwearAdminService extends BaseService {
 
@@ -31,18 +33,6 @@ public class HeadwearAdminService extends BaseService {
     @Autowired
     private JedisService jedisService;
 
-    public HeadwearAdminVo getHeadwear(Integer headwearId) {
-        HeadwearAdminVo vo = null;
-
-        Headwear headwear = headwearMapper.selectByPrimaryKey(headwearId);
-        if (null != headwear){
-            vo = new HeadwearAdminVo();
-            BeanUtils.copyProperties(headwear, vo);
-        }
-
-        return vo;
-    }
-
     public Map<String, Object> listHeadwears(Integer headwearId, String headwearName, Byte limitType, Boolean enable, Integer page, Integer pageSize) {
         HeadwearExample example = new HeadwearExample();
         example.setOffset((page - 1) * pageSize);
@@ -76,7 +66,7 @@ public class HeadwearAdminService extends BaseService {
 
         Map<String, Object> data = Maps.newHashMap();
         data.put("total", count);
-        data.put("rows", voList);
+        data.put("rows", headwears);
 
         return data;
     }
@@ -94,13 +84,8 @@ public class HeadwearAdminService extends BaseService {
         } else {
             headwear.setUpdateTime(current);
             this.headwearMapper.updateByPrimaryKeySelective(headwear);
+            this.jedisService.hdel(RedisKey.headwear.getKey(), headwear.getHeadwearId().toString());
         }
-
-        // 国际化
-        I18NMessageSourceUtil.deserialization(headwear, String.valueOf(headwear.getHeadwearId()), Collections.singletonList("name"));
-        this.headwearMapper.updateByPrimaryKeySelective(headwear);
-
-        this.jedisService.hdel(RedisKey.headwear.getKey(), headwear.getHeadwearId().toString());
     }
 
     public List<Headwear> getTotalHeadWearList(){

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java

@@ -30,7 +30,7 @@ import com.accompany.common.constant.Attach;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.constant.PrivilegeConstant;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.tencent.cos.TencentCosUploadService;
 import com.accompany.common.utils.DateTimeUtil;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGiveKeyService.java

@@ -11,7 +11,7 @@ import com.accompany.business.service.box.UserPrizeKeyService;
 import com.accompany.business.service.user.UsersService;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java

@@ -19,7 +19,7 @@ import com.accompany.business.service.record.BillRecordService;
 import com.accompany.business.service.user.UsersService;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.BlankUtil;
 import com.accompany.common.utils.DateTimeUtil;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RecommendModuleAdminService.java

@@ -16,7 +16,7 @@ import com.github.pagehelper.PageInfo;
 import com.google.gson.reflect.TypeToken;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java

@@ -31,7 +31,7 @@ import com.accompany.business.service.user.UserCoupleService;
 import com.accompany.business.vo.RoomNotifyVo;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.BlankUtil;
 import com.accompany.core.exception.ServiceException;
@@ -144,7 +144,7 @@ public class RoomSearchAdminService extends BaseService {
                          Boolean isPureMode, Boolean closeBox,Boolean hasKTVPriv, Boolean hasBlindDateRoomPri, Integer singleRoomSortId, Integer recommendStatus) throws Exception{
         Room room = roomMapper.selectByPrimaryKey(Long.valueOf(uid));
         if(room != null){
-            RoomTagAdminVo roomTag = roomTagService.getRoomTagById(tagId);
+            RoomTag roomTag = roomTagService.getRoomTagById(tagId);
             if (roomTag != null) {
                 room.setRoomTag(roomTag.getName());
                 room.setTagPict(roomTag.getPict());

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTagService.java

@@ -1,36 +1,30 @@
 package com.accompany.admin.service.room;
 
-import com.accompany.admin.util.I18NMessageSourceUtil;
-import com.accompany.admin.vo.RoomTagAdminVo;
 import com.accompany.core.exception.ServiceException;
 import com.accompany.business.model.RoomTag;
 import com.accompany.business.model.RoomTagExample;
 import com.accompany.business.mybatismapper.RoomTagMapper;
 import com.accompany.core.service.base.BaseService;
 import com.accompany.core.util.StringUtils;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.BlankUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 @Service("roomTagService2")
-@Slf4j
 public class RoomTagService extends BaseService {
 
     @Autowired
     private RoomTagMapper roomTagMapper;
 
-    public RoomTagAdminVo getRoomTagById(Integer tagId) {
+
+    public RoomTag getRoomTagById(Integer tagId) {
         RoomTag roomTag =  roomTagMapper.selectByPrimaryKey(tagId);
         return roomTag;
     }
@@ -86,11 +80,8 @@ public class RoomTagService extends BaseService {
                 updateTag.setChildren(String.valueOf(roomTag.getId()));
                 roomTagMapper.updateByPrimaryKeySelective(updateTag);
             }
-            // 国际化
-            I18NMessageSourceUtil.deserialization(roomTag, String.valueOf(roomTag.getId()), Lists.newArrayList("name", "pict"));
             return result;
         } else {
-            I18NMessageSourceUtil.deserialization(roomTag, String.valueOf(roomTag.getId()), Lists.newArrayList("name", "pict"));
             return updateRoomTag(roomTag);
         }
     }
@@ -126,7 +117,7 @@ public class RoomTagService extends BaseService {
         List<RoomTag> roomTagList = this.roomTagMapper.selectByExample(example);
         Map<String, Object> data = Maps.newHashMap();
         data.put("total", count);
-        data.put("rows", voList);
+        data.put("rows", roomTagList);
         return data;
     }
 }

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/TopicRoomService.java

@@ -20,7 +20,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.gson.reflect.TypeToken;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/sms/OperationSmsAdminService.java

@@ -16,7 +16,7 @@ import com.google.common.collect.Lists;
 import com.google.gson.reflect.TypeToken;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
 import com.accompany.common.utils.StringUtils;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java

@@ -10,19 +10,14 @@ import com.accompany.admin.service.base.BaseService;
 import com.accompany.admin.vo.stats.LaborStatsVo;
 import com.accompany.business.service.room.RoomService;
 import com.accompany.business.service.user.UsersService;
-import com.accompany.common.annotation.FieldComment;
-import com.accompany.common.redis.RedisKey;
 import com.accompany.common.utils.DateTimeUtil;
-import com.accompany.common.utils.GsonUtil;
 import com.accompany.common.utils.StringUtils;
 import com.accompany.core.exception.ServiceException;
 import com.accompany.core.model.Room;
 import com.accompany.core.model.Users;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -199,16 +194,13 @@ public class LaborStatsAdminService extends BaseService {
                 }
                 //用户ID
                 List<Long> firstInRoomUidList = firstInRoomUsers.stream().map(LaborStatsDto::getUid).collect(Collectors.toList());
-                Date currentEndTime = DateTimeUtil.addDays(dateTime, 1);
                 LaborStatsVo stats = new LaborStatsVo();
                 stats.setDate(dateStr);
                 stats.setErbanNo(erBanNoToLong);
                 stats.setRoomTitle(roomTitle);
                 stats.setFirstInRoom(firstInRoomUsers.size());
                 //次日日活用户
-                List<Long> activeUidList = usersService.getDailyActiveUsers(currentEndTime);
-                activeUidList.retainAll(firstInRoomUidList);
-                stats.setFirstInRoomRetained(activeUidList.size());
+                stats.setFirstInRoomRetained(0);
                 //获取总进房数
                 int totalInRoom = 0;
                 List<LaborStatsDto> totalInRooms = totalInRoomUserMap.get(dateStr);
@@ -339,9 +331,7 @@ public class LaborStatsAdminService extends BaseService {
         vo.setFirstInRoom(laborStatsMapper.firstInRoom(startTime, endTime, uid));
         // 新进房间的用户和次日日活用户
         List<Long> firstInRoomUids = laborStatsMapper.firstInRoomUids(startTime, endTime, uid);
-        List<Long> activeUids = usersService.getDailyActiveUsers(endTime);
-        activeUids.retainAll(firstInRoomUids);
-        vo.setFirstInRoomRetained(activeUids.size());
+        vo.setFirstInRoomRetained(0);
         vo.setTotalInRoom(laborStatsMapper.totalInRoom(startTime, endTime, uid));
         vo.setFirstInRoomGiftUser(laborStatsMapper.firstInRoomGiftUser(startTime, endTime, uid));
         vo.setGiftUser(laborStatsMapper.giftUser(startTime, endTime, uid));

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/NewUserStatsAdminService.java

@@ -57,10 +57,7 @@ public class NewUserStatsAdminService extends BaseService {
         newUserStatsVo.setNewUserSendGiftAmount(newUserStatsMapper.newUserSendGiftAmount(startTime, endTime));
         newUserStatsVo.setNewUserSendGiftNum(newUserStatsMapper.newUserSendGiftNum(startTime, endTime));
         // 新用户和次日日活用户
-        List<Long> newUserUids = newUserStatsMapper.newUserUids(startTime, endTime);
-        List<Long> activeUids = usersService.getDailyActiveUsers(endTime);
-        activeUids.retainAll(newUserUids);
-        newUserStatsVo.setNewUserRetained(activeUids.size());
+        newUserStatsVo.setNewUserRetained(0);
         newUserStatsVo.setNewUserSendGiftRate(newUserStatsVo.getNewUserSendGiftNum().doubleValue() /
                 (newUserStatsVo.getNewUser() > 0 ? newUserStatsVo.getNewUser() : 1));
         return newUserStatsVo;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/system/AdminUserService.java

@@ -12,7 +12,7 @@ import com.accompany.common.constant.Constant;
 import com.accompany.common.constant.SmsTypeEnum;
 import com.accompany.common.device.DeviceInfo;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.BlankUtil;
 import com.accompany.common.utils.DateTimeUtil;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/PasswordLockAdminService.java

@@ -7,7 +7,7 @@ import com.accompany.business.service.user.UsersService;
 import com.accompany.business.vo.UserPwdLockVo;
 import com.google.common.collect.Lists;
 import com.accompany.common.redis.RedisKey;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java

@@ -12,7 +12,7 @@ import com.accompany.business.service.user.UsersService;
 import com.accompany.business.vo.UserPurseVo;
 import com.accompany.business.vo.user.CancelUserCheckVo;
 import com.accompany.common.constant.Constant;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.core.exception.ServiceException;
 import com.accompany.core.model.Account;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/voice/VoiceAdminService.java

@@ -29,7 +29,7 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.accompany.common.constant.Constant;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.poi.ss.usermodel.Row;

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/RoomFlowPayAdminService.java

@@ -8,7 +8,7 @@ import com.accompany.business.model.payment.Recipient;
 import com.accompany.business.mybatismapper.RoomFlowPayRecordMapper;
 import com.accompany.business.service.user.UsersService;
 import com.accompany.common.constant.Constant;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
 import com.accompany.core.model.Users;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ChannelDistributeAdminController.java

@@ -8,7 +8,7 @@ import com.accompany.admin.service.ChannelDistributeAdminService;
 import com.accompany.admin.service.system.AdminUserService;
 import com.accompany.business.model.ChannelDistribute;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ExceptionController.java

@@ -2,7 +2,7 @@ package com.accompany.admin.controller;
 
 import com.accompany.common.status.BusiStatusInterface;
 import com.accompany.core.exception.ServiceException;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityAwardAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.activity.ActivityAwardAdminService;
 import com.accompany.business.model.ActivityAward;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ActivityPackAdminController.java

@@ -7,7 +7,7 @@ import com.accompany.admin.service.activity.ActivityPackAdminService;
 import com.accompany.admin.service.system.AdminLogService;
 import com.accompany.business.model.ActivityPack;
 import com.accompany.business.vo.activity.ActivityPackAwardItem;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ChargeActivityAdminController.java

@@ -12,7 +12,7 @@ import com.accompany.core.exception.ServiceException;
 import com.accompany.business.model.ChargeActivity;
 import com.accompany.business.model.ChargeActivityWithBLOBs;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/ChargeActivityPackRecordAdminController.java

@@ -3,7 +3,7 @@ package com.accompany.admin.controller.activity;
 import com.accompany.admin.common.BusinessException;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.business.service.activity.ChargeActivityPackRecordService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/LuckySeaActAdminController.java

@@ -14,7 +14,7 @@ import com.accompany.business.model.activity.luckysea.LuckySeaItem;
 import com.accompany.business.service.activities.luckySea.LuckySeaActInfoService;
 import com.accompany.business.service.activities.luckySea.LuckySeaStockService;
 import com.accompany.common.constant.Constant;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.core.result.PageResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.tencent.cos.TencentCosUploadService;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/OperationActAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.activity.OperationActAdminService;
 import com.accompany.business.model.OperationAct;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/StaticActivityPageController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.activity.StaticActivityPageService;
 import com.accompany.business.model.activity.PageActivity;
 import com.accompany.business.vo.activities.PageActivityVO;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/activity/WeekStarConfigAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.activity.WeekStarConfigAdminService;
 import com.accompany.business.model.ActivityPack;
 import com.accompany.business.model.WeekStarConfig;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorAdminController.java

@@ -6,7 +6,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.anchor.AnchorAdminService;
 import com.accompany.business.model.AnchorWhitelist;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorFansPrivilegeAdminController.java

@@ -3,7 +3,7 @@ package com.accompany.admin.controller.anchor;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.anchor.AnchorFansPrivilegeAdminService;
 import com.accompany.business.model.anchor.AnchorFansPrivilegeConfig;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/anchor/AnchorReleaseAdminController.java

@@ -7,7 +7,7 @@ import com.accompany.admin.service.anchor.AnchorReleaseAdminService;
 import com.accompany.business.model.AnchorBillCheck;
 import com.accompany.business.model.AnchorBillRecord;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
 import org.apache.poi.ss.usermodel.Sheet;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/app/AppBottomBarAdminController.java

@@ -2,7 +2,7 @@ package com.accompany.admin.controller.app;
 
 import com.accompany.admin.params.app.AppBottomBarParam;
 import com.accompany.admin.service.app.AppBottomBarAdminService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/app/AppUpdateAdminController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.app.AppUpdateAdminService;
 import com.accompany.business.model.app.AppUpdate;
 import com.accompany.common.annotation.Authorization;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/audiocard/AudioCardAdminController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.audiocard.AudioCardAdminService;
 import com.accompany.admin.service.system.AdminUserService;
 import com.accompany.admin.vo.audiocard.UserAudioCardAdminVo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.core.result.PageResult;
 import com.accompany.common.status.BusiStatus;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/batch/FlowDataBatchSearchAdminController.java

@@ -5,8 +5,8 @@ import com.accompany.admin.service.batch.FlowDataBatchSearchAdminService;
 import com.accompany.admin.vo.batch.FlowDataBatchSearchAdminVo;
 import com.accompany.admin.vo.batch.FlowDataBatchSearchGrowAdminVo;
 import com.accompany.common.model.PageReq;
+import com.accompany.core.result.PageResult;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/block/BlockAdminController.java

@@ -8,7 +8,7 @@ import com.accompany.core.model.AccountLoginRecord;
 import com.accompany.core.util.StringUtils;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarAdminController.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.car.CarAdminService;
-import com.accompany.admin.vo.UserCarportAdminVo;
+import com.accompany.admin.vo.UserCarportVo;
 import com.accompany.core.exception.ServiceException;
 import com.accompany.business.model.*;
 import com.accompany.business.service.car.CarGoodsService;
@@ -14,7 +14,7 @@ import com.accompany.business.service.car.CarPayService;
 import com.accompany.core.service.user.UsersBaseService;
 import com.accompany.business.service.user.UsersService;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.BlankUtil;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -132,7 +132,7 @@ public class CarAdminController extends BaseController {
         }
         Long uid = users.getUid();
 
-        UserCarportAdminVo userCarportAdminVo = carAdminService.getUserCarPort(uid, page, pageSize);
+        UserCarportVo userCarportAdminVo = carAdminService.getUserCarPort(uid, page, pageSize);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("total", carAdminService.countUserCar(uid));
         jsonObject.put("rows", userCarportAdminVo.getCarCarportList());

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarGoodsAdminController.java

@@ -1,18 +1,14 @@
 package com.accompany.admin.controller.car;
 
 import cn.hutool.core.util.StrUtil;
+import com.accompany.common.result.BusiResult;
+import com.accompany.common.status.BusiStatus;
 import com.accompany.common.tencent.cos.TencentCosUploadService;
 import com.accompany.common.utils.PinYin4JUtil;
-import com.accompany.admin.util.JsonMessageSourceUtil;
-import com.accompany.core.constant.ModuleTypeEnum;
 import com.alibaba.fastjson.JSONObject;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.business.model.CarGoods;
 import com.accompany.business.service.car.CarGoodsService;
-import com.accompany.common.result.BusiResult;
-import com.accompany.common.status.BusiStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -21,14 +17,12 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author yangziwen
  * @description
  * @date 2018/2/28 15:55
  */
-@Slf4j
 @RestController
 @RequestMapping("/admin/car/goods")
 public class CarGoodsAdminController extends BaseController {
@@ -48,11 +42,11 @@ public class CarGoodsAdminController extends BaseController {
             jsonObject.put("entity", carGoods);
         }
 
-        return jsonObject;
+        writeJson(jsonObject.toJSONString());
     }
 
     @RequestMapping(value = "", method = RequestMethod.GET)
-    public Map<String, Object> getCarGoodsList(Integer page, Integer pageSize,
+    public void getCarGoodsList(Integer page, Integer pageSize,
                                 @RequestParam(required = false, defaultValue = "2") Byte enable,
                                 String carGoodsName,
                                 Byte carGoodsType) {
@@ -62,16 +56,20 @@ public class CarGoodsAdminController extends BaseController {
             enable = null;
         }
 
-        return carAdminService.page(page, pageSize, enable, null, carGoodsType);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("total", this.carGoodsService.countCarGoods(enable, carGoodsName, carGoodsType));
+        jsonObject.put("rows", this.carGoodsService.getCarGoodsList(page, pageSize, enable,null, carGoodsName, carGoodsType));
+        writeJson(jsonObject.toJSONString());
     }
 
     @RequestMapping(value = "", method = RequestMethod.POST)
     public void saveCarGoods(CarGoods carGoods) {
+
         try{
             if(carGoods.getId() == null){
-                this.carAdminService.addCarGoods(carGoods);
+                this.carGoodsService.addCarGoods(carGoods);
             }else{
-                this.carAdminService.updateCarGoods(carGoods);
+                this.carGoodsService.updateCarGoods(carGoods);
             }
             writeJson(true, "保存成功");
         }catch(Exception e){
@@ -112,4 +110,16 @@ public class CarGoodsAdminController extends BaseController {
         writeJson(jsonObject.toJSONString());
     }
 
+    @RequestMapping(value = "/total/list",method = RequestMethod.GET)
+    public BusiResult getTotalCarGoodsList(){
+        BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS);
+        try{
+            List<CarGoods> list = this.carGoodsService.getTotalCarGoodsList();
+            busiResult.setData(list);
+            return busiResult;
+        }catch (Exception e){
+            return new BusiResult(BusiStatus.BUSIERROR);
+        }
+    }
+
 }

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/car/CarRecordController.java

@@ -3,7 +3,7 @@ package com.accompany.admin.controller.car;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.car.CarRecordAdminService;
 import com.accompany.common.annotation.Authorization;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/channel/ChannelContentPartitionAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.dto.channel.ChannelContentPartitionDto;
 import com.accompany.admin.dto.channel.ChannelQueryDto;
 import com.accompany.admin.service.channel.ChannelContentPartitionAdminService;
 import com.accompany.admin.util.ExcelUtils;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.core.model.channel.ChannelContentPartition;
 import com.alibaba.fastjson.JSONObject;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeChannelAdminController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.dto.charge.ChargeChannelAdminDto;
 import com.accompany.admin.service.charge.ChargeChannelAdminService;
 import com.accompany.admin.vo.charge.ChargeChannelAdminVo;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeRegionAdminController.java

@@ -2,7 +2,7 @@ package com.accompany.admin.controller.charge;
 
 import com.accompany.admin.service.charge.ChargeChannelAdminService;
 import com.accompany.admin.service.charge.ChargeRegionAdminService;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import com.accompany.payment.model.ChargeRegion;
 import com.accompany.common.result.BusiResult;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/ChargeUserLimitAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.service.charge.ChargeUserLimitAdminService;
 import com.accompany.admin.vo.charge.ChargeUserLimitAdminVo;
 import com.accompany.common.model.PageReq;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/charge/RedeemCodeController.java

@@ -7,7 +7,7 @@ import com.accompany.admin.service.system.AdminLogService;
 import com.accompany.business.model.RedeemCode;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/clan/ClanGoldFlowAdminController.java

@@ -3,7 +3,7 @@ package com.accompany.admin.controller.clan;
 import com.accompany.admin.service.clan.ClanGoldFlowAdminService;
 import com.accompany.business.vo.clan.ClanGoldFlowDetailVO;
 import com.accompany.business.vo.clan.ClanGoldFlowVO;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import io.swagger.annotations.ApiImplicitParam;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/cleanup/CleanUpAdminController.java

@@ -3,7 +3,7 @@ package com.accompany.admin.controller.cleanup;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.cleanup.CleanUpAdminService;
 import com.accompany.business.service.activities.ActivitiesDrawService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/dress/DressShopAdminController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.dress.DressShopAdminService;
 import com.accompany.business.model.dress.DressShop;
 import com.accompany.business.vo.dress.DressShopVo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiOperation;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/face/FaceJsonAdminController.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.facejson.FaceJsonAdminService;
 import com.accompany.business.model.FaceInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountBlockAdminController.java

@@ -6,7 +6,7 @@ import com.accompany.admin.model.AdminUser;
 import com.accompany.admin.service.AccountBlockAdminService;
 import com.accompany.admin.service.system.AdminUserService;
 import com.accompany.business.service.account.AccountBlockService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.core.model.AccountBlock;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/findlove/FindLoveDrawAdminController.java

@@ -6,7 +6,7 @@ import com.accompany.admin.service.findlove.FindLoveDrawItemAdminService;
 import com.accompany.admin.service.system.AdminLogService;
 import com.accompany.admin.vo.findlove.FindLoveDrawItemAdminGroupVo;
 import com.accompany.admin.vo.findlove.FindLoveDrawPoolItemAdminVo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/findlove/FindLoveDrawDataAdminController.java

@@ -6,7 +6,7 @@ import com.accompany.admin.service.findlove.FindLoveDrawDataAdminService;
 import com.accompany.admin.vo.findlove.FindLoveDrawRecordAdminExportVo;
 import com.accompany.admin.vo.findlove.FindLoveDrawRecordAdminStatisVo;
 import com.accompany.admin.vo.findlove.FindLoveDrawRecordAdminVo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.core.result.PageResult;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/floating/FloatingScreenAdminController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.model.FloatingScreenRecord;
 import com.accompany.admin.service.floating.FloatingScreenAdminService;
 import com.accompany.common.model.PageReq;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAchievementAdminController.java

@@ -9,7 +9,7 @@ import com.accompany.business.vo.giftAchievement.GiftAchievementExpandVo;
 import com.accompany.business.vo.giftAchievement.UserGiftAchievementTypeExpandVo;
 import com.github.pagehelper.PageInfo;
 import com.accompany.common.constant.Constant;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
 import org.apache.poi.hssf.usermodel.HSSFRow;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftAdminController.java

@@ -3,14 +3,12 @@ package com.accompany.admin.controller.gift;
 import cn.hutool.core.util.StrUtil;
 import com.accompany.admin.params.RoomFreeGiftConfigParams;
 import com.accompany.admin.service.push.EnterpriseWeChatPushAdminService;
-import com.accompany.admin.vo.gift.GiftAdminVo;
 import com.accompany.business.dto.room.RoomFreeGiftConfigDto;
 import com.accompany.business.service.gift.GiftService;
 import com.accompany.business.service.gift.RoomExclusiveGiftService;
 import com.accompany.common.tencent.cos.TencentCosUploadService;
 import com.accompany.common.utils.PinYin4JUtil;
 import com.accompany.common.utils.StringUtils;
-import com.accompany.core.model.SysConf;
 import com.accompany.core.model.Users;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -28,7 +26,7 @@ import com.accompany.business.vo.room.RoomExclusiveGiftVo;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.accompany.common.constant.Constant;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.BlankUtil;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -62,8 +60,6 @@ public class GiftAdminController extends BaseController {
     @Autowired
     private UsersService usersService;
     @Autowired
-    private SysConfService sysConfService;
-    @Autowired
     private GiftSendRecordService giftSendRecordService;
     @Autowired
     private TencentCosUploadService uploadService;
@@ -159,7 +155,7 @@ public class GiftAdminController extends BaseController {
                 selectGiftName, selectGiftGoldMin, selectGiftGoldMax,
                 type, consumeType, giftType);
         jsonObject.put("total", pageInfo.getTotal());
-        jsonObject.put("rows",  JsonMessageSourceUtil.wrapperList(pageInfo.getList()));
+        jsonObject.put("rows", pageInfo.getList());
         writeJson(jsonObject.toJSONString());
     }
 
@@ -211,7 +207,7 @@ public class GiftAdminController extends BaseController {
             writeJson(false, e.getMessage());
             return;
         } catch (Exception e) {
-            logger.error("Failed to save gift. Cause by {}", e.getCause().getMessage(),e);
+            logger.error("Failed to save gift. Cause by {}", e.getCause().getMessage());
         }
         writeJson(false, "保存失败");
     }
@@ -238,21 +234,15 @@ public class GiftAdminController extends BaseController {
 
     @RequestMapping(value = "get", method = RequestMethod.GET)
     @ResponseBody
-    public Map<String, Object> get(@RequestParam("id") Integer id) {
-        Map<String, Object> result = new HashMap<>();
-
+    public void get(@RequestParam("id") Integer id) {
+        JSONObject jsonObject = new JSONObject();
         Gift gift = giftAdminService.get(id);
         if (gift != null) {
-            // 国际化
-            GiftAdminVo vo = new GiftAdminVo();
-            BeanUtils.copyProperties(gift, vo);
-            result.put("entity", vo);
-
+            jsonObject.put("entity", gift);
             RoomFreeGiftConfigDto config = giftAdminService.getRoomFreeGiftConfig();
-            result.put("roomFreeGiftConfig", config);
+            jsonObject.put("roomFreeGiftConfig", config);
         }
-
-        return result;
+        writeJson(jsonObject.toJSONString());
     }
 
     @RequestMapping(value = "upload", method = RequestMethod.POST)

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/GiftCompoundAdminController.java

@@ -6,7 +6,7 @@ import com.accompany.admin.vo.gift.GiftCompoundRewordVo;
 import com.accompany.admin.vo.GiftCompoundRewardAdminVo;
 import com.accompany.business.model.GiftCompoundRewardPool;
 import com.accompany.common.constant.Constant;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.collections.CollectionUtils;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/MagicAdminController.java

@@ -9,7 +9,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.gift.MagicAdminService;
 import com.accompany.business.model.GiftMagic;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/gift/NewUserGiftAdminController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.base.Pagination;
 import com.accompany.business.model.newuser.NewUserInRoomGift;
 import com.accompany.business.service.newuser.NewUserInRoomGiftService;
 import com.accompany.common.model.PageReq;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearAdminController.java

@@ -1,10 +1,10 @@
 package com.accompany.admin.controller.headwear;
 
-import com.accompany.admin.vo.dress.HeadwearAdminVo;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.headwear.HeadwearAdminService;
+import com.accompany.core.exception.ServiceException;
 import com.accompany.business.model.Headwear;
 import com.accompany.business.model.HeadwearStatistics;
 import com.accompany.business.service.headwear.HeadwearService;
@@ -43,7 +43,7 @@ public class HeadwearAdminController extends BaseController {
     private HeadwearService headwearService;
 
     @RequestMapping("list")
-    public Map<String, Object> list(Integer headwearId, String headwearName, Byte limitType, Boolean enable, @RequestParam(defaultValue = "1") Integer page,
+    public void list(Integer headwearId, String headwearName, Byte limitType, Boolean enable, @RequestParam(defaultValue = "1") Integer page,
                      @RequestParam(defaultValue = "20") Integer pageSize) {
         logger.info("list(), headwearId={}, headwearName={}, limitType={}, enable={}", headwearId, headwearName, limitType, enable);
         try {
@@ -60,16 +60,16 @@ public class HeadwearAdminController extends BaseController {
     @RequestMapping(value = "save", method = RequestMethod.POST)
     public void save(Headwear headwear) {
         logger.info("save({})", JSON.toJSONString(headwear));
-        headwearAdminService.save(headwear);
+        this.headwearAdminService.save(headwear);
         writeJson(true, "保存成功");
     }
 
     @RequestMapping("get")
-    public HeadwearAdminVo get(Integer headwearId) {
+    public void get(Integer headwearId) {
         logger.info("get(), headwearId={}", headwearId);
         Headwear headwear = this.headwearService.getHeadwear(headwearId);
         logger.info("result: {}", JSON.toJSONString(headwear));
-        return headwear;
+        writeJson(JSON.toJSONString(headwear));
     }
 
     @RequestMapping(value = "send", method = RequestMethod.POST)
@@ -99,9 +99,15 @@ public class HeadwearAdminController extends BaseController {
     }
 
     @RequestMapping(value = "/total/list", method = RequestMethod.GET)
-    public BusiResult<List<Headwear>> getTotalHeadWearList() {
-        List<Headwear> list = headwearAdminService.getTotalHeadWearList();
-        return new BusiResult<>(list);
+    public BusiResult getTotalHeadWearList() {
+        BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS);
+        try {
+            List<Headwear> list = this.headwearAdminService.getTotalHeadWearList();
+            busiResult.setData(list);
+            return busiResult;
+        } catch (Exception e) {
+            return new BusiResult(BusiStatus.BUSIERROR);
+        }
     }
 
     @RequestMapping(value = "statisticsHeadwear", method = RequestMethod.GET)

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/headwear/HeadwearRecordController.java

@@ -3,7 +3,7 @@ package com.accompany.admin.controller.headwear;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.headwear.HeadwearRecordService;
 import com.accompany.common.annotation.Authorization;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/home/HomeNewFriendController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.service.home.HomeNewFriendAdminService;
 import com.accompany.admin.vo.home.HomeNewFriendAdminVo;
 import com.accompany.common.model.PageReq;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/home/HomeRecommController.java

@@ -6,7 +6,7 @@ import com.accompany.business.service.HomeHotManualRecommService;
 import com.accompany.business.service.user.UsersService;
 import com.accompany.business.vo.BannerVo;
 import com.accompany.business.vo.HomeHotManualRecommVo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/home/HomeResourceAdminController.java

@@ -3,7 +3,7 @@ package com.accompany.admin.controller.home;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.params.home.HomeRecommenResourceParam;
 import com.accompany.admin.service.home.HomeResourceAdminService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/home/HomeRiseAdminController.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.HomeRiseAdminService;
 import com.accompany.admin.vo.RisingStarRoomVo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/home/HotRoomPermitController.java

@@ -1,7 +1,7 @@
 package com.accompany.admin.controller.home;
 
 import com.accompany.business.service.HotRoomPermitService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/ktv/MusicLibraryAdminController.java

@@ -9,7 +9,7 @@ import com.accompany.core.exception.ServiceException;
 import com.accompany.business.model.MusicLibrary;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/linearlypool/LinearlyPoolAdminController.java

@@ -9,7 +9,7 @@ import com.accompany.admin.service.system.AdminUserService;
 import com.accompany.admin.vo.linearlypool.LinearlyPoolDeployResultVO;
 import com.accompany.admin.vo.linearlypool.LinearlyPoolItemAdminPageVO;
 import com.accompany.admin.vo.linearlypool.PrizeItemVO;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.core.enumeration.BusinessStatusCodeEnum;
 import com.accompany.core.vo.BaseResponseVO;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/linearlypool/LinearlyPoolDataAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.params.linearlypool.PlatformDataReqParams;
 import com.accompany.admin.service.linearly.LinearlyPoolDataAdminService;
 import com.accompany.admin.util.ExcelUtils;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.core.model.Users;
 import com.accompany.core.service.user.UsersBaseService;
 import com.alibaba.fastjson.JSONObject;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/link/ShortLinkAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.vo.link.ShortLinkAdminVo;
 import com.accompany.business.model.link.ShortLink;
 import com.accompany.common.model.PageReq;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/luckybag/LuckyBagGiftAdminController.java

@@ -9,7 +9,7 @@ import com.accompany.business.model.Gift;
 import com.accompany.common.annotation.Authorization;
 import com.accompany.common.model.PageReq;
 import com.accompany.core.exception.ServiceException;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/luckybag/LuckyBagPoolAdminController.java

@@ -9,7 +9,7 @@ import com.accompany.admin.vo.luckybag.LuckyBagPoolAdminVo2;
 import com.accompany.business.model.Gift;
 import com.accompany.business.service.luckybag.LuckyBagPoolService;
 import com.accompany.common.annotation.Authorization;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.DateTimeUtil;
 import com.accompany.core.exception.ServiceException;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/luckybag/LuckyBagRecordAdminController.java

@@ -6,7 +6,7 @@ import com.accompany.admin.service.luckybag.LuckyBagRecordAdminService;
 import com.accompany.admin.vo.luckybag.LuckyBagRecordAdminVo;
 import com.accompany.admin.vo.luckybag.LuckyBagStatsAdminVo;
 import com.accompany.common.annotation.Authorization;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.core.util.ExcelUtils;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/miniGame/MiniGameAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.business.dto.miniGame.MiniGameDetailParam;
 import com.accompany.business.dto.miniGame.MiniGameStatisByDayDto;
 import com.accompany.business.dto.miniGame.MiniGameStatisParam;
 import com.accompany.business.model.miniGame.MiniGame;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.core.util.ExcelUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/msg/UserChatMsgRecordAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.vo.msg.UserChatMsgRecordAdminVo;
 import com.accompany.admin.vo.msg.UserChatMsgRecordDetailAdminVo;
 import com.accompany.common.model.PageReq;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/music/MusicAdminController.java

@@ -3,7 +3,7 @@ package com.accompany.admin.controller.music;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.music.MusicAdminService;
 import com.accompany.core.exception.ServiceException;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newLuckyBag/NewLuckyBagRecordAdminController.java

@@ -6,7 +6,7 @@ import com.accompany.admin.vo.newLuckyBag.NewLuckyBagRecordAdminVo;
 import com.accompany.admin.vo.newLuckyBag.NewLuckyBagStatsAdminVo;
 import com.accompany.common.annotation.Authorization;
 import com.accompany.common.model.PageReq;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.core.util.ExcelUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/newUserStart/NewUserSayHelloChannelAdminController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.base.Pagination;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.business.model.newUserStart.NewUserSayHelloChannel;
 import com.accompany.business.service.newUserStart.NewUserSayHelloChannelService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/partition/PartitionInfoAdminController.java

@@ -1,7 +1,7 @@
 package com.accompany.admin.controller.partition;
 
 import com.accompany.business.service.partition.PartitionInfoService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.core.model.PartitionInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/personalCenter/PersonalCenterAdminController.java

@@ -3,7 +3,7 @@ package com.accompany.admin.controller.personalCenter;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.personalCenter.PersonalCenterAdminService;
 import com.accompany.business.model.personalcenter.PersonalCenter;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/pretty/PrettyNumberAdminController.java

@@ -10,7 +10,7 @@ import com.accompany.admin.service.system.AdminUserService;
 import com.accompany.core.model.PrettyNumber;
 import com.accompany.core.model.PrettyNumberRecord;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/DeviateRangeAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.service.prize.DeviateRangeAdminService;
 import com.accompany.admin.service.system.AdminLogService;
 import com.accompany.business.model.DeviateRange;
 import com.accompany.business.service.box.DeviateRangeService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.core.exception.ServiceException;
 import com.alibaba.fastjson.JSONObject;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/DrawLotteryRecordAdminController.java

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.dto.DrawLotteryRecordDto;
 import com.accompany.admin.service.prize.DrawLotteryRecordAdminService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/PrizeAdminController.java

@@ -6,7 +6,7 @@ import com.accompany.admin.service.prize.PrizeAdminService;
 import com.accompany.admin.service.system.AdminLogService;
 import com.accompany.business.model.Prize;
 import com.github.pagehelper.PageInfo;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/PrizePoolItemAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.controller.BaseController;
 import com.accompany.admin.service.prize.PrizePoolItemAdminService;
 import com.accompany.admin.service.system.AdminLogService;
 import com.accompany.business.model.PrizePoolItem;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/PrizeWhiteUserAdminController.java

@@ -7,7 +7,7 @@ import com.accompany.admin.service.system.AdminLogService;
 import com.accompany.admin.service.system.AdminUserService;
 import com.accompany.business.model.PrizeWhiteUser;
 import com.accompany.business.service.box.PrizeWhiteUserService;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/prize/UserCardsAdminController.java

@@ -20,7 +20,7 @@ import com.google.common.collect.Maps;
 import com.accompany.common.constant.Constant;
 import com.accompany.common.constant.OpenBoxKeyTypeEnum;
 import com.accompany.common.exception.ApiException;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/recharge/RechargeDiamondGiveHistoryAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.vo.charge.RechargeDiamondGiveAdminVo;
 import com.accompany.admin.vo.charge.RechargeDiamondGiveDetailAdminVo;
 import com.accompany.common.model.PageReq;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/recharge/RechargeRiskUserAdminController.java

@@ -4,7 +4,7 @@ import com.accompany.admin.service.recharge.RechargeRiskUserAdminService;
 import com.accompany.admin.vo.recharge.RechargeRiskUserAdminVo;
 import com.accompany.common.model.PageReq;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/recharge/RechargeUserAdminController.java

@@ -5,7 +5,7 @@ import com.accompany.admin.service.recharge.RechargeUserAdminService;
 import com.accompany.admin.vo.recharge.RechargeUserAdminVo;
 import com.accompany.common.model.PageReq;
 import com.accompany.common.result.BusiResult;
-import com.accompany.common.result.PageResult;
+import com.accompany.core.result.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/record/GiveKeyAdminController.java

@@ -9,7 +9,7 @@ import com.accompany.admin.vo.UserKeyVo;
 import com.accompany.admin.vo.UsersVo;
 import com.accompany.business.service.box.UserPrizeKeyService;
 import com.google.common.collect.Maps;
-import com.accompany.core.result.BusiResult;
+import com.accompany.common.result.BusiResult;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.BlankUtil;
 import org.slf4j.Logger;