fix:会员订单查询隔离;

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

@@ -78,11 +78,11 @@ public interface IAdamRdmService {
 
     String getMemberAgreement();
 
-    boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo);
+    boolean setShotMemberOrderVoByOrderNo(String uid, String orderNo, AdamMemberOrderVo vo);
 
-    AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo);
+    AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String uid, String orderNo);
 
-    void delShotMemberOrderVoByOrderNo(String orderNo);
+    void delShotMemberOrderVoByOrderNo(String uid, String orderNo);
 
     boolean setMemberNoByMemberId(String memberId, long val);
 

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

@@ -28,7 +28,7 @@ public class AdamRedisConst {
     public static final String INFO_MEMBER_CODE = INFO.concat("member:code:");
 
     public static final String SHOT = "shot:";
-    public static final String SHOT_MEMBER_ORDER = SHOT.concat("member:order:");
+    public static final String SHOT_MEMBER_ORDER = SHOT.concat("morder:");
 
     public static final String INFO_TAGS_SEX = INFO.concat("tags:sex");
     public static final String INFO_TAGS_MUSIC = INFO.concat("tags:music");

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

@@ -189,14 +189,14 @@ public class AdamMemberOrderController {
     @ApiOperation(value = "会员订单详情")
     @GetMapping("info/{orderNo}")
     public ResponseDto<AdamMemberOrderVo> getMemberOrderList(@NotBlank @PathVariable String orderNo) {
-        return ResponseDto.success(adamRdmService.getShotMemberOrderVoByOrderNo(orderNo));
+        return ResponseDto.success(adamRdmService.getShotMemberOrderVoByOrderNo(CurrentUtil.getCurrentUid(), orderNo));
     }
 
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "会员订单状态")
     @GetMapping("check")
     public ResponseDto<Integer> checkOrderResult(@NotBlank @RequestParam String orderNo) {
-        AdamMemberOrderVo memberOrderInfo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo);
+        AdamMemberOrderVo memberOrderInfo = adamRdmService.getShotMemberOrderVoByOrderNo(CurrentUtil.getCurrentUid(), orderNo);
         if (null == memberOrderInfo) {
             return ResponseDto.failure(ErrorMapping.get("10211"));
         }

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

@@ -136,7 +136,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         memberOrderVo.setVersion(CurrentUtil.getCliVersion());
         memberOrderVo.setSource(CurrentUtil.getCliSource());
 
-        if (!adamRdmService.setShotMemberOrderVoByOrderNo(orderNo, memberOrderVo)) {
+        if (!adamRdmService.setShotMemberOrderVoByOrderNo(memberOrderVo.getUid(), orderNo, memberOrderVo)) {
             log.warn("###购买会员创建订单失败[memberOrderVo:{}]", JsonUtils.toJson(memberOrderVo));
             return ResponseDto.failure(ErrorMapping.get("10210"));
         }
@@ -157,7 +157,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
             return ResponseDto.failure(ErrorMapping.get("10203"));
         }
-        adamRdmService.setShotMemberOrderVoByOrderNo(orderNo, memberOrderVo);
+        adamRdmService.setShotMemberOrderVoByOrderNo(memberOrderVo.getUid(), orderNo, memberOrderVo);
 
         result.setOrderNo(memberOrderVo.getOrderNo());
         result.setShowUrl(param.getShowUrl());
@@ -167,7 +167,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
     @Override
     public ResponseDto<Object> paymentNotifyCallBack(AdamMemberOrderCallbackParam parameter) {
-        AdamMemberOrderVo handleMemberOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(parameter.getOrderCode());
+        AdamMemberOrderVo handleMemberOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(CurrentUtil.getCurrentUid(), parameter.getOrderCode());
         // AdamMemberConst.STATUS_*:0-待支付,1-已支付,2-已过期,3-超时付,4-退款中,5-退款完成
         if (1 == handleMemberOrderVo.getState() || 3 == handleMemberOrderVo.getState()) {
             return ResponseDto.failure(ErrorMapping.get("10502"), parameter);
@@ -287,7 +287,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs));
 
-        adamRdmService.setShotMemberOrderVoByOrderNo(handleMemberOrderVo.getOrderNo(), handleMemberOrderVo);
+        adamRdmService.setShotMemberOrderVoByOrderNo(handleMemberOrderVo.getUid(), handleMemberOrderVo.getOrderNo(), handleMemberOrderVo);
         return ResponseDto.success();
     }
 

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

@@ -323,17 +323,17 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo) {
-        return redisUtil.set(AdamRedisConst.SHOT_MEMBER_ORDER.concat(orderNo), vo);
+    public boolean setShotMemberOrderVoByOrderNo(String uid, String orderNo, AdamMemberOrderVo vo) {
+        return redisUtil.set(AdamRedisConst.SHOT_MEMBER_ORDER + uid + ":" + orderNo, vo);
     }
 
     @Override
-    public AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo) {
-        String key = AdamRedisConst.SHOT_MEMBER_ORDER.concat(orderNo);
+    public AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String uid, String orderNo) {
+        String key = AdamRedisConst.SHOT_MEMBER_ORDER + uid + ":" + orderNo;
         AdamMemberOrderVo vo = (AdamMemberOrderVo) redisUtil.get(key);
         if (null == vo) {
             vo = mongoTemplate.findOne(
-                    Query.query(Criteria.where("orderNo").is(orderNo)),
+                    Query.query(Criteria.where("orderNo").is(orderNo).and("uid").is(uid)),
                     AdamMemberOrderVo.class, AdamMemberOrderVo.class.getSimpleName()
             );
 
@@ -343,8 +343,8 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public void delShotMemberOrderVoByOrderNo(String orderNo) {
-        redisUtil.del(AdamRedisConst.SHOT_MEMBER_ORDER.concat(orderNo));
+    public void delShotMemberOrderVoByOrderNo(String uid, String orderNo) {
+        redisUtil.del(AdamRedisConst.SHOT_MEMBER_ORDER + uid + ":" + orderNo);
     }
 
     @Override