Merge branch 'message' into hb_message

# Conflicts:
#	src/main/java/com/izouma/nineth/service/CacheService.java
#	src/main/java/com/izouma/nineth/service/OrderService.java
#	src/main/java/com/izouma/nineth/service/SysConfigService.java
#	src/main/java/com/izouma/nineth/service/UserService.java
#	src/main/vue/src/router.js
#	src/main/vue/yarn.lock

src/main/java/com/izouma/nineth/domain/HeatInfo.java

@@ -0,0 +1,32 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.enums.HeatType;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@Table(name = "heat_info", indexes =
+        {@Index(columnList = "userId"), @Index(columnList = "showroomId")})
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("热力值详情")
+public class HeatInfo extends BaseEntity {
+
+    private Long userId;
+
+    private Long showroomId;
+
+    @Enumerated(EnumType.STRING)
+    private HeatType type;
+
+    private Long orderId;
+
+    private int value;
+}

src/main/java/com/izouma/nineth/domain/Message.java

@@ -0,0 +1,62 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.annotations.Searchable;
+import com.izouma.nineth.converter.StringArrayConverter;
+import com.izouma.nineth.dto.MessageDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.BeanUtils;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@ApiModel("留言")
+public class Message extends BaseEntity {
+
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    @Searchable
+    @ApiModelProperty("昵称")
+    private String nickname;
+
+//    @Searchable
+//    @ApiModelProperty("手机号")
+//    private String phone;
+
+    private String type;
+
+    @ApiModelProperty("详情")
+    private String detail;
+
+    @ApiModelProperty("图片")
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> pic;
+
+    @ApiModelProperty("是否回复")
+    private boolean reply;
+
+    @Column(columnDefinition = "TEXT")
+    @ApiModelProperty("回复详情")
+    private String replyDetail;
+
+    @ApiModelProperty("回复时间")
+    private LocalDateTime repliedAt;
+
+    public Message(MessageDTO dto) {
+        BeanUtils.copyProperties(dto, this);
+    }
+}

src/main/java/com/izouma/nineth/domain/Showroom.java

@@ -22,7 +22,7 @@ import java.util.List;
         @Index(columnList = "userId"),
         @Index(columnList = "assetId"),
         @Index(columnList = "likes"),
-        @Index(columnList = "share")
+        @Index(columnList = "heats")
 })
 @Where(clause = "del = 0")
 @ApiModel("展厅")
@@ -75,4 +75,9 @@ public class Showroom extends BaseEntity {
     @Transient
     private boolean liked;
 
+    @ApiModelProperty("热力值")
+    private int heats;
+
+    private int registers;
+
 }

src/main/java/com/izouma/nineth/dto/MessageDTO.java

@@ -0,0 +1,25 @@
+package com.izouma.nineth.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("留言")
+public class MessageDTO {
+
+    @ApiModelProperty("详情")
+    private String detail;
+
+    @ApiModelProperty("图片")
+    private List<String> pic;
+
+}

src/main/java/com/izouma/nineth/dto/TestExcelDTO.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TestExcelDTO {
+    @ExcelProperty("id")
+    private Long id;
+    @ExcelProperty("num")
+    private int num;
+}

src/main/java/com/izouma/nineth/enums/HeatType.java

@@ -0,0 +1,8 @@
+package com.izouma.nineth.enums;
+
+public enum HeatType {
+    VIEW,
+    REGISTER,
+    BUY,
+    LIKE
+}

src/main/java/com/izouma/nineth/event/CreateOrderEvent.java

@@ -26,4 +26,6 @@ public class CreateOrderEvent implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long    invitor;
     private boolean vip;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long    showroomId;
 }

src/main/java/com/izouma/nineth/event/RegisterEvent.java

@@ -14,4 +14,5 @@ public class RegisterEvent {
     private String inviteCode;
     private Long   invitor;
     private Long   collectionId;
+    private Long   showroomId;
 }

src/main/java/com/izouma/nineth/listener/CreateOrderListener.java

