Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.adam;
+
+import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberAdminService;
+import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberCodeAdminService;
+import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
+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.base.ResponseDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Api(tags = "后台管理:会员信息")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/admin/member")
+public class AdamMemberAdminController {
+    @Autowired
+    IAdamMemberAdminService adamMemberService;
+    @Autowired
+    IAdamMemberCodeAdminService adamMemberCodeAdminService;
+
+    @ApiOperation(value = "添加会员卡")
+    @PostMapping("add")
+    public ResponseDto<Object> add(@RequestBody AdamMemberParam parameter) {
+        return ResponseDto.success(adamMemberService.add(parameter));
+    }
+
+    @ApiOperation(value = "会员卡列表")
+    @PostMapping("list")
+    public ResponseDto<List<AdamMemberVo>> list() {
+        List<AdamMember> list = adamMemberService.list();
+        List<AdamMemberVo> vos = new ArrayList<>();
+        list.forEach(r -> {
+            vos.add(AdamMemberVo.getNew().copy(r));
+        });
+        return ResponseDto.success(vos);
+    }
+
+    @ApiOperation(value = "同步会员卡")
+    @PostMapping("sync")
+    public ResponseDto<Object> sync() {
+        return adamMemberService.sync();
+    }
+
+    @PostMapping("gen_code")
+    public ResponseDto<String> genMemberCode(@RequestBody AdamMemberCodeParam parameter) {
+        return ResponseDto.success(adamMemberCodeAdminService.createGiftCode(parameter));
+    }
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamMemberPriceAdminController.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberPriceAdminController.java

-package com.liquidnet.service.adam.controller.admin;
+package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberPriceAdminService;
 import com.liquidnet.service.adam.dto.AdamMemberPriceParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
-import com.liquidnet.service.adam.service.admin.IAdamMemberPriceAdminService;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -23,17 +21,15 @@ import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 
-@ApiSupport(order = 90061)
 @Api(tags = "后台管理:会员价格")
 @Slf4j
 @Validated
 @RestController
 @RequestMapping("admin/member/price")
-public class AdamMemberPriceAdminController extends AdamBaseController {
+public class AdamMemberPriceAdminController {
     @Autowired
     IAdamMemberPriceAdminService adamMemberPriceService;
 
-    @ApiOperationSupport(order = 1)
     @ApiOperation(value = "会员价格列表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "memberId", value = "会员卡ID[64]"),
@@ -50,7 +46,6 @@ public class AdamMemberPriceAdminController extends AdamBaseController {
         return ResponseDto.success(vos);
     }
 
-    @ApiOperationSupport(order = 2)
     @ApiOperation(value = "会员价格详情")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "memberId", value = "会员卡ID[64]"),
@@ -66,7 +61,6 @@ public class AdamMemberPriceAdminController extends AdamBaseController {
         return ResponseDto.success(AdamMemberPriceVo.getNew().copy(one));
     }
 
-    @ApiOperationSupport(order = 3)
     @ApiOperation(value = "添加会员价格")
     @PostMapping("add")
     public ResponseDto<AdamMemberPriceVo> add(@Valid @RequestBody AdamMemberPriceParam param) {
@@ -75,7 +69,6 @@ public class AdamMemberPriceAdminController extends AdamBaseController {
         return ResponseDto.success(adamMemberPriceService.add(entity));
     }
 
-    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "编辑会员价格")
     @PostMapping("edit")
     public ResponseDto<AdamMemberPriceVo> edit(@Valid @RequestBody AdamMemberPriceParam param) {

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberAdminService.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/IAdamMemberAdminService.java

-package com.liquidnet.service.adam.service.admin;
+package com.liquidnet.client.admin.zhengzai.adam.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.AdamMemberParam;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberCodeAdminService.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/IAdamMemberCodeAdminService.java

-package com.liquidnet.service.adam.service.admin;
+package com.liquidnet.client.admin.zhengzai.adam.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.AdamMemberCodeParam;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberOrderAdminService.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/IAdamMemberOrderAdminService.java

-package com.liquidnet.service.adam.service.admin;
+package com.liquidnet.client.admin.zhengzai.adam.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.MemberOrderDto;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberPriceAdminService.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/IAdamMemberPriceAdminService.java

-package com.liquidnet.service.adam.service.admin;
+package com.liquidnet.client.admin.zhengzai.adam.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.AdamMemberPriceParam;

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

-package com.liquidnet.service.adam.service.impl.admin;
+package com.liquidnet.client.admin.zhengzai.adam.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberCodeAdminService;
 import com.liquidnet.common.mq.constant.MQConst;
 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.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserMemberService;
-import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService;
 import com.liquidnet.service.adam.util.MemberUtil;
 import com.liquidnet.service.base.SqlMapping;
 import lombok.extern.slf4j.Slf4j;
@@ -31,8 +30,8 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
     RabbitTemplate rabbitTemplate;
     @Autowired
     IAdamUserMemberService adamUserMemberService;
-    @Autowired
-    AdamRdmService adamRdmService;
+//    @Autowired
+//    AdamRdmService adamRdmService;
 
     @Override
     public String createGiftCode(AdamMemberCodeParam param) {
@@ -63,7 +62,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
 
         AdamMemberCodeVo vo = AdamMemberCodeVo.getNew().copy(initMemberCode);
         mongoTemplate.insert(vo, AdamMemberCodeVo.class.getSimpleName());
-        adamRdmService.setMemberCodeVoByCode(mCode, vo);
+//        adamRdmService.setMemberCodeVoByCode(mCode, vo);
         rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get("adam_member_code.add",
                         initMemberCode.getCode(), initMemberCode.getType(), initMemberCode.getMemberId(), initMemberCode.getMemberPriceId(),

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.adam.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberOrderAdminService;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.adam.dto.MemberOrderDto;
 import com.liquidnet.service.adam.dto.param.admin.MemberOrderListReq;
@@ -17,7 +18,6 @@ import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
 import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
 import com.liquidnet.service.adam.mapper.AdamUserMapper;
 import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
-import com.liquidnet.service.adam.service.admin.IAdamMemberOrderAdminService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/admin/AdamMemberPriceAdminServiceImpl.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberPriceAdminServiceImpl.java

-package com.liquidnet.service.adam.service.impl.admin;
+package com.liquidnet.client.admin.zhengzai.adam.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberPriceAdminService;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
@@ -10,7 +11,6 @@ import com.liquidnet.service.adam.dto.AdamMemberPriceParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import com.liquidnet.service.adam.mapper.AdamMemberPriceMapper;
-import com.liquidnet.service.adam.service.admin.IAdamMemberPriceAdminService;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

-package com.liquidnet.service.adam.service.impl.admin;
+package com.liquidnet.client.admin.zhengzai.adam.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberAdminService;
 import com.liquidnet.commons.lang.util.IDGenerator;
 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.AdamRdmService;
-import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService;
 import com.liquidnet.service.base.ResponseDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -30,8 +28,8 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
     AdamMemberMapper adamMemberMapper;
     @Autowired
     MongoTemplate mongoTemplate;
-    @Autowired
-    AdamRdmService adamRdmService;
+//    @Autowired
+//    AdamRdmService adamRdmService;
 
     @Override
     public AdamMemberVo add(AdamMemberParam param) {
@@ -52,7 +50,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
 
         mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
 
-        adamRdmService.setMemberVoByMemberId(vo.getMemberId(), vo);
+//        adamRdmService.setMemberVoByMemberId(vo.getMemberId(), vo);
 
         return vo;
     }
@@ -66,7 +64,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
         mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberVo.class.getSimpleName());
         AdamMemberVo vo = AdamMemberVo.getNew().copy(list.get(0));
         mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
-        adamRdmService.delMemberVoByMemberId(vo.getMemberId());
+//        adamRdmService.delMemberVoByMemberId(vo.getMemberId());
         return ResponseDto.success();
     }
 }

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

@@ -145,13 +145,14 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void edit(AdamAddressesParam parameter) {
+        String currentUid = CurrentUtil.getCurrentUid();
         LocalDateTime now = LocalDateTime.now();
 
         AdamAddressesVo updateVo = AdamAddressesVo.getNew();
         BeanUtils.copyProperties(parameter, updateVo);
         long s = System.currentTimeMillis();
         Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
-                Query.query(Criteria.where("addressesId").is(parameter.getAddressesId())).getQueryObject(),
+                Query.query(Criteria.where("uid").is(currentUid).and("addressesId").is(parameter.getAddressesId())).getQueryObject(),
                 new Document("$set", Document.parse(JsonUtils.toJson(updateVo)).append("updatedAt", now)),
                 new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
         );
@@ -159,7 +160,6 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
         if (null != doc) {
             updateVo = BsonUtil.toBean(doc, AdamAddressesVo.class);
 
-            String currentUid = CurrentUtil.getCurrentUid();
             List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(currentUid);
             s = System.currentTimeMillis();
             adamRdmService.setAddressesVoByUid(updateVo.getUid(), this.collectionProcess(vos, parameter.getAddressesId(), updateVo));
@@ -178,6 +178,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void remove(String uid, String addressesId) {
+        String currentUid = CurrentUtil.getCurrentUid();
         LocalDateTime now = LocalDateTime.now();
 
 //        AdamAddressesVo removeVo = AdamAddressesVo.getNew();
@@ -188,7 +189,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
 
         long s = System.currentTimeMillis();
         DeleteResult deleteResult = mongoTemplate.remove(
-                Query.query(Criteria.where("addressesId").is(addressesId)), AdamAddressesVo.class.getSimpleName()
+                Query.query(Criteria.where("uid").is(currentUid).and("addressesId").is(addressesId)), AdamAddressesVo.class.getSimpleName()
         );
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
         List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);

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

@@ -163,9 +163,8 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void edit(AdamEntersParam parameter) {
-        LocalDateTime now = LocalDateTime.now();
         String currentUid = CurrentUtil.getCurrentUid();
-
+        LocalDateTime now = LocalDateTime.now();
 
         if (1 == parameter.getType()) {
             if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
@@ -173,12 +172,11 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
             }
         }
 
-
         AdamEntersVo updateVo = AdamEntersVo.getNew();
         BeanUtils.copyProperties(parameter, updateVo);
         long s = System.currentTimeMillis();
         Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
-                Query.query(Criteria.where("entersId").is(parameter.getEntersId())).getQueryObject(),
+                Query.query(Criteria.where("uid").is(currentUid).and("entersId").is(parameter.getEntersId())).getQueryObject(),
                 new Document("$set", Document.parse(JsonUtils.toJson(updateVo)).append("updatedAt", now)),
                 new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
         );
@@ -207,10 +205,11 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void remove(String uid, String entersId) {
+        String currentUid = CurrentUtil.getCurrentUid();
         LocalDateTime now = LocalDateTime.now();
         long s = System.currentTimeMillis();
         DeleteResult deleteResult = mongoTemplate.remove(
-                Query.query(Criteria.where("entersId").is(entersId)), AdamEntersVo.class.getSimpleName()
+                Query.query(Criteria.where("uid").is(currentUid).and("entersId").is(entersId)), AdamEntersVo.class.getSimpleName()
         );
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);

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

@@ -340,7 +340,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
         /* ---------------------- 收货地址信息 */
         s = System.currentTimeMillis();
-        deleteResult = mongoTemplate.remove(Query.query(Criteria.where("uid").is(uid).and("state").is(1)), AdamAddressesVo.class.getSimpleName());
+        deleteResult = mongoTemplate.remove(Query.query(Criteria.where("uid").is(uid)), AdamAddressesVo.class.getSimpleName());
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
         if (deleteResult.getDeletedCount() > 0) {
             toMqSqls.add(SqlMapping.get("adam_addresses.close"));