licailing před 3 roky
rodič
revize
5f3dfa0802

+ 3 - 2
src/main/java/com/izouma/nineth/service/AuctionActivityService.java

@@ -75,7 +75,7 @@ public class AuctionActivityService {
         Asset asset = assetRepo.findById(dto.getAssetId()).orElseThrow(new BusinessException("暂无"));
 
         //拍卖周期
-        int auctionCycle = sysConfigService.getInt("auction_cycle");
+        BigDecimal auctionCycle = sysConfigService.getBigDecimal("auction_cycle");
 
         AuctionActivity auctionActivity = new AuctionActivity();
         auctionActivity.setAuctionType(AuctionType.NFT);
@@ -83,7 +83,8 @@ public class AuctionActivityService {
         auctionActivity.setStatus(AuctionStatus.ONGOING);
         auctionActivity.setBids(0);
         auctionActivity.setCategory(asset.getCategory());
-        auctionActivity.setEndTime(LocalDateTime.now().plusDays(auctionCycle));
+        auctionActivity.setEndTime(LocalDateTime.now()
+                .plusHours(auctionCycle.multiply(new BigDecimal("24")).intValue()));
         auctionActivity.setDeposit(dto.getDeposit());
         if (Arrays.asList(env.getActiveProfiles()).contains("staging")) {
             auctionActivity.setEndTime(LocalDateTime.now().plusMinutes(8));

+ 6 - 1
src/main/vue/src/views/AuctionActivityEdit.vue

@@ -295,7 +295,7 @@ export default {
                                 callback(new Error('请填写结束时间'));
                             } else if (isBefore(parse(value, 'yyyy-MM-dd HH:mm:ss', new Date()), new Date())) {
                                 callback(new Error('结束时间不能小于当前时间'));
-                            } else if (this.formData.scheduleSale) {
+                            } else if (this.formData.startTime) {
                                 if (
                                     isBefore(
                                         parse(value, 'yyyy-MM-dd HH:mm:ss', new Date()),
@@ -303,7 +303,11 @@ export default {
                                     )
                                 ) {
                                     callback(new Error('结束时间不能小于发布时间'));
+                                } else {
+                                    callback();
                                 }
+                            } else {
+                                callback();
                             }
                         },
                         trigger: 'blur'
@@ -341,6 +345,7 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
+                    console.log('1');
                     this.submit();
                 } else {
                     return false;