Merge branch 'dev_fudai_v2' into container

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinLuckyBagCodeDetailVo.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -47,6 +48,9 @@ public class KylinLuckyBagCodeDetailVo {
     @ApiModelProperty(value = "关联订单订单")
     private OrderInfo orderInfo;
 
+    @ApiModelProperty(value = "核验人")
+    private Operator operator;
+
 
     @ApiModel(value = "用户信息")
     @Data
@@ -78,5 +82,14 @@ public class KylinLuckyBagCodeDetailVo {
         private String useStart;
     }
 
+    @ApiModel(value = "和燕人")
+    @Data
+    @AllArgsConstructor
+    public static class Operator{
+        @ApiModelProperty(value = "手机号")
+        private String mobile;
+        @ApiModelProperty(value = "昵称")
+        private String nickName;
+    }
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinLuckyBagServiceImpl.java

@@ -205,6 +205,7 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         detailVo.setUpdatedAt(rewardUser.getUpdatedAt());
         detailVo.setUserInfo(getUserInfo(orderTicketVo));
         detailVo.setOrderInfo(getOrderInfo(orderTicketVo));
+        detailVo.setOperator(getOperator(rewardUser.getComment(), rewardUser.getLuckyBagId()));
         return detailVo;
     }
 
@@ -259,6 +260,24 @@ public class KylinLuckyBagServiceImpl implements IKylinLuckyBagService {
         return orderInfo;
     }
 
+    /**
+     * 获取核验人信息
+     * @return
+     */
+    private KylinLuckyBagCodeDetailVo.Operator getOperator(String mobile, String luckyBagId){
+        if (StringUtil.isBlank(mobile)) {
+            return null;
+        }
+        LambdaQueryWrapper<KylinLuckyBagScope> queryWrapper = new QueryWrapper<KylinLuckyBagScope>().lambda()
+                .eq(KylinLuckyBagScope::getMobile, mobile)
+                .eq(KylinLuckyBagScope::getLuckyBagId, luckyBagId);
+        KylinLuckyBagScope luckyBagScope = kylinLuckyBagScopeMapper.selectOne(queryWrapper);
+        if (luckyBagScope == null) {
+            return null;
+        }
+        return new KylinLuckyBagCodeDetailVo.Operator(luckyBagScope.getMobile(), luckyBagScope.getNickName());
+    }
+
     /**
      * 获取福袋列表
      *