Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRdmService.java

-package com.liquidnet.service.adam.service;
-
-import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.entity.AdamEnters;
-
-import java.util.List;
-
-public interface IAdamRdmService {
-    boolean setUidByMobile(String mobile, String uid);
-
-    String getUidByMobile(String mobile);
-
-    void delUidByMobile(String mobile);
-
-    boolean setUidByPlatformOpenId(String platform, String openId, String uid);
-
-    String getUidByPlatformOpenId(String platform, String openId);
-
-    void delUidByPlatformOpenId(String platform, String openId);
-
-    boolean setUserInfoVoByUid(String uid, AdamUserInfoVo vo);
-
-    AdamUserInfoVo getUserInfoVoByUid(String uid);
-
-    void delUserInfoVoByUid(String uid);
-
-    boolean setRealInfoVoByUid(String uid, AdamRealInfoVo vo);
-
-    AdamRealInfoVo getRealInfoVoByUid(String uid);
-
-    boolean setCertification(int idType, String idNo, String idName);
-
-    boolean isCertification(int idType, String idNo, String idName);
-
-    boolean setThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> voList);
-
-    List<AdamThirdPartInfoVo> getThirdPartVoListByUid(String uid);
-
-    AdamThirdPartInfoVo getThirdPartVoByUidPlatform(String uid, String platform);
-
-    void delThirdPartVoListByUid(String uid);
-
-    boolean setEntersVoByUid(String uid, List<AdamEntersVo> list);
-
-    List<AdamEntersVo> getEntersVoByUid(String uid);
-
-    AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId);
-
-    List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, String... entersIds);
-
-    void delEntersVoByUid(String uid);
-
-    boolean setAddressesVoByUid(String uid, List<AdamAddressesVo> list);
-
-    List<AdamAddressesVo> getAddressesVoByUid(String uid);
-
-    AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId);
-
-    void delAddressesVoByUid(String uid);
-
-    boolean setBlacklistForMember(List<String> uids);
-
-    List<String> getBlacklistForMember();
-
-    boolean setUserMemberVoByUid(String uid, AdamUserMemberVo vo);
-
-    AdamUserMemberVo getUserMemberVoByUid(String uid);
-
-    void delUserMemberVoByUid(String uid);
-
-    AdamMemberSimpleVo getMemberSimpleVo();
-
-    boolean setMemberVoByMemberId(String memberId, AdamMemberVo vo);
-
-    AdamMemberVo getMemberVoByMemberId(String memberId);
-
-    void delMemberVoByMemberId(String memberId);
-
-    boolean setMemberPriceVoByMemberId(String memberId, List<AdamMemberPriceVo> vos);
-
-    List<AdamMemberPriceVo> getMemberPriceVoByMemberId(String memberId);
-
-    AdamMemberPriceVo getMemberPriceVoByPriceId(String memberId, String memberPriceId);
-
-    boolean setMemberRightsVoByMemberId(String memberId, List<AdamMemberRightsVo> vos);
-
-    List<AdamMemberRightsVo> getMemberRightsVoByMemberId(String memberId);
-
-    String getMemberAgreement();
-
-    boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo);
-
-    AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo);
-
-    void delShotMemberOrderVoByOrderNo(String orderNo);
-
-    boolean setMaxMemberNo(int val);
-
-    int incrMemberNo();
-
-    int getMaxMemberNo();
-
-    boolean setMemberCodeVoByCode(String memberCode, AdamMemberCodeVo vo);
-
-    AdamMemberCodeVo getMemberCodeVoByCode(String memberCode);
-
-    /**
-     * Temporarily connect Mongo
-     */
-    AdamMemberCodeVo getMemberCodeVoByBuyOrderNo(String buyOrderNo);
-
-    void delMemberCodeVoByCode(String memberCode);
-
-    boolean setTagsForSex(List<AdamTagVo> voList);
-
-    List<AdamTagVo> getTagsForSex();
-
-    boolean setTagsForMusic(List<AdamTagParentVo> voList);
-
-    List<AdamTagParentVo> getTagsForMusic();
-}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceAdminListParam.java

