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

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

@@ -41,13 +41,4 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
      * @return
      */
     List<AdamMemberOrderVo> getMemberOrderList(String uid);
-
-    /**
-     * 获取订单详情信息
-     *
-     * @param orderNo 订单号
-     * @return
-     */
-    AdamMemberOrderVo getMemberOrderInfo(String uid,String orderNo);
-
 }

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

 package com.liquidnet.service.adam.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
-import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 
 /**
  * 客户端调用
  */
 public interface IAdamMemberService extends IService<AdamMember>  {
-    AdamMemberVo queryMemberInfo();
+//    AdamMemberVo queryMemberInfo();
 
 //    AdamMemberSimpleVo queryMemberSimpleVo();
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/pom.xml

@@ -100,18 +100,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.4.0</version>
-        </dependency>
-
     </dependencies>
 
 </project>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-framework/pom.xml

@@ -77,6 +77,16 @@
             <artifactId>liquidnet-client-admin-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.4.0</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

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

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

@@ -90,18 +90,6 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         return voList;
     }
 
-    @Override
-    public AdamMemberOrderVo getMemberOrderInfo(String uid, String orderNo) {
-        AdamMemberOrderVo orderVo = (AdamMemberOrderVo) redisUtil.hget(AdamRedisConst.INFO_MEMBERS_ORDER_INFO.concat(uid), orderNo);
-        if (null == orderVo) {
-            orderVo = mongoTemplate.findOne(Query.query(Criteria.where("orderNo").is(orderNo).and("uid").is(uid)),
-                    AdamMemberOrderVo.class, AdamMemberOrderVo.class.getSimpleName());
-
-            if (null != orderVo) redisUtil.hset(AdamRedisConst.INFO_MEMBERS_ORDER_INFO.concat(uid), orderNo, orderVo);
-        }
-        return orderVo;
-    }
-
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(AdamMemberOrderParam param) {
@@ -116,26 +104,26 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
         String createdAt = DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss);
         // 生成订单信息
-        AdamMemberOrderVo orderVo = new AdamMemberOrderVo();
+        AdamMemberOrderVo memberOrderVo = new AdamMemberOrderVo();
         String orderNo = IDGenerator.nextSnowId().toString().concat("V");
-        orderVo.setOrderNo(orderNo);
-        orderVo.setMemberId(param.getMemberId());
-        orderVo.setDays(memberPriceVo.getDays());
-        orderVo.setMemberPriceId(param.getMemberPriceId());
-        orderVo.setCreatedAt(createdAt);
-        orderVo.setMemberName(memberVo.getName());
-        orderVo.setMode(param.getMode());
-        orderVo.setDeviceFrom(param.getDeviceFrom());
-        orderVo.setPayType(param.getPayType());
-        orderVo.setState(0);// 0-待支付
-        orderVo.setUid(CurrentUtil.getCurrentUid());
-        orderVo.setPrice(param.getPrice());
-        orderVo.setClientIp(CurrentUtil.getCliIpAddr());
-        orderVo.setVersion(CurrentUtil.getCliVersion());
-        orderVo.setSource(CurrentUtil.getCliSource());
-
-        if (!adamRdmService.setShotMemberOrderVoByOrderNo(orderNo, orderVo)) {
-            log.warn("###购买会员创建订单失败[orderVo:{}]", JsonUtils.toJson(orderVo));
+        memberOrderVo.setOrderNo(orderNo);
+        memberOrderVo.setMemberId(param.getMemberId());
+        memberOrderVo.setDays(memberPriceVo.getDays());
+        memberOrderVo.setMemberPriceId(param.getMemberPriceId());
+        memberOrderVo.setCreatedAt(createdAt);
+        memberOrderVo.setMemberName(memberVo.getName());
+        memberOrderVo.setMode(param.getMode());
+        memberOrderVo.setDeviceFrom(param.getDeviceFrom());
+        memberOrderVo.setPayType(param.getPayType());
+        memberOrderVo.setState(0);// 0-待支付
+        memberOrderVo.setUid(CurrentUtil.getCurrentUid());
+        memberOrderVo.setPrice(param.getPrice());
+        memberOrderVo.setClientIp(CurrentUtil.getCliIpAddr());
+        memberOrderVo.setVersion(CurrentUtil.getCliVersion());
+        memberOrderVo.setSource(CurrentUtil.getCliSource());
+
+        if (!adamRdmService.setShotMemberOrderVoByOrderNo(orderNo, memberOrderVo)) {
+            log.warn("###购买会员创建订单失败[memberOrderVo:{}]", JsonUtils.toJson(memberOrderVo));
             return ResponseDto.failure(ErrorMapping.get("10210"));
         }
 
@@ -143,9 +131,9 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         LinkedMultiValueMap<String, String> payParam = new LinkedMultiValueMap<>();
         payParam.add("type", "VIP");// VIP,CLUB
         payParam.add("price", String.valueOf(memberPriceVo.getPrice()));
-        payParam.add("name", orderVo.getMemberName());
-        payParam.add("order_code", orderVo.getOrderNo());
-        payParam.add("client_ip", orderVo.getClientIp());
+        payParam.add("name", memberOrderVo.getMemberName());
+        payParam.add("order_code", memberOrderVo.getOrderNo());
+        payParam.add("client_ip", memberOrderVo.getClientIp());
         payParam.add("notify_url", env.getProperty("liquidnet.url-pay.callback"));
         payParam.add("create_date", createdAt);
         payParam.add("expire_time", "5");
@@ -167,15 +155,15 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
             result.setCode((String) payResult.get("code"));
             result.setPayData(payResult.get("pay_data"));
 
-            orderVo.setPayNo(result.getCode());
+            memberOrderVo.setPayNo(result.getCode());
         } catch (Exception e) {
             log.warn("###购买会员下单调用支付中心异常[payParam:{}]", JsonUtils.toJson(payParam), e);
 
             return ResponseDto.failure(ErrorMapping.get("10203"));
         }
