Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_back into dev

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

@@ -14,7 +14,10 @@ import java.time.LocalDateTime;
 
 @Data
 @Entity
-@Table(indexes = {@Index(columnList = "phone,expiresAt,expired")})
+@Table(indexes = {
+        @Index(columnList = "phone"),
+        @Index(columnList = "expiresAt")
+})
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder

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

@@ -41,6 +41,7 @@ import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
@@ -354,6 +355,7 @@ public class OrderService {
 
     }
 
+    @Cacheable(value = "adapay", key = "#id+'_'+#payChannel")
     public Object payAdapay(Long id, String payChannel, String openId) throws BaseAdaPayException {
         List<String> aliChannels = Arrays.asList("alipay", "alipay_qr", "alipay_wap");
         List<String> wxChannels = Arrays.asList("wx_pub", "wx_lite");

src/main/vue/src/views/MintActivityList.vue

@@ -55,7 +55,7 @@
             <el-table-column prop="collectionName" label="藏品名称"> </el-table-column>
 
             <el-table-column prop="num" label="藏品数量"> </el-table-column>
-            <el-table-column prop="consume" label="是否消耗藏品">
+            <el-table-column prop="consume" label="消耗藏品">
                 <template v-slot="{ row }">
                     <el-tag type="success" v-if="row.consume">是</el-tag>
                     <el-tag type="info" v-else>否</el-tag>
@@ -64,6 +64,12 @@
             <el-table-column prop="total" label="发行数量"> </el-table-column>
             <el-table-column prop="stock" label="剩余数量"> </el-table-column>
             <el-table-column prop="gasPrice" label="GAS费"></el-table-column>
+            <el-table-column prop="onShelf" label="上架">
+                <template v-slot="{ row }">
+                    <el-tag type="success" v-if="row.onShelf">是</el-tag>
+                    <el-tag type="info" v-else>否</el-tag>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="120">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>详情</el-button>