@@ -40,18 +40,18 @@ public class PerformanceAdminListParam {
         this.stopSellTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(now.plusDays(-stopSellDay));
     }
 
-    @ApiModelProperty(hidden = true)
-    private Integer page;
-    @ApiModelProperty(hidden = true)
-    private Integer size;
-
-    public void setPageNum(Integer pageNum){
-        this.pageNum=pageNum;
-        this.page=pageNum;
-    }
-
-    public void setPageSize(Integer pageSize){
-        this.pageSize=pageSize;
-        this.size=pageSize;
-    }
+//    @ApiModelProperty(hidden = true)
+//    private Integer page;
+//    @ApiModelProperty(hidden = true)
+//    private Integer size;
+//
+//    public void setPageNum(Integer pageNum){
+//        this.pageNum=pageNum;
+//        this.page=pageNum;
+//    }
+//
+//    public void setPageSize(Integer pageSize){
+//        this.pageSize=pageSize;
+//        this.size=pageSize;
+//    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -47,7 +47,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      * @param performanceAdminListParam 列表搜索参数
      * @return 分页 sql 数据
      */
-    List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam);
+    PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam);
 
     /**
      * 根据巡演id 查询演出列表 简易

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -60,9 +60,12 @@ public class KylinPerformancesController extends BaseController {
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) {
-        startPage();/**/
-        List<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
-        return getDataTable(result);
+        PageInfo<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(result.getList());
+        rspData.setTotal(result.getTotal());
+        return rspData;
     }
 
     @RequiresPermissions("kylin:performances:detail")
@@ -151,8 +154,8 @@ public class KylinPerformancesController extends BaseController {
     @RequiresPermissions("kylin:performances:agent")
     @PostMapping(value = "/agent/change")
     @ResponseBody
-    public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId,@RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
-        boolean result = kylinPerformancesService.changeTicketAgent(performancesId,ticketsId, status);
+    public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
+        boolean result = kylinPerformancesService.changeTicketAgent(performancesId, ticketsId, status);
         return toAjax(result);
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performances.html

@@ -76,23 +76,23 @@
             </form>
         </div>
 
-        <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:add">
-                <i class="fa fa-plus"></i> 添加
-            </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
-               shiro:hasPermission="kylin:performances:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
-               shiro:hasPermission="kylin:performances:remove">
-                <i class="fa fa-remove"></i> 删除
-            </a>
-            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:performances:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
-        </div>
-        <div class="col-sm-12 select-table table-bordered">
+<!--        <div class="btn-group-sm" id="toolbar" role="group">-->
+<!--            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:add">-->
+<!--                <i class="fa fa-plus"></i> 添加-->
+<!--            </a>-->
+<!--            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"-->
+<!--               shiro:hasPermission="kylin:performances:edit">-->
+<!--                <i class="fa fa-edit"></i> 修改-->
+<!--            </a>-->
+<!--            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"-->
+<!--               shiro:hasPermission="kylin:performances:remove">-->
+<!--                <i class="fa fa-remove"></i> 删除-->
+<!--            </a>-->
+<!--            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:performances:export">-->
+<!--                <i class="fa fa-download"></i> 导出-->
+<!--            </a>-->
+<!--        </div>-->
+        <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
         </div>
     </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -201,14 +201,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     }
 
     @Override
