1

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

@@ -16,5 +16,8 @@ public class AdamMemberOrderResult implements Serializable {
 
     private Object payObject;
 
+    // 判断状态 0-返回请求错误联系客服  1-返回服务器繁忙
+    private Integer state;
+
 
 }

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
 import com.liquidnet.service.adam.service.IAdamMemberOrderService;
@@ -39,7 +40,7 @@ public class AdamMemberOrderController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "使用兑换码")
     @PostMapping("/use/memberCode")
-    public ResponseDto<AdamMemberOrder> useMemberCode(AdamMemberOrderParam param) {
+    public ResponseDto<AdamMemberOrder> useMemberCode(AdamMemberOrderCodeParam param) {
         try {
             adamMemberOrderService.useMemberCode(param);
             return new ResponseDto().success();

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

@@ -6,10 +6,13 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
+import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
+import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
 import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
 import com.liquidnet.service.adam.mapper.AdamMemberPriceMapper;
 import com.liquidnet.service.adam.service.IAdamMemberOrderService;
+import com.liquidnet.service.adam.service.IAdamMemberService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +20,8 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Slf4j
 @Service
 public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMapper, AdamMemberOrder> implements IAdamMemberOrderService {
@@ -33,6 +38,8 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
     RabbitTemplate rabbitTemplate;
     @Autowired
     RedisUtil redisUtil;
+    @Autowired
+    IAdamMemberService adamMemberService;
 
     @Override
     public AdamMemberOrderResult buyMemberOrMemberCode(AdamMemberOrderParam param) {
@@ -40,9 +47,19 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         // 判断黑名单，待定（暂不做）
 
         // 验证会员是否有效
-
+        AdamMemberVo adamMemberVo = adamMemberService.queryMemberInfo();
+        if (adamMemberVo.getMemberId() != param.getMemberId()) {
+            result.setState(0);
+            return result;
+        }
         // 验证价格是否有效
+        List<AdamMemberPriceVo> adamMemberPrice = adamMemberVo.getAdamMemberPrice();
+        for (int i = 0; i < adamMemberPrice.size(); i++) {
+            AdamMemberPriceVo adamMemberPriceVo = adamMemberPrice.get(i);
+            if (adamMemberPriceVo.getMemberPriceId().equals(param.getMemberPriceId())) {
 
+            }
+        }
         // 获取会员编号
 
         // 生成订单信息
@@ -50,7 +67,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         int buyType = param.getMode();
         // 判断购买情况
         // 调取对应支付接口
-        String a= "";
+        String a = "";
         switch (buyType) {
             case 0:
                 a = "1";
@@ -67,6 +84,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
     /**
      * 使用会员码
+     *
      * @param param
      * @return
      */
@@ -79,6 +97,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
     /**
      * 购买会员
+     *
      * @return
      */
     private Object buyMember() {
@@ -87,6 +106,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
     /**
      * 购买会员码
+     *
      * @return
      */
     private Object buyMemberCode() {