-        adamRdmService.setShotMemberOrderVoByOrderNo(orderNo, orderVo);
+        adamRdmService.setShotMemberOrderVoByOrderNo(orderNo, memberOrderVo);
 
-        result.setOrderNo(orderVo.getOrderNo());
+        result.setOrderNo(memberOrderVo.getOrderNo());
         result.setShowUrl(param.getShowUrl());
         result.setReturnUrl(param.getReturnUrl());
         return ResponseDto.success(result);
@@ -318,7 +306,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs));
 
-        adamRdmService.delShotMemberOrderVoByOrderNo(handleMemberOrderVo.getOrderNo());
+        adamRdmService.setShotMemberOrderVoByOrderNo(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/AdamMemberServiceImpl.java

@@ -38,39 +38,39 @@ public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMem
     @Autowired
     RedisUtil redisUtil;
 
-    @Override
-    public AdamMemberVo queryMemberInfo() {
-        AdamMemberVo info = null;
-        List<AdamMemberVo> adamMemberVoList = mongoTemplate.findAll(AdamMemberVo.class);
-        int tag = 0;
-        if (adamMemberVoList.size() > 0) {
-            info = adamMemberVoList.get(0);
-        } else  {
-            AdamMember firstMember = adamMemberMapper.getFirstMember();
-            if (null == firstMember) {
-                return null;
-            }
-            info = new AdamMemberVo();
-            BeanUtils.copyProperties(firstMember, info);
-            tag = 1;
-        }
-        String memberId = info.getMemberId();
-        List<AdamMemberPriceVo> memberPrice = new ArrayList<>();
-
-        LinkedHashSet<String> hkeys = (LinkedHashSet<String>) redisUtil.hkeys(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat(memberId));
-        Iterator<String> priceIterator = hkeys.iterator();
-        while(priceIterator.hasNext()){
-            String key = priceIterator.next();
-            AdamMemberPriceVo tempMemberPrice = (AdamMemberPriceVo) redisUtil.hget(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat(memberId), key);
-            memberPrice.add(tempMemberPrice);
-        }
-
-        info.setPriceVoList(memberPrice);
-        if (1 == tag) {
-            mongoTemplate.insert(info, AdamMemberVo.class.getSimpleName());
-        }
-        return info;
-    }
+//    @Override
+//    public AdamMemberVo queryMemberInfo() {
+//        AdamMemberVo info = null;
+//        List<AdamMemberVo> adamMemberVoList = mongoTemplate.findAll(AdamMemberVo.class);
+//        int tag = 0;
+//        if (adamMemberVoList.size() > 0) {
+//            info = adamMemberVoList.get(0);
+//        } else  {
+//            AdamMember firstMember = adamMemberMapper.getFirstMember();
+//            if (null == firstMember) {
+//                return null;
+//            }
+//            info = new AdamMemberVo();
+//            BeanUtils.copyProperties(firstMember, info);
+//            tag = 1;
+//        }
+//        String memberId = info.getMemberId();
+//        List<AdamMemberPriceVo> memberPrice = new ArrayList<>();
+//
+//        LinkedHashSet<String> hkeys = (LinkedHashSet<String>) redisUtil.hkeys(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat(memberId));
+//        Iterator<String> priceIterator = hkeys.iterator();
+//        while(priceIterator.hasNext()){
+//            String key = priceIterator.next();
+//            AdamMemberPriceVo tempMemberPrice = (AdamMemberPriceVo) redisUtil.hget(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat(memberId), key);
+//            memberPrice.add(tempMemberPrice);
+//        }
+//
+//        info.setPriceVoList(memberPrice);
+//        if (1 == tag) {
+//            mongoTemplate.insert(info, AdamMemberVo.class.getSimpleName());
+//        }
+//        return info;
+//    }
 
 //    @Override
 //    public AdamMemberSimpleVo queryMemberSimpleVo() {

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

@@ -325,7 +325,17 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
 
     @Override
     public AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo) {
-        return (AdamMemberOrderVo) redisUtil.get(AdamRedisConst.SHOT_MEMBER_ORDER.concat(orderNo));
+        String key = AdamRedisConst.SHOT_MEMBER_ORDER.concat(orderNo);
+        AdamMemberOrderVo vo = (AdamMemberOrderVo) redisUtil.get(key);
+        if (null == vo) {
+            vo = mongoTemplate.findOne(
+                    Query.query(Criteria.where("orderNo").is(orderNo)),
+                    AdamMemberOrderVo.class, AdamMemberOrderVo.class.getSimpleName()
+            );
+
+            if (null != vo) redisUtil.set(key, vo);
+        }
+        return vo;
     }
 
     @Override