Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

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

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

@@ -5,15 +5,18 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @ApiModel(value = "AdamMemberOrderCodeParam", description = "使用兑换码")
 @Data
 public class AdamMemberOrderCodeParam implements Serializable {
     private static final long serialVersionUID = 5940725094369061032L;
 
-    @ApiModelProperty(position = 0, required = false, example = "0")
-    private String uid;
+    @ApiModelProperty(position = 0, required = true, value = "类型2-会员码 3-礼包码", example = "2")
+    private int type;
     @ApiModelProperty(position = 1, required = true, example = "0")
     private String memberCode;
+    @ApiModelProperty(position = 2, required = true, example = "0")
+    private LocalDateTime birthday;
 
 }

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

@@ -42,7 +42,7 @@ public class AdamMemberOrderVo implements Serializable {
     private String createdAt;
     @ApiModelProperty(position = 14, value = "兑换码")
     private String memberCode;
-    @ApiModelProperty(position = 15, value = "兑换码")
+    @ApiModelProperty(position = 15, value = "价格")
     private BigDecimal price;
 
     public static final AdamMemberOrderVo obj = new AdamMemberOrderVo();

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

@@ -8,6 +8,8 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
 
+import java.util.List;
+
 /**
  * 对客户端API接口
  */
@@ -24,7 +26,14 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
      * @param param
      * @return
      */
-    Object useMemberCode(AdamMemberOrderCodeParam param);
+    boolean useMemberCode(AdamMemberOrderCodeParam param);
+
+    /**
+     * 获取订单列表
+     * @param uid
+     * @return
+     */
+    List<AdamMemberOrderVo> getMemberOrderList(String uid);
 
     /**
      * 获取订单详情信息
@@ -32,7 +41,7 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
      * @param orderNo 订单号
      * @return
      */
-    AdamMemberOrderVo getMemberOrderInfo(String orderNo);
+    AdamMemberOrderVo getMemberOrderInfo(String uid,String orderNo);
 
     /**
      * 支付回调

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

 package com.liquidnet.service.adam.service.admin;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 
 import java.util.List;
@@ -10,7 +11,7 @@ public interface IAdamMemberPriceService extends IService<AdamMemberPrice> {
 
     void add(AdamMemberPrice info);
 
-    AdamMemberPrice query(String memberPriceId);
+    AdamMemberPriceVo query(String memberId, String memberPriceId);
 
     boolean edit(AdamMemberPrice info);
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/constant/AdamMemberOrderConst.java → liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/constant/AdamMemberConst.java

@@ -3,7 +3,7 @@ package com.liquidnet.service.adam.constant;
 /**
  * 订单
  */
-public class AdamMemberOrderConst {
+public class AdamMemberConst {
     // 订单状态
     public static final Integer STATUS_UNPAID = 0;   // 待支付
     public static final Integer STATUS_PAID = 1;    //  已支付
@@ -30,5 +30,13 @@ public class AdamMemberOrderConst {
     public static final Integer STATE_VALID = 1;  //  正常
     public static final Integer STATE_EXPIRED = 2;  //  已失效
 
+    //  会员码状态
+    public static final Integer STATUS_UNUSED     = 0;    // 未使用
+    public static final Integer STATUS_USED       = 1;    // 已使用
+    public static final Integer STATUS_INVALID    = 2;    // 已失效
+
+    public static final String VIP_CODE = "VIP_CODE";
+    public static final String GIFT_CODE = "GIFT_CODE";
+
 
 }

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

@@ -2,19 +2,22 @@ package com.liquidnet.service.adam.controller;
 
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 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.entity.AdamMemberOrder;
 import com.liquidnet.service.adam.service.IAdamMemberOrderService;
+import com.liquidnet.service.base.ErrorMapping;
 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.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @Api(tags = "购买会员")
 @Slf4j
@@ -44,7 +47,10 @@ public class AdamMemberOrderController {
     @PostMapping("/use/memberCode")
     public ResponseDto<AdamMemberOrder> useMemberCode(AdamMemberOrderCodeParam param) {
         try {
-            adamMemberOrderService.useMemberCode(param);
+            boolean result = adamMemberOrderService.useMemberCode(param);
+            if (!result) {
+                return ResponseDto.failure("兑换失败");
+            }
             return ResponseDto.success();
         } catch (Exception e) {
             e.printStackTrace();
@@ -52,4 +58,21 @@ public class AdamMemberOrderController {
         }
     }
 
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "会员订单列表")
+    @GetMapping("/member/order/list")
+    public ResponseDto<List<AdamMemberOrderVo>> getMemberOrderList() {
+        String currentUid = CurrentUtil.getCurrentUid();
+        List<AdamMemberOrderVo> memberOrderList = adamMemberOrderService.getMemberOrderList(currentUid);
+        return ResponseDto.success(memberOrderList);
+    }
+
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "会员订单详情")
+    @GetMapping("/member/order/info/{orderNo}")
+    public ResponseDto<AdamMemberOrderVo> getMemberOrderList(@PathVariable String orderNo) {
+        String currentUid = CurrentUtil.getCurrentUid();
+        AdamMemberOrderVo memberOrderInfo = adamMemberOrderService.getMemberOrderInfo(currentUid, orderNo);
+        return ResponseDto.success(memberOrderInfo);
+    }
 }

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

@@ -44,14 +44,10 @@ public class AdamMemberPriceController {
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "会员价格详情")
-    @GetMapping("info/{memberPriceId}")
-    public ResponseDto<Object> query(@PathVariable(name = "memberPriceId") String memberPriceId){
-        AdamMemberPrice adamMemberPrice = adamMemberPriceService.query(memberPriceId);
-        AdamMemberPriceVo adamMemberPriceVo = new AdamMemberPriceVo();
-        BeanUtils.copyProperties(adamMemberPrice, adamMemberPriceVo);
-        adamMemberPriceVo.setCreatedAt(DateUtil.format(adamMemberPrice.getCreatedAt(), DateUtil.Formatter.yyyyMMddHHmmss));
-        adamMemberPriceVo.setUpdatedAt(DateUtil.format(adamMemberPrice.getUpdatedAt(), DateUtil.Formatter.yyyyMMddHHmmss));
-        return ResponseDto.success(adamMemberPriceVo);
+    @GetMapping("info/{memberId}/{memberPriceId}")
+    public ResponseDto<AdamMemberPriceVo> query(@PathVariable(name = "memberId") String memberId, @PathVariable(name = "memberPriceId") String memberPriceId){
+        AdamMemberPriceVo adamMemberPrice = adamMemberPriceService.query(memberId, memberPriceId);
+        return ResponseDto.success(adamMemberPrice);
     }
 
     @ApiOperationSupport(order = 2)

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

@@ -42,29 +42,19 @@ public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMem
 
     @Override
     public AdamMemberVo queryMemberInfo() {
-        AdamMember firstMember = adamMemberMapper.getFirstMember();
-        String memberId = firstMember.getMemberId();
-
         AdamMemberVo info = null;
+        List<AdamMemberVo> adamMemberVoList = mongoTemplate.findAll(AdamMemberVo.class);
+        if (adamMemberVoList.size() > 0){
+            info = adamMemberVoList.get(0);
+        }
         List<AdamMemberPriceVo> memberPrice = new ArrayList<>();
-        info = (AdamMemberVo) redisUtil.hget(AdamRedisConst.INFO_MEMBERS_INFO.concat(memberId), memberId);
-        Map<Object, Object> tempMemberPrice = redisUtil.hmget(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat(memberId));
+        Map<Object, Object> tempMemberPrice = redisUtil.hmget(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat( info.getMemberId()));
         Iterator<Object> iterator = tempMemberPrice.keySet().iterator();
-        while(iterator.hasNext()){
-            AdamMemberPriceVo tempAmp  = (AdamMemberPriceVo) tempMemberPrice.get(iterator.next());
+        while (iterator.hasNext()) {
+            AdamMemberPriceVo tempAmp = (AdamMemberPriceVo) tempMemberPrice.get(iterator.next());
             memberPrice.add(tempAmp);
         }
-        if (null == info) {
-            info = mongoTemplate.findOne(Query.query(Criteria.where("memberId").is(memberId)),
-                    AdamMemberVo.class, AdamMemberVo.class.getSimpleName());
-        }
-        if (null == tempMemberPrice) {
-            memberPrice = mongoTemplate.find(Query.query(Criteria.where("memberId").is(memberId)),
-                    AdamMemberPriceVo.class, AdamMemberPriceVo.class.getSimpleName());
-        }
-        if (null != info && memberPrice.size() > 0) {
-            info.setAdamMemberPrice(memberPrice);
-        }
+        info.setAdamMemberPrice(memberPrice);
         return info;
     }
 

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

@@ -81,7 +81,7 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
 
     @Override
     public boolean getOneFromRepertory(String memberId) {
-        AdamMemberVo adamMemberVo = (AdamMemberVo) redisUtil.hget(AdamRedisConst.INFO_MEMBERS_INFO.concat(memberId), memberId);
+        AdamMemberVo adamMemberVo = (AdamMemberVo) redisUtil.get(AdamRedisConst.INFO_MEMBERS_INFO.concat(memberId));
         if (null == adamMemberVo) {
             adamMemberVo = mongoTemplate.findOne(Query.query(Criteria.where("memberId").is(memberId)), AdamMemberVo.class, AdamMemberVo.class.getSimpleName());
         }

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

@@ -72,8 +72,12 @@ public class AdamMemberPriceServiceImpl extends ServiceImpl<AdamMemberPriceMappe
     }
 
     @Override
-    public AdamMemberPrice query(String memberPriceId) {
-        return adamMemberPriceMapper.misMemberPriceInfo(memberPriceId);
+    public AdamMemberPriceVo query(String memberId, String memberPriceId) {
+        AdamMemberPriceVo priceVo = (AdamMemberPriceVo) redisUtil.hget(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat(memberId), memberPriceId);
+        if (null == priceVo) {
+            priceVo = mongoTemplate.findOne(Query.query(Criteria.where("memberPriceId").is(memberPriceId)), AdamMemberPriceVo.class, AdamMemberPriceVo.class.getSimpleName());
+        }
+        return priceVo;
     }
 
     @Override

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

@@ -83,7 +83,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
 //        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
 //                SqlMapping.get("adam_member.add", (new AdamMemberVo()).getMqList(adamMember).toArray()));
         // todo 同步redis
-        redisUtil.hset(AdamRedisConst.INFO_MEMBERS_INFO.concat(info.getMemberId()), info.getMemberId(), amv);
+        redisUtil.set(AdamRedisConst.INFO_MEMBERS_INFO.concat(info.getMemberId()), amv);
     }
 
     @Override
@@ -94,6 +94,6 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
                 .updateOne(Query.query(Criteria.where("mId").is(info.getMid())).getQueryObject(), object);
 
         // todo 放入MQ
-        redisUtil.hset(AdamRedisConst.INFO_MEMBERS_INFO.concat(info.getMid().toString()), info.getMid().toString(), info);
+        redisUtil.set(AdamRedisConst.INFO_MEMBERS_INFO.concat(info.getMid().toString()), info);
     }
 }