fix:mq;

会员订单存储key调整;

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 uid, String orderNo, AdamMemberOrderVo vo);
+    boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo);
 
-    AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String uid, String orderNo);
+    AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo);
 
-    void delShotMemberOrderVoByOrderNo(String uid, String orderNo);
+    void delShotMemberOrderVoByOrderNo(String orderNo);
 
     boolean setMaxMemberNo(int val);
 

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

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

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

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

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

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/impl/BaseDao.java

 package com.liquidnet.service.consumer.service.impl;
 
-import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.consumer.service.IBaseDao;
 import org.slf4j.Logger;
@@ -53,29 +52,24 @@ public class BaseDao implements IBaseDao {
     @Override
     public Boolean batchSqls(final LinkedList<String> sql,
                              final LinkedList<Object[]>... values) {
-        TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
-            @Override
-            public Boolean doInTransaction(final TransactionStatus transactionStatus) {
-                int i = 0;
-                for (LinkedList<Object[]> o : values) {
-                    if (sql.size() < i + 1) {
-                        break;
-                    }
-                    if (!o.isEmpty()) {
-                        jdbcTemplate.batchUpdate(sql.get(i), o);
-
-//                        for (int c : ints) {
-//                            if (c <= 0) {
-//                                throw new LiquidnetServiceException("NON.SQL", sql.get(i));
-//                            }
-//                        }
+        try {
+            TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+                @Override
+                public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                    int i = 0;
+                    for (LinkedList<Object[]> o : values) {
+                        if (sql.size() < i + 1) {
+                            break;
+                        }
+                        if (!o.isEmpty()) {
+                            jdbcTemplate.batchUpdate(sql.get(i), o);
+                        }
+                        i++;
                     }
-                    i++;
+                    return true;
                 }
-                return true;
-            }
-        };
-        try {
+            };
+
             TransactionTemplate tt = new TransactionTemplate(transactionManager);
             return tt.execute(callback);
         } catch (Exception ex) {