-    public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
+    public PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
+        PageInfo<PerformanceAdminListDao> pageInfo;
         List<PerformanceAdminListDao> newList = new ArrayList();
         try {
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
-
-
-
             for (PerformanceAdminListDao item : voList) {
                 item.setStatus(item.getStatus());
                 if(item.getStatus() >=6 && item.getStatus()!=7){
@@ -222,11 +220,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 }
                 newList.add(item);
             }
+            pageInfo = new PageInfo(voList);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
-        return newList;
+        return pageInfo;
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java

@@ -6,8 +6,8 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.dto.AdamAddressesParam;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamAddressesService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
@@ -39,7 +39,7 @@ import java.util.List;
 @RequestMapping("addr")
 public class AdamAddressesController {
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
     @Autowired
     IAdamAddressesService adamAddressesService;
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java

@@ -7,7 +7,7 @@ import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.dto.AdamEntersParam;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.service.IAdamEntersService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
@@ -40,7 +40,7 @@ import java.util.Optional;
 @RequestMapping("enters")
 public class AdamEntersController {
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
     @Autowired
     IAdamEntersService adamEntersService;
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -59,7 +59,7 @@ public class AdamLoginController {
     @Autowired
     DefaultAcsClient defaultAcsClient;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
     @Autowired
     IAdamUserService adamUserService;
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java

@@ -7,7 +7,7 @@ import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.service.IAdamMemberService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
@@ -31,7 +31,7 @@ import javax.validation.constraints.NotBlank;
 @RequestMapping("member")
 public class AdamMemberController {
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
     @Autowired
     IAdamMemberService adamMemberService;
     @Autowired

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java

@@ -15,7 +15,7 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
 import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.adam.service.IAdamMemberOrderService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
@@ -48,7 +48,7 @@ public class AdamMemberOrderController {
     @Autowired
     Environment env;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
     @Autowired
     IAdamMemberOrderService adamMemberOrderService;
     @Autowired

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -10,7 +10,7 @@ import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserInfoService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
@@ -43,7 +43,7 @@ public class AdamUserController {
     @Autowired
     Environment env;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
     @Autowired
     IAdamUserService adamUserService;
     @Autowired

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamMemberAdminController.java

@@ -7,7 +7,7 @@ import com.liquidnet.service.adam.dto.AdamMemberParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamMember;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService;
 import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService;
 import com.liquidnet.service.base.ResponseDto;
@@ -35,7 +35,7 @@ public class AdamMemberAdminController extends AdamBaseController {
     @Autowired
     IAdamMemberCodeAdminService adamMemberCodeAdminService;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加会员卡")

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java

@@ -6,7 +6,7 @@ import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamAddressesParam;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.service.IAdamAddressesService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
@@ -22,8 +22,6 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
@@ -49,7 +47,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
     @Autowired
     RabbitTemplate rabbitTemplate;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
 
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java

@@ -6,11 +6,12 @@ import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
 import com.liquidnet.service.adam.service.IAdamCollectionService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
@@ -45,7 +46,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
     @Autowired
     RabbitTemplate rabbitTemplate;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
 
     /* ---------------- 外部服务API ---------------- */
     @Autowired
@@ -78,15 +79,11 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
     public void del(String uid, String type, String... contentIds) {
         LocalDateTime now = LocalDateTime.now();
 
-//        AdamCollectBaseVo delVo = AdamCollectBaseVo.getNew();
-//        delVo.setState(2);
-//        delVo.setUpdatedAt(now);
-
-        UpdateResult updateResult = mongoTemplate.getCollection(AdamCollectBaseVo.class.getSimpleName()).updateMany(
-                Query.query(Criteria.where("uid").is(uid).and("type").is(type)
-                        .and("contentId").in(contentIds).and("state").is(1)).getQueryObject(),
-                new Document("$set", new Document("state", 2).append("updatedAt", now)));
-        if (updateResult.getModifiedCount() > 0) {
+        DeleteResult deleteResult = mongoTemplate.remove(
+                Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("contentId").in(contentIds)),
+                AdamCollectBaseVo.class.getSimpleName()
+        );
+        if (deleteResult.getDeletedCount() > 0) {
             LinkedList<Object[]> toMqObjs = new LinkedList<>();
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
@@ -98,9 +95,10 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
 
     @Override
     public boolean queryState(String uid, String type, String contentId) {
-        long count = mongoTemplate.count(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
-                .and("contentId").is(contentId).and("state").is(1)), AdamCollectBaseVo.class.getSimpleName());
-        return count > 0;
+        return mongoTemplate.exists(
+                Query.query(Criteria.where("uid").is(uid).and("contentId").is(contentId).and("type").is(type).and("state").is(1)),
+                AdamCollectBaseVo.class.getSimpleName()
+        );
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java

@@ -8,11 +8,12 @@ import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
 import com.liquidnet.service.adam.service.IAdamDisposedService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
@@ -47,7 +48,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
     @Autowired
     RabbitTemplate rabbitTemplate;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
 
 
     /* ---------------- 外部服务API ---------------- */
@@ -80,17 +81,12 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
     @Override
     public void del(String uid, String type, String... contentIds) {
         LocalDateTime now = LocalDateTime.now();
-        String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
 
-//        AdamDisposedBaseVo delVo = AdamDisposedBaseVo.getNew();
-//        delVo.setState(2);
-//        delVo.setUpdatedAt(now);
-
-        UpdateResult updateResult = mongoTemplate.getCollection(AdamDisposedBaseVo.class.getSimpleName()).updateMany(
-                Query.query(Criteria.where("uid").is(uid).and("type").is(type)
-                        .and("contentId").in(contentIds).and("state").is(1)).getQueryObject(),
-                new Document("$set", new Document("state", 2).append("updatedAt", now)));
-        if (updateResult.getModifiedCount() > 0) {
+        DeleteResult deleteResult = mongoTemplate.remove(
+                Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("contentId").in(contentIds)),
+                AdamDisposedBaseVo.class.getSimpleName()
+        );
+        if (deleteResult.getDeletedCount() > 0) {
             LinkedList<Object[]> toMqObjs = new LinkedList<>();
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
@@ -102,9 +98,10 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
 
     @Override
     public boolean queryState(String uid, String type, String contentId) {
-        long count = mongoTemplate.count(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
-                .and("contentId").is(contentId).and("state").is(1)), AdamDisposedBaseVo.class.getSimpleName());
-        return count > 0;
+        return mongoTemplate.exists(
+                Query.query(Criteria.where("uid").is(uid).and("contentId").is(contentId).and("type").is(type).and("state").is(1)),
+                AdamDisposedBaseVo.class.getSimpleName()
+        );
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java

@@ -6,7 +6,7 @@ import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamEntersParam;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.service.IAdamEntersService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
@@ -50,7 +50,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
     @Autowired
     RabbitTemplate rabbitTemplate;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
 
 
     private static final String PHP_API_REAL_NAME = "/IdCardCheckVerification";

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -11,8 +11,8 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
 import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
 import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamMemberOrderService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import com.liquidnet.service.adam.util.MemberUtil;
 import com.liquidnet.service.base.ErrorMapping;
@@ -49,7 +49,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
     @Autowired
     RabbitTemplate rabbitTemplate;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
     @Autowired
     IAdamUserMemberService adamUserMemberService;
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

@@ -9,7 +9,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamUserInfo;
 import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserInfoService;
 import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
@@ -45,7 +45,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
     @Autowired
     RabbitTemplate rabbitTemplate;
     @Autowired

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserMemberServiceImpl.java

@@ -6,7 +6,7 @@ import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserMember;
 import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
 
     @Override
     public String getNextMemberNo(String memberId) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -12,8 +12,8 @@ import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.entity.AdamRealName;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamEntersService;
-import com.liquidnet.service.adam.service.IAdamRdmService;
 import com.liquidnet.service.adam.service.IAdamRealNameService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
@@ -67,7 +67,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
     @Autowired
     IAdamRealNameService adamRealNameService;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
 
 
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/admin/AdamMemberCodeAdminServiceImpl.java

@@ -5,7 +5,7 @@ import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo;
 import com.liquidnet.service.adam.entity.AdamMemberCode;
 import com.liquidnet.service.adam.mapper.AdamMemberCodeMapper;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService;
 import com.liquidnet.service.adam.util.MemberUtil;
@@ -29,7 +29,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
     @Autowired
     IAdamUserMemberService adamUserMemberService;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
 
     @Override
     public String createGiftCode(AdamMemberCodeParam param) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/admin/AdamMemberServiceAdminImpl.java

@@ -8,7 +8,7 @@ import com.liquidnet.service.adam.dto.AdamMemberParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.mapper.AdamMemberMapper;
-import com.liquidnet.service.adam.service.IAdamRdmService;
+import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService;
 import com.liquidnet.service.base.ResponseDto;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +31,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
-    IAdamRdmService adamRdmService;
+    AdamRdmService adamRdmService;
 
     @Override
     public AdamMemberVo add(AdamMemberParam param) {