@@ -37,7 +37,7 @@ public class CreateOrderListener implements RocketMQListener<CreateOrderEvent> {
         try {
             Order order = orderService.create(event.getUserId(), event.getCollectionId(), event.getQty(),
                     event.getAddressId(), event.getUserCouponId(), event.getInvitor(), event.getId(),
-                    event.isVip());
+                    event.isVip(), event.getShowroomId());
             map.put("success", true);
             map.put("data", order);
         } catch (Exception e) {

src/main/java/com/izouma/nineth/listener/RegisterListener.java

@@ -28,9 +28,9 @@ import java.util.regex.Pattern;
         consumeMode = ConsumeMode.ORDERLY)
 @ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
 public class RegisterListener implements RocketMQListener<RegisterEvent> {
+    private final JwtTokenUtil                  jwtTokenUtil;
     private       UserService                   userService;
     private       RedisTemplate<String, Object> redisTemplate;
-    private final JwtTokenUtil                  jwtTokenUtil;
 
     @Override
     public void onMessage(RegisterEvent registerEvent) {
@@ -38,7 +38,8 @@ public class RegisterListener implements RocketMQListener<RegisterEvent> {
         try {
             User user = userService.phoneRegister(registerEvent.getPhone(), registerEvent.getCode(),
                     registerEvent.getPassword(), registerEvent.getInviteCode(),
-                    registerEvent.getInvitor(), registerEvent.getCollectionId());
+                    registerEvent.getInvitor(), registerEvent.getCollectionId(),
+                    registerEvent.getShowroomId());
             map.put("status", "success");
             map.put("data", user);
             map.put("token", jwtTokenUtil.generateToken(JwtUserFactory.create(user)));

src/main/java/com/izouma/nineth/repo/HeatInfoRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.HeatInfo;
+import com.izouma.nineth.enums.HeatType;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface HeatInfoRepo extends JpaRepository<HeatInfo, Long>, JpaSpecificationExecutor<HeatInfo> {
+
+    List<HeatInfo> findByUserIdAndShowroomIdAndType(Long userId, Long showroomId, HeatType type);
+
+    List<HeatInfo> findByUserIdAndOrderIdAndType(Long userId, Long orderId, HeatType type);
+
+}

src/main/java/com/izouma/nineth/repo/MessageRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.Message;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface MessageRepo extends JpaRepository<Message, Long>, JpaSpecificationExecutor<Message> {
+    @Query("update Message t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/repo/ShowroomRepo.java

@@ -36,4 +36,23 @@ public interface ShowroomRepo extends JpaRepository<Showroom, Long>, JpaSpecific
     @Cacheable(value = "showroom", key = "#id")
     Optional<Showroom> findById(@Nonnull Long id);
 
+//    @Query("update Showroom t set t.views = t.views + ?2 where t.id = ?1")
+//    @Modifying
+//    @Transactional
+//    void addView(Long id, int num);
+
+    @Query("update Showroom t set t.heats = t.heats + ?2 where t.id = ?1")
+    @Modifying
+    @Transactional
+    void addHeat(Long id, int num);
+
+    @Query("update Showroom t set t.heats = t.heats + ?2, t.likes = t.likes + ?3 where t.id = ?1")
+    @Modifying
+    @Transactional
+    void addHeatAndLike(Long id, int heatNum, int likeNum);
+
+    @Query("update Showroom t set t.heats = t.heats + ?2, t.registers = t.registers + ?3 where t.id = ?1")
+    @Modifying
+    @Transactional
+    void addHeatAndRegister(Long id, int heatNum, int registerNum);
 }

src/main/java/com/izouma/nineth/service/CacheService.java

@@ -109,6 +109,16 @@ public class CacheService {
     public void clearPriceList() {
     }
 
+    @CacheEvict(value = "news", key = "#id")
+    public void clearNews(Long id) {
+    }
+
+    @Scheduled(cron = "0 0 0 * * ?")
+    @CacheEvict(value = "fixedTop", allEntries = true)
+    public void clearFixedTop() {
+    }
+
+
     @CacheEvict(value = "sysConfigGet", allEntries = true)
     public void clearSysConfigGet() {
     }

src/main/java/com/izouma/nineth/service/MessageService.java

@@ -0,0 +1,20 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.Message;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.MessageRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class MessageService {
+
+    private MessageRepo messageRepo;
+
+    public Page<Message> all(PageQuery pageQuery) {
+        return messageRepo.findAll(JpaUtils.toSpecification(pageQuery, Message.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/nineth/service/NewsLikeService.java

@@ -1,7 +1,10 @@
 package com.izouma.nineth.service;
 
+import com.izouma.nineth.domain.HeatInfo;
 import com.izouma.nineth.domain.NewsLike;
 import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.HeatType;
+import com.izouma.nineth.repo.HeatInfoRepo;
 import com.izouma.nineth.repo.NewsLikeRepo;
 import com.izouma.nineth.repo.NewsRepo;
 import com.izouma.nineth.repo.ShowroomRepo;
@@ -16,9 +19,11 @@ import java.util.List;
 @AllArgsConstructor
 public class NewsLikeService {
 
-    private NewsLikeRepo newsLikeRepo;
-    private NewsRepo     newsRepo;
-    private ShowroomRepo showroomRepo;
+    private NewsLikeRepo     newsLikeRepo;
+    private NewsRepo         newsRepo;
+    private ShowroomRepo     showroomRepo;
+    private SysConfigService sysConfigService;
+    private HeatInfoRepo     heatInfoRepo;
 
     public Page<NewsLike> all(PageQuery pageQuery) {
         return newsLikeRepo.findAll(JpaUtils.toSpecification(pageQuery, NewsLike.class), JpaUtils.toPageRequest(pageQuery));
@@ -49,7 +54,15 @@ public class NewsLikeService {
                 .userId(userId)
                 .showroomId(roomId)
                 .build());
-        showroomRepo.addLike(roomId, 1);
+        int weight = sysConfigService.getInt("heat_like_weight");
+        heatInfoRepo.save(HeatInfo.builder()
+                .showroomId(roomId)
+                .userId(userId)
+                .type(HeatType.LIKE)
+                .value(weight)
+                .build());
+        showroomRepo.addHeatAndLike(roomId, 1, weight);
+
     }
 
     public void unlikeRoom(Long userId, Long roomId) {

src/main/java/com/izouma/nineth/service/OrderService.java

@@ -1,5 +1,6 @@
 package com.izouma.nineth.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -106,6 +107,8 @@ public class OrderService {
     private final UserPropertyRepo              userPropertyRepo;
     private final UserBalanceService            userBalanceService;
     private final ProxyManager<String>          buckets;
+    private final HeatInfoRepo                  heatInfoRepo;
+    private final ShowroomRepo                  showroomRepo;
 
     public OrderService(OrderRepo orderRepo, CollectionRepo collectionRepo, UserAddressRepo userAddressRepo,
                         UserRepo userRepo, Environment env, AlipayClient alipayClient,
@@ -149,14 +152,17 @@ public class OrderService {
         this.userPropertyRepo = userPropertyRepo;
         this.userBalanceService = userBalanceService;
         this.buckets = proxyManager;
+        this.heatInfoRepo = heatInfoRepo;
+        this.showroomRepo = showroomRepo;
     }
 
+
     public Page<Order> all(PageQuery pageQuery) {
         return orderRepo.findAll(JpaUtils.toSpecification(pageQuery, Order.class), JpaUtils.toPageRequest(pageQuery));
     }
 
     public String mqCreate(Long userId, Long collectionId, int qty, Long addressId, Long userCouponId, Long invitor,
-                           String sign, boolean vip, int vipPurchase, int vipPoint) {
+                           String sign, boolean vip, Long showroomId) {
         String qs = null;
         try {
             qs = AESEncryptUtil.decrypt(sign);
@@ -190,7 +196,7 @@ public class OrderService {
 
         Long id = snowflakeIdWorker.nextId();
         SendResult result = rocketMQTemplate.syncSend(generalProperties.getCreateOrderTopic(),
-                new CreateOrderEvent(id, userId, collectionId, qty, addressId, userCouponId, invitor, vip), 100000);
+                new CreateOrderEvent(id, userId, collectionId, qty, addressId, userCouponId, invitor, vip, showroomId), 100000);
 
         log.info("发送订单到队列: {}, userId={}, result={}", id, userId, result);
         return String.valueOf(id);
@@ -206,7 +212,7 @@ public class OrderService {
     }
 
     public Order create(Long userId, Long collectionId, int qty, Long addressId, Long userCouponId, Long invitor,
-                        Long id, boolean vip) {
+                        Long id, boolean vip, Long showroomId) {
         long t = System.currentTimeMillis();
         qty = 1;
         int stock = Optional.ofNullable(collectionService.decreaseStock(collectionId, qty))
@@ -399,6 +405,17 @@ public class OrderService {
                 userRepo.addVipPoint(userId, -usePoint);
                 cacheService.clearUserMy(userId);
             }
+
+            if (ObjectUtils.isNotEmpty(showroomId)) {
+                //通过展厅的购买数量
+                heatInfoRepo.save(HeatInfo.builder()
+                        .showroomId(showroomId)
+                        .userId(userId)
+                        .type(HeatType.BUY)
+                        .value(0)
+                        .orderId(order.getId())
+                        .build());
+            }
             rocketMQTemplate.syncSend(generalProperties.getUpdateStockTopic(), collectionId, 10000);
             log.info("订单创建完成, id={}, {}ms", order.getId(), System.currentTimeMillis() - t);
             return order;
@@ -716,7 +733,6 @@ public class OrderService {
                             smsService.sellOut(userRepo.findPhoneById(asset.getUserId()));
                         }
 
-                        userBalanceService.realtimeSettleOrder(order);
                     } else {
                         orderRepo.save(order);
                         //藏品其他信息/是否vip
@@ -740,6 +756,17 @@ public class OrderService {
                 if (collection.getAssetId() == null) {
                     collectionService.increaseSale(order.getCollectionId(), order.getQty());
                 }
+
+                //通过展厅购买加热力值
+                List<HeatInfo> heatInfos = heatInfoRepo.findByUserIdAndOrderIdAndType(order.getUserId(), orderId, HeatType.BUY);
+                if (CollUtil.isNotEmpty(heatInfos)) {
+                    HeatInfo heatInfo = heatInfos.get(0);
+                    int weight = sysConfigService.getInt("heat_buy_weight");
+                    heatInfo.setValue(weight);
+                    heatInfoRepo.save(heatInfo);
+                    showroomRepo.addHeat(heatInfo.getShowroomId(), weight);
+                }
+
             } else {
                 throw new BusinessException("状态错误 " + order.getStatus());
             }
@@ -836,7 +863,7 @@ public class OrderService {
             }
             //加上积分
             if (ObjectUtils.isNotEmpty(order.getVipPoint()) && order.getVipPoint() > 0) {
-                userRepo.updateVipPoint(order.getUserId(), order.getVipPoint());
+                userRepo.addVipPoint(order.getUserId(), order.getVipPoint());
                 cacheService.clearUserMy(order.getUserId());
                 log.info("取消加积分用户ID:{},订单ID:{},积分:{}", order.getUserId(), order.getId(), order.getVipPoint());
             }
@@ -844,6 +871,7 @@ public class OrderService {
                 collectionService.decreaseQuota(order.getCollectionId(), 1);
                 log.info("取消加藏品额度CollectionId:{}", order.getCollectionId());
             }
+
             rocketMQTemplate.syncSend(generalProperties.getUpdateQuotaTopic(), order.getCollectionId(), 10000);
             log.info("取消订单{}", order.getId());
         } catch (Exception e) {

src/main/java/com/izouma/nineth/service/UserBankCardService.java

@@ -65,6 +65,7 @@ public class UserBankCardService {
                 .phone(request.getPhone())
                 .bindCardId(request.getBindCardId())
                 .build());
+        userBalanceRepo.unlock(Long.parseLong(request.getUserId()));
         User user = userRepo.findById(Long.parseLong(request.getUserId())).orElse(null);
         if (user != null) {
             user.setSettleAccountId(request.getBindCardId());

src/main/java/com/izouma/nineth/service/UserService.java

@@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.sym.NameN;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.izouma.nineth.TokenHistory;
 import com.izouma.nineth.config.Constants;
@@ -15,6 +14,7 @@ import com.izouma.nineth.domain.*;
 import com.izouma.nineth.dto.*;
 import com.izouma.nineth.enums.AuthStatus;
 import com.izouma.nineth.enums.AuthorityName;
+import com.izouma.nineth.enums.HeatType;
 import com.izouma.nineth.event.AccountCreatedEvent;
 import com.izouma.nineth.event.RegisterEvent;
 import com.izouma.nineth.exception.BusinessException;
@@ -42,7 +42,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.event.EventListener;
-import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
@@ -54,17 +53,11 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
@@ -98,6 +91,8 @@ public class UserService {
     private UserBalanceRepo               userBalanceRepo;
     private ContentAuditService           contentAuditService;
     private OrderRepo                     orderRepo;
+    private HeatInfoRepo                  heatInfoRepo;
+    private ShowroomRepo                  showroomRepo;
 
     public User update(User user) {
         if (!SecurityUtils.hasRole(AuthorityName.ROLE_ADMIN)) {
@@ -234,7 +229,8 @@ public class UserService {
         });
     }
 
-    public User phoneRegister(String phone, String code, String password, String inviteCode, Long invitor, Long collectionId) {
+    public User phoneRegister(String phone, String code, String password, String inviteCode, Long invitor,
+                              Long collectionId, Long showroomId) {
         String name = "9th_" + RandomStringUtils.randomAlphabetic(8);
         Invite invite = null;
         if (StringUtils.isNotBlank(inviteCode)) {
@@ -271,12 +267,25 @@ public class UserService {
         if (invite != null) {
             inviteRepo.increaseNum(invite.getId());
         }
+
+        if (ObjectUtils.isNotEmpty(showroomId)) {
+            //通过展厅的注册数量
+            int weight = sysConfigService.getInt("heat_register_weight");
+            heatInfoRepo.save(HeatInfo.builder()
+                    .showroomId(showroomId)
+                    .userId(user.getId())
+                    .type(HeatType.REGISTER)
+                    .value(weight)
+                    .build());
+            showroomRepo.addHeatAndRegister(showroomId, weight, 1);
+        }
         return user;
     }
 
-    public String mqRegister(String phone, String code, String password, String inviteCode, Long invitor, Long collectionId) {
+    public String mqRegister(String phone, String code, String password, String inviteCode, Long invitor,
+                             Long collectionId, Long showroomId) {
         rocketMQTemplate.convertAndSend(generalProperties.getRegisterTopic(),
-                new RegisterEvent(phone, code, password, inviteCode, invitor, collectionId));
+                new RegisterEvent(phone, code, password, inviteCode, invitor, collectionId, showroomId));
         return phone;
     }
 

src/main/java/com/izouma/nineth/web/AuthenticationController.java

@@ -5,7 +5,6 @@ import com.izouma.nineth.enums.AuthorityName;
 import com.izouma.nineth.exception.AuthenticationException;
 import com.izouma.nineth.security.JwtTokenUtil;
 import com.izouma.nineth.security.JwtUserFactory;
-import com.izouma.nineth.service.CaptchaService;
 import com.izouma.nineth.service.UserService;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -27,7 +26,6 @@ public class AuthenticationController {
     private final AuthenticationManager authenticationManager;
     private final JwtTokenUtil          jwtTokenUtil;
     private final UserService           userService;
-    private final CaptchaService        captchaService;
 
     @PostMapping("/login")
     public String loginByUserPwd(String username, String password, Integer expiration) {
@@ -62,24 +60,20 @@ public class AuthenticationController {
     @PostMapping("/phoneRegister")
     @ApiOperation(value = "手机号密码注册")
     public String phonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor,
-                                Long collectionId, String captcha, String captchaKey) {
-//        boolean verify = captchaService.verify(captchaKey, captcha);
-//        if (!verify) {
-//            throw new BusinessException("验证码错误");
-//        }
-        User user = userService.phoneRegister(phone, code, password, inviteCode, invitor, collectionId);
+                                Long collectionId, Long showroomId) {
+        User user = userService.phoneRegister(phone, code, password, inviteCode, invitor, collectionId, showroomId);
         return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
     }
 
     @PostMapping("/mqPhoneRegister")
     @ApiOperation(value = "手机号密码注册")
     public String mqPhoneRegister(String phone, String code, String password, String inviteCode, Long invitor,
-                                  Long collectionId, String captcha, String captchaKey) {
+                                  Long collectionId, Long showroomId) {
 //        boolean verify = captchaService.verify(captchaKey, captcha);
 //        if (!verify) {
 //            throw new BusinessException("验证码错误");
 //        }
-        return userService.mqRegister(phone, code, password, inviteCode, invitor, collectionId);
+        return userService.mqRegister(phone, code, password, inviteCode, invitor, collectionId, showroomId);
     }
 
     @GetMapping("/registerResult")

src/main/java/com/izouma/nineth/web/MessageController.java

@@ -0,0 +1,87 @@
+package com.izouma.nineth.web;
+
+import com.izouma.nineth.domain.Message;
+import com.izouma.nineth.domain.User;
+import com.izouma.nineth.dto.MessageDTO;
+import com.izouma.nineth.service.MessageService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.MessageRepo;
+import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.SecurityUtils;
+import com.izouma.nineth.utils.excel.ExcelUtils;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@RestController
+@RequestMapping("/message")
+@AllArgsConstructor
+public class MessageController extends BaseController {
+    private MessageService messageService;
+    private MessageRepo    messageRepo;
+
+    @PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Message save(@RequestBody Message record) {
+        if (record.getId() != null) {
+            Message orig = messageRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            orig.setReply(true);
+            orig.setRepliedAt(LocalDateTime.now());
+            return messageRepo.save(orig);
+        }
+        return messageRepo.save(record);
+    }
+
+    @ApiOperation("管理员用")
+    @PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Message> all(@RequestBody PageQuery pageQuery) {
+        return messageService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Message get(@PathVariable Long id) {
+        return messageRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        messageRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Message> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @ApiOperation("用户用")
+    @PostMapping("/my")
+    public Page<Message> my(@RequestBody PageQuery pageQuery) {
+        pageQuery.getQuery().put("userId", SecurityUtils.getAuthenticatedUser().getId());
+        return messageService.all(pageQuery);
+    }
+
+    @ApiOperation("用户提交留言")
+    @PostMapping("/create")
+    public Message create(@RequestBody MessageDTO record) {
+        Message message = new Message(record);
+
+        User user = SecurityUtils.getAuthenticatedUser();
+        message.setUserId(user.getId());
+        message.setNickname(user.getNickname());
+//        message.setPhone(user.getPhone());
+        return messageRepo.save(message);
+    }
+}
+

src/main/java/com/izouma/nineth/web/NewsController.java

@@ -5,6 +5,7 @@ import com.izouma.nineth.domain.News;
 import com.izouma.nineth.domain.NewsLike;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.repo.NewsLikeRepo;
+import com.izouma.nineth.service.CacheService;
 import com.izouma.nineth.service.NewsService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
@@ -29,6 +30,7 @@ public class NewsController extends BaseController {
     private NewsService  newsService;
     private NewsRepo     newsRepo;
     private NewsLikeRepo newsLikeRepo;
+    private CacheService cacheService;
 
     @PreAuthorize("hasAnyRole('ADMIN','NEWS')")
     @PostMapping("/save")
@@ -36,9 +38,13 @@ public class NewsController extends BaseController {
         if (record.getId() != null) {
             News orig = newsRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            return newsRepo.save(orig);
+            orig = newsRepo.save(orig);
+            cacheService.clearNews(orig.getId());
+            return orig;
         }
-        return newsRepo.save(record);
+        record = newsRepo.save(record);
+        cacheService.clearNews(record.getId());
+        return record;
     }
 
 

src/main/java/com/izouma/nineth/web/OrderController.java

@@ -113,11 +113,12 @@ public class OrderController extends BaseController {
                                             @RequestParam(required = false) Long couponId,
                                             @RequestParam(required = false) Long invitor,
                                             @RequestParam String sign,
-                                            @RequestParam(defaultValue = "false") boolean vip) {
+                                            @RequestParam(defaultValue = "false") boolean vip,
+                                            @RequestParam(required = false) Long showroomId) {
         final User user = SecurityUtils.getAuthenticatedUser();
         return new HashMap<>() {{
             put("id", orderService.mqCreate(user.getId(), collectionId, qty, addressId, couponId, invitor, sign,
-                    vip, user.getVipPurchase(), user.getVipPoint()));
+                    vip, showroomId));
         }};
     }
 

src/main/java/com/izouma/nineth/web/ShowroomController.java

@@ -2,18 +2,14 @@ package com.izouma.nineth.web;
 
 import cn.hutool.core.collection.CollUtil;
 import com.izouma.nineth.domain.Collection;
-import com.izouma.nineth.domain.NewsLike;
-import com.izouma.nineth.domain.ShowCollection;
-import com.izouma.nineth.domain.Showroom;
-import com.izouma.nineth.domain.User;
+import com.izouma.nineth.domain.*;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.AuthStatus;
+import com.izouma.nineth.enums.HeatType;
 import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.CollectionRepo;
-import com.izouma.nineth.repo.NewsLikeRepo;
-import com.izouma.nineth.repo.ShowCollectionRepo;
-import com.izouma.nineth.repo.ShowroomRepo;
+import com.izouma.nineth.repo.*;
 import com.izouma.nineth.service.ShowroomService;
+import com.izouma.nineth.service.SysConfigService;
 import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
@@ -36,6 +32,8 @@ public class ShowroomController extends BaseController {
     private ShowCollectionRepo showCollectionRepo;
     private NewsLikeRepo       newsLikeRepo;
     private CollectionRepo     collectionRepo;
+    private HeatInfoRepo       heatInfoRepo;
+    private SysConfigService   sysConfigService;
 
     @PostMapping("/save")
     public Showroom save(@RequestBody Showroom record) {
@@ -137,6 +135,28 @@ public class ShowroomController extends BaseController {
         showroomRepo.addShare(id, 1);
     }
 
+    //加浏览
+    @GetMapping("/{id}/view")
+    public void addView(@PathVariable Long id) {
+        //增加浏览量
+        Long userId = SecurityUtils.getAuthenticatedUser().getId();
+
+        if (ObjectUtils.isEmpty(userId)) {
+            return;
+        }
+        List<HeatInfo> list = heatInfoRepo.findByUserIdAndShowroomIdAndType(userId, id, HeatType.VIEW);
+        if (!list.isEmpty()) return;
+        int weight = sysConfigService.getInt("heat_view_weight");
+        heatInfoRepo.save(HeatInfo.builder()
+                .userId(userId)
+                .showroomId(id)
+                .type(HeatType.VIEW)
+                .value(weight)
+                .build());
+        showroomRepo.addHeat(id, weight);
+    }
+
+
     @PostMapping("/pass")
     public void pass(@RequestParam Long id) {
         showroomService.audit(id, AuthStatus.SUCCESS, null);

src/main/java/com/izouma/nineth/web/StatisticController.java

@@ -103,4 +103,11 @@ public class StatisticController {
     public void clearUser() {
         cacheService.clearUser();
     }
+
+    @GetMapping("/fixedTop")
+    @Cacheable("fixedTop")
+    public String fixedTop() {
+        LocalDateTime start = LocalDateTime.of(2022, 5, 30, 20, 0, 0);
+        return statisticService.top(start, LocalDateTime.now(), 50);
+    }
 }

src/main/resources/genjson/Message.json

@@ -0,0 +1 @@
+{"tableName":"Message","className":"Message","remark":"留言","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/sunnianwen/Desktop/project/raex_back/src/main/java/com/izouma/nineth","viewPath":"/Users/sunnianwen/Desktop/project/raex_back/src/main/vue/src/views","routerPath":"/Users/sunnianwen/Desktop/project/raex_back/src/main/vue/src","resourcesPath":"/Users/sunnianwen/Desktop/project/raex_back/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"userId","modelName":"userId","remark":"用户ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"nickname","modelName":"nickname","remark":"昵称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"phone","modelName":"phone","remark":"手机号","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"detail","modelName":"detail","remark":"详情","showInList":true,"showInForm":true,"formType":"textarea"},{"name":"pic","modelName":"pic","remark":"图片","showInList":true,"showInForm":true,"formType":"multiImage"},{"name":"reply","modelName":"reply","remark":"是否回复","showInList":true,"showInForm":true,"formType":"switch"},{"name":"replyDetail","modelName":"replyDetail","remark":"回复详情","showInList":true,"showInForm":true,"formType":"textarea"},{"name":"repliedAt","modelName":"repliedAt","remark":"回复时间","showInList":true,"showInForm":true,"formType":"datetime"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.Message"}

src/main/vue/src/router.js

@@ -737,8 +737,24 @@ const router = new Router({
                     name: 'PriceListList',
                     component: () => import(/* webpackChunkName: "priceListList" */ '@/views/PriceListList.vue'),
                     meta: {
-                        title: 'pricelist'
-                    }
+                       title: 'pricelist'
+                    },
+               },
+                {
+                    path: '/messageEdit',
+                    name: 'MessageEdit',
+                    component: () => import(/* webpackChunkName: "messageEdit" */ '@/views/MessageEdit.vue'),
+                    meta: {
+                       title: '留言编辑'
+                    },
+                },
+                {
+                    path: '/messageList',
+                    name: 'MessageList',
+                    component: () => import(/* webpackChunkName: "messageList" */ '@/views/MessageList.vue'),
+                    meta: {
+                       title: '留言'
+                    },
                 },
                 {
                     path: '/payMgmt',
@@ -815,7 +831,7 @@ router.beforeEach((to, from, next) => {
         window.open(url);
         return;
     }
-    if (!store.state.userInfo && to.path !== '/login' && to.path !== '/photoProcessing') {
+    if (!store.state.userInfo && to.path !== '/login' && to.path!=='/photoProcessing') {
         http.axios
             .get('/user/my')
             .then(res => {

src/main/vue/src/views/MessageEdit.vue

@@ -0,0 +1,151 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                删除
+            </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="80px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 600px;"
+                >
+                    <el-form-item prop="userId" label="用户信息">
+                        <el-input-number type="number" v-model="formData.userId" disabled></el-input-number>
+                        <el-input
+                            v-model="formData.nickname"
+                            disabled
+                            style="margin-left: 6px; width: 180px"
+                        ></el-input>
+                        <!-- <el-input v-model="formData.phone" disabled style="margin-left: 6px; width: 180px"></el-input> -->
+                    </el-form-item>
+                    <el-form-item prop="detail" label="详情">
+                        <el-input type="textarea" :rows="6" v-model="formData.detail" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="图片">
+                        <!-- <multi-upload v-model="formData.pic"></multi-upload> -->
+                        <el-image
+                            v-for="item in formData.pic"
+                            :key="item"
+                            :src="item"
+                            style="width: 100px; height: 100px"
+                            :preview-src-list="formData.pic"
+                        />
+                    </el-form-item>
+                    <!-- <el-form-item prop="reply" label="是否回复">
+                        <el-switch v-model="formData.reply"></el-switch>
+                    </el-form-item> -->
+                    <el-form-item prop="replyDetail" label="回复详情">
+                        <el-input type="textarea" :rows="6" v-model="formData.replyDetail"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="repliedAt" label="回复时间" v-if="formData.reply">
+                        <el-date-picker
+                            v-model="formData.repliedAt"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择日期时间"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary">
+                            保存
+                        </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'MessageEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('message/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {}
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/message/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/message/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+/deep/.el-input.is-disabled .el-input__inner {
+    color: #7c7e7e;
+}
+/deep/.el-radio__input.is-disabled + span.el-radio__label {
+    color: #7c7e7e;
+}
+/deep/.el-textarea.is-disabled .el-textarea__inner {
+	color: #7c7e7e;
+}
+</style>

src/main/vue/src/views/MessageList.vue

@@ -0,0 +1,207 @@
+<template>
+    <div class="list-view">
+        <page-title>
+            <!-- <el-button
+                @click="addRow"
+                type="primary"
+                icon="el-icon-plus"
+                :disabled="fetchingData || downloading"
+                class="filter-item"
+            >
+                新增
+            </el-button> -->
+            <!-- <el-button
+                @click="download"
+                icon="el-icon-upload2"
+                :loading="downloading"
+                :disabled="fetchingData"
+                class="filter-item"
+            >
+                导出
+            </el-button> -->
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                placeholder="搜索昵称..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+            <el-radio-group v-model="reply" @change="getData">
+                <el-radio-button label="">所有</el-radio-button>
+                <el-radio-button :label="true">已回复</el-radio-button>
+                <el-radio-button :label="false">未回复</el-radio-button>
+            </el-radio-group>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            v-loading="fetchingData"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="80"> </el-table-column>
+            <el-table-column prop="userId" label="用户ID" width="80"> </el-table-column>
+            <el-table-column prop="nickname" label="昵称"> </el-table-column>
+            <!-- <el-table-column prop="phone" label="手机号" min-width="100"> </el-table-column> -->
+            <el-table-column prop="createdAt" label="留言时间" min-width="140"> </el-table-column>
+            <el-table-column prop="detail" label="详情" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="pic" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic[0]"
+                        fit="cover"
+                        :preview-src-list="row.pic"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="reply" label="已回复" width="70">
+                <template slot-scope="{ row }">
+                    <el-tag v-if="row.reply">是</el-tag>
+                    <el-tag v-else type="info">否</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="replyDetail" label="回复详情" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="repliedAt" label="回复时间" min-width="140"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'MessageList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/message/all',
+            downloading: false,
+            reply: ''
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return {
+                sort: 'id,desc',
+                search: this.search,
+                query: { del: false, reply: this.reply }
+            };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/messageEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/messageEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/message/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/message/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/MintOrderEdit.vue

@@ -21,8 +21,6 @@
                     </el-form-item>
                     <el-form-item prop="userId" label="用户信息">
                         <el-input-number type="number" v-model="formData.userId" disabled></el-input-number>
-                        <!-- </el-form-item>
-                    <el-form-item prop="phone" label="手机号"> -->
                         <el-input v-model="formData.phone" disabled style="margin-left: 6px; width: 180px"></el-input>
                     </el-form-item>
                     <el-form-item prop="mintActivity" label="铸造活动">

src/main/vue/src/views/MinterEdit.vue

@@ -31,6 +31,9 @@
                     <el-form-item prop="nickname" label="昵称">
                         <el-input v-model="formData.nickname"></el-input>
                     </el-form-item>
+                    <el-form-item prop="bg" label="背景图片">
+                        <single-upload v-model="formData.bg"></single-upload>
+                    </el-form-item>
                     <el-form-item v-if="formData.id" label="密码">
                         <el-button type="primary" plain @click="resetPassword" size="mini">重置 </el-button>
                     </el-form-item>
@@ -133,11 +136,11 @@ export default {
                 password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
                 phone: [
                     // { required: true, message: '请输入密码', trigger: 'blur' },
-                    {
-                        pattern: /^1[3-9]\d{9}$/,
-                        message: '请输入正确的手机号',
-                        trigger: 'blur'
-                    }
+                    // {
+                    //     pattern: /^1[3-9]\d{9}$/,
+                    //     message: '请输入正确的手机号',
+                    //     trigger: 'blur'
+                    // }
                 ],
                 authorities: [{ required: true, message: '请选择角色', trigger: 'blur' }],
                 intro: [{ required: true, message: '请输入简介', trigger: 'blur' }]

src/main/vue/src/views/NewsEdit.vue

@@ -58,6 +58,7 @@
                             v-model="formData.linkContent"
                             placeholder="输入藏品名称"
                         ></el-input>
+                        <el-input v-else-if="formData.linkType === 'hyperlink'" v-model="formData.linkContent" placeholder="输入链接"></el-input>
                         <el-input v-else v-model="formData.linkContent" placeholder="输入ID"></el-input>
                     </el-form-item>
                     <el-form-item class="form-submit">
@@ -118,7 +119,9 @@ export default {
                 { label: '藏品/盲盒', value: 'collection' },
                 { label: '铸造者', value: 'user' },
                 { label: '活动', value: 'activity' },
-                { label: '多个藏品', value: 'collections' }
+                { label: '多个藏品', value: 'collections' },
+                { label: '指定链接', value: 'hyperlink' },
+                { label: '展厅', value: 'showroom' }
             ]
         };
     },

src/main/vue/src/views/NewsList.vue

@@ -64,7 +64,7 @@
                     <el-tag type="info" v-else>否</el-tag>
                 </template>
             </el-table-column>
-             <el-table-column prop="link" label="跳转">
+            <el-table-column prop="link" label="跳转">
                 <template slot-scope="{ row }">
                     <el-tag :type="row.link ? 'success' : 'info'">{{ row.link ? '是' : '否' }}</el-tag>
                 </template>
@@ -124,7 +124,9 @@ export default {
                 { label: '藏品/盲盒', value: 'collection' },
                 { label: '铸造者', value: 'user' },
                 { label: '活动', value: 'activity' },
-                { label: '多个藏品', value: 'collections' }
+                { label: '多个藏品', value: 'collections' },
+                { label: '指定链接', value: 'hyperlink' },
+                { label: '展厅', value: 'showroom' }
             ]
         };
     },
@@ -213,5 +215,4 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

src/main/vue/src/views/ShowroomEdit.vue

@@ -25,15 +25,12 @@
                             disabled
                         ></el-input>
                     </el-form-item>
-                    <el-form-item prop="sort" label="排序">
+                    <!-- <el-form-item prop="sort" label="排序">
                         <el-input-number v-model="formData.sort" :min="0"></el-input-number>
                         <div class="tip">数字越大排序越靠前，相同数值按创建时间倒序排列</div>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item prop="maxCollection" label="最多藏品数量">
-                        <el-input-number
-                            type="number"
-                            v-model="formData.maxCollection"
-                        ></el-input-number>
+                        <el-input-number type="number" v-model="formData.maxCollection"></el-input-number>
                     </el-form-item>
                     <el-form-item prop="userId" label="用户ID">
                         <el-input-number
@@ -94,6 +91,14 @@
                             <el-table-column prop="name" label="名称"></el-table-column>
                         </el-table>
                     </el-form-item>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="heats" label="热力值">
+                            <el-input-number type="number" v-model="formData.heats" disabled></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="registers" label="邀请数量">
+                            <el-input-number type="number" v-model="formData.registers" disabled></el-input-number>
+                        </el-form-item>
+                    </div>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
                         <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
@@ -198,4 +203,4 @@ export default {
     color: @text3;
     margin-top: 5px;
 }
-</style>
+</style>

src/main/vue/src/views/ShowroomList.vue

@@ -48,7 +48,7 @@
             v-loading="fetchingData"
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="80"> </el-table-column>
             <el-table-column prop="userId" label="用户ID"> </el-table-column>
             <el-table-column prop="nickname" label="昵称"> </el-table-column>
             <el-table-column prop="pic" label="logo">
@@ -63,31 +63,14 @@
             </el-table-column>
             <el-table-column prop="introduction" label="简介"> </el-table-column>
             <el-table-column prop="likes" label="点赞"> </el-table-column>
-            <el-table-column prop="sort" label="排序"></el-table-column>
+            <el-table-column prop="registers" label="邀请数"> </el-table-column>
+            <el-table-column prop="heats" label="热力值"></el-table-column>
+            <!-- <el-table-column prop="sort" label="排序"></el-table-column> -->
             <!-- <el-table-column prop="maxCollection" label="最多可放藏品数量"> </el-table-column> -->
-            <!-- <el-table-column prop="headBg" label="头部背景">
-                <template slot-scope="{ row }">
-                    <el-image
-                        style="width: 30px; height: 30px"
-                        :src="row.headBg"
-                        fit="cover"
-                        :preview-src-list="[row.headBg]"
-                    ></el-image>
-                </template>
-            </el-table-column>
-            <el-table-column prop="showroomBg" label="展厅背景">
-                <template slot-scope="{ row }">
-                    <el-image
-                        style="width: 30px; height: 30px"
-                        :src="row.showroomBg"
-                        fit="cover"
-                        :preview-src-list="[row.showroomBg]"
-                    ></el-image>
-                </template>
-            </el-table-column> -->
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="210">
+            <el-table-column label="操作" align="center" fixed="right" width="280">
                 <template slot-scope="{ row, $index }">
+                    <el-button size="mini" @click="showCode(row)" plain>预览</el-button>
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                     <el-button
@@ -146,15 +129,21 @@
                 <el-button type="primary" @click="saveReason">保存</el-button>
             </div>
         </el-dialog>
+
+        <el-dialog :visible.sync="showCodeDialog" title="预览二维码" width="400px" center>
+            <vue-qrcode :value="codeValue" :options="{ width: 300, margin: 2 }" style="margin-left: 25px"></vue-qrcode>
+            <div style="margin-left: 40px; font-size: 16px">扫码预览展厅</div>
+        </el-dialog>
     </div>
 </template>
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
-
+import VueQrcode from '@chenfengyuan/vue-qrcode';
 export default {
     name: 'ShowroomList',
     mixins: [pageableTable],
+    components: { VueQrcode },
     data() {
         return {
             multipleMode: false,
@@ -173,7 +162,9 @@ export default {
                 reason: [{ required: true, message: '请填写理由' }]
             },
             status: 'PENDING',
-            saving: false
+            saving: false,
+            showCodeDialog: false,
+            codeValue: 'Hello, World!'
         };
     },
     computed: {
@@ -199,7 +190,7 @@ export default {
         },
         beforeGetData() {
             return {
-                sort: 'sort,desc;id,desc',
+                sort: 'heats,desc;id,desc',
                 search: this.search,
                 query: { del: false, type: 'COMPANY', status: this.status }
             };
@@ -312,6 +303,12 @@ export default {
                 .catch(e => {
                     this.tableData[this.denyForm.index].saving = false;
                 });
+        },
+        showCode(row) {
+            this.codeValue = this.$baseUrl + '/9th/hall?id=' + row.id;
+            // this.codeValue = 'https://nfttest.raex.vip/9th/hall?id=' + row.id;
+            this.showCodeDialog = true;
+            console.log(this.codeValue);
         }
     }
 };

src/main/vue/src/views/company/CompanyRoomEdit.vue

@@ -60,6 +60,7 @@
                                 :value="item.id"
                             ></el-option>
                         </el-select>
+                        <!-- <el-link style="margin-left: 20px" @click="preview">展厅预览</el-link> -->
                     </el-form-item>
                     <el-form-item prop="headBg" label="背景" v-if="formData.settingId">
                         <el-image :src="formData.headBg" style="height: 170px"></el-image>
@@ -85,6 +86,14 @@
                         </el-table>
                         <el-button @click="addCollection" size="mini">添加</el-button>
                     </el-form-item>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="heats" label="热力值">
+                            <el-input-number type="number" v-model="formData.heats" disabled></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="registers" label="邀请数量">
+                            <el-input-number type="number" v-model="formData.registers" disabled></el-input-number>
+                        </el-form-item>
+                    </div>
                     <!-- <el-form-item prop="publish" label="发布" v-if="formData.status == 'SUCCESS'">
                         <el-radio v-model="formData.publish" :label="true">是</el-radio>
                         <el-radio v-model="formData.publish" :label="false">否</el-radio>
@@ -129,7 +138,6 @@
 </template>
 <script>
 import { mapState } from 'vuex';
-
 export default {
     name: 'ShowroomEdit',
     created() {
@@ -285,6 +293,10 @@ export default {
                     }
                 })
                 .catch(() => {});
+        },
+        preview() {
+            let url = "/9th/hall?id=" + this.formData.id;
+            window.open(url); 
         }
     }
 };
@@ -296,4 +308,9 @@ export default {
 /deep/.el-textarea.is-disabled .el-textarea__inner {
     color: #7c7e7e;
 }
-</style>
+.inline-wrapper {
+    .el-form-item {
+        display: inline-block;
+    }
+}
+</style>

src/main/vue/src/views/company/CompanyRoomList.vue

@@ -44,10 +44,13 @@
                 </template>
             </el-table-column> -->
             <el-table-column prop="likes" label="点赞"> </el-table-column>
+            <el-table-column prop="registers" label="邀请数"> </el-table-column>
+            <el-table-column prop="heats" label="热力值"></el-table-column>
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="150">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button size="mini" @click="showCode(row)" type="success" plain>预览</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -72,15 +75,21 @@
             >
             </el-pagination>
         </div>
+
+        <el-dialog :visible.sync="showCodeDialog" title="预览二维码" width="400px" center>
+            <vue-qrcode :value="codeValue" :options="{ width: 300, margin: 2 }" style="margin-left: 25px"></vue-qrcode>
+            <div style="margin-left: 40px; font-size: 16px">扫码预览展厅</div>
+        </el-dialog>
     </div>
 </template>
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
-
+import VueQrcode from '@chenfengyuan/vue-qrcode';
 export default {
     name: 'ShowroomList',
     mixins: [pageableTable],
+    components: { VueQrcode },
     data() {
         return {
             multipleMode: false,
@@ -92,7 +101,9 @@ export default {
                 { label: '审核中', value: 'PENDING' },
                 { label: '已审核', value: 'SUCCESS' },
                 { label: '失败', value: 'FAIL' }
-            ]
+            ],
+            showCodeDialog: false,
+            codeValue: 'Hello, World!'
         };
     },
     computed: {
@@ -181,6 +192,12 @@ export default {
                         this.$message.error(e.error);
                     }
                 });
+        },
+        showCode(row) {
+            this.codeValue = this.$baseUrl + '/9th/hall?id=' + row.id;
+            // this.codeValue = 'https://nfttest.raex.vip/9th/hall?id=' + row.id;
+            this.showCodeDialog = true;
+            console.log(this.codeValue);
         }
     }
 };

src/test/java/com/izouma/nineth/service/CollectionServiceTest.java

@@ -1,11 +1,13 @@
 package com.izouma.nineth.service;
 
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.izouma.nineth.ApplicationTests;
 import com.izouma.nineth.domain.BlindBoxItem;
 import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.FileObject;
 import com.izouma.nineth.dto.CreateBlindBox;
+import com.izouma.nineth.dto.TestExcelDTO;
 import com.izouma.nineth.enums.CollectionType;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.CollectionRepo;
@@ -13,6 +15,7 @@ import com.izouma.nineth.repo.PrivilegeOptionRepo;
 import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.service.storage.StorageService;
 import com.izouma.nineth.utils.ImageUtils;
+import com.izouma.nineth.utils.excel.UploadDataListener;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -210,4 +213,43 @@ class CollectionServiceTest extends ApplicationTests {
         System.out.println(firstHour);
     }
 
+    @Test
+    public void createBlindBox1() throws IOException {
+
+        File file = new File("/Users/qiufangchao/Desktop/mingdan.xlsx");
+        UploadDataListener<TestExcelDTO> listener = new UploadDataListener<>();
+        List<TestExcelDTO> dtos = EasyExcel.read(file, TestExcelDTO.class, listener)
+                .sheet()
+                .doReadSync();
+
+        List<Collection> items = dtos.stream().map(dto -> {
+            Collection collection = collectionRepo.findById(dto.getId())
+                    .orElseThrow(new BusinessException(dto.getId() + "无藏品"));
+            if (collection.getStock() < dto.getNum()) {
+                throw new BusinessException(collection.getId() + "数量不足");
+            }
+            return collection;
+        }).collect(Collectors.toList());
+
+        Map<Long, Integer> excelMap = dtos.stream().collect(Collectors.toMap(TestExcelDTO::getId, TestExcelDTO::getNum));
+
+        String jsonStr = FileUtils.readFileToString(new File("/Users/qiufangchao/Desktop/mugen_mu.json"), "UTF-8");
+        Collection blindBox = JSON.parseObject(jsonStr, Collection.class);
+        blindBox.setType(CollectionType.BLIND_BOX);
+        blindBox.setId(null);
+        blindBox.setOnShelf(false);
+        blindBox.setSalable(false);
+        blindBox.setMinterId(7150L);
+        blindBox.setNoSoldOut(true);
+        blindBox.setMaxCount(1);
+        blindBox.setName("520盲盒");
+        blindBox.setPic(Arrays.asList(new FileObject(null, "https://cdn.raex.vip/nft/2022-04-16-19-24-54WTJLmsmR.jpg", null, "image/jpeg")));
+        collectionService.createBlindBox(new CreateBlindBox(blindBox, items.stream().map(i -> {
+            BlindBoxItem item = new BlindBoxItem();
+            item.setCollectionId(i.getId());
+            item.setTotal(excelMap.get(i.getId()));
+            return item;
+        }).collect(Collectors.toList())));
+
+    }
 }

src/test/java/com/izouma/nineth/service/UserServiceTest.java

@@ -119,7 +119,8 @@ public class UserServiceTest extends ApplicationTests {
 
     @Test
     public void phoneRegister() {
-        userService.phoneRegister("18100004444", "1234", "123456", null, 9972L, 206925L);
+        userService.phoneRegister("18100004444", "1234", "123456", null, 9972L,
+                206925L, null);
     }
 
     @Test