소스 검색

fix luma车票来源信息

zoujiajian 1 년 전
부모
커밋
41f37660f6

+ 14 - 0
luma/src/main/java/com/yhlxj/dao/mapper/UserMirrorShopMapper.java

@@ -0,0 +1,14 @@
+package com.yhlxj.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yhlxj.dao.model.entity.UserMirrorShop;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: UserMirrorShop
+ * 创建者: JavaZou
+ * 创建时间:2024/10/18 11:58
+ */
+public interface UserMirrorShopMapper extends BaseMapper<UserMirrorShop> {
+
+}

+ 12 - 1
luma/src/main/java/com/yhlxj/dao/model/entity/GroupsRelation.java

@@ -75,6 +75,12 @@ public class GroupsRelation extends BaseEntity {
 
     private Long yhsId;
 
+    /**
+     * 店铺类型
+     * 0无 1.普通店铺 2.镜像店铺
+     */
+    private Integer cmt;
+
     /**
      * 获取权益时的订单id
      */
@@ -109,6 +115,11 @@ public class GroupsRelation extends BaseEntity {
      */
     private Integer aqType;
 
+    /**
+     * 奈飞pinCode
+     */
+    private String pinCode;
+
 
     @AllArgsConstructor
     @Getter
@@ -135,4 +146,4 @@ public class GroupsRelation extends BaseEntity {
         private String desc;
 
     }
-}
+}

+ 15 - 0
luma/src/main/java/com/yhlxj/dao/model/entity/LumaUser.java

@@ -55,4 +55,19 @@ public class LumaUser extends BaseEntity {
      * 拉黑
      */
     private Boolean isBlack;
+
+    /**
+     * 车票来源类型
+     * 0官网 1普通店铺 2镜像店铺
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private Integer cmt;
+
+    /**
+     * 镜像店铺自定义id
+     */
+    @DbIgnore
+    @TableField(exist = false)
+    private String customId;
 }

+ 84 - 0
luma/src/main/java/com/yhlxj/dao/model/entity/UserMirrorShop.java

@@ -0,0 +1,84 @@
+package com.yhlxj.dao.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.cyksj.model.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/*
+ *项目名: yhlxj
+ *文件名: YhShop
+ *创建者: JavaZou
+ *创建时间:2023/9/14 13:59
+ */
+@Getter
+@Setter
+public class UserMirrorShop extends BaseEntity {
+	/**
+	 * 店主id
+	 */
+	private Long userId;
+
+	/**
+	 * 店铺名称
+	 */
+	private String name;
+
+	private String logo;
+
+	/**
+	 * 自定义id
+	 */
+	private String customId;
+
+	/**
+	 * 商务id
+	 */
+	private Long businessId;
+
+	private Date businessBindTime;
+
+	/**
+	 * 店铺开放状态
+	 */
+	private Boolean status;
+
+	/**
+	 * 审核失败原因
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String reason;
+
+	/**
+	 * 联系方式
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String contact;
+
+	/**
+	 * 二维码
+	 */
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String qrCode;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	@Getter
+	public enum Status {
+		verify("审核中"),
+		success("审核通过"),
+		fail("审核失败");
+		String desc;
+
+		Status(String desc) {
+			this.desc = desc;
+		}
+	}
+}
+

+ 8 - 4
luma/src/main/java/com/yhlxj/service/midjourney/impl/LumaServiceImpl.java

@@ -18,12 +18,10 @@ import com.cyksj.common.util.StringUtil;
 import com.cyksj.model.dto.SubmitVideoDTO;
 import com.yhlxj.dao.mapper.GroupsRelationMapper;
 import com.yhlxj.dao.mapper.LumaUserApiProviderMapper;
+import com.yhlxj.dao.mapper.UserMirrorShopMapper;
 import com.yhlxj.dao.mapper.midjourney.LumaUserConversationMapper;
 import com.yhlxj.dao.mapper.midjourney.LumaUserMapper;
-import com.yhlxj.dao.model.entity.GroupsRelation;
-import com.yhlxj.dao.model.entity.LumaUser;
-import com.yhlxj.dao.model.entity.LumaUserApiProvider;
-import com.yhlxj.dao.model.entity.LumaUserConversation;
+import com.yhlxj.dao.model.entity.*;
 import com.yhlxj.dao.model.response.SubmitResult;
 import com.yhlxj.dao.model.response.VideoTask;
 import com.yhlxj.redis.RedisService;
@@ -85,6 +83,8 @@ public class LumaServiceImpl implements LumaService {
 
     private final LumaUserApiProviderMapper lumaUserApiProviderMapper;
 
+    private final UserMirrorShopMapper userMirrorShopMapper;
+
     @Override
     public LumaUser getUser(String userToken) {
         if(StringUtils.isBlank(userToken)){
@@ -102,6 +102,10 @@ public class LumaServiceImpl implements LumaService {
         Long relationId = lumaUser.getRelationId();
         GroupsRelation relation = groupsRelationMapper.selectById(relationId);
         lumaUser.setAqType(relation.getAqType());
+        lumaUser.setCmt(relation.getCmt());
+        if (lumaUser.getCmt() == 2) {
+            Optional.ofNullable(userMirrorShopMapper.selectById(relation.getYhsId())).ifPresent(shop -> lumaUser.setCustomId(shop.getCustomId()));
+        }
         return lumaUser;
     }