From c509e75d4c67675e760bfef359d98c06432e3a86 Mon Sep 17 00:00:00 2001 From: "1304317391@qq.com" Date: Mon, 28 Nov 2022 19:12:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E7=A7=92=E6=9D=80=E7=A0=8D?= =?UTF-8?q?=E4=BB=B7=E6=94=AF=E6=8C=81=E5=8D=95=E7=8B=AC=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/domain/YxStoreBargain.java | 3 +++ .../activity/domain/YxStoreCombination.java | 4 ++++ .../activity/domain/YxStoreSeckill.java | 3 +++ .../activity/rest/StoreBargainController.java | 8 +++++++ .../service/dto/YxStoreCombinationDto.java | 3 +++ .../service/dto/YxStoreSeckillDto.java | 3 +++ .../impl/YxStoreBargainServiceImpl.java | 3 +-- .../impl/YxStoreCombinationServiceImpl.java | 3 +-- .../impl/YxStoreSeckillServiceImpl.java | 21 +++++++++++++------ 9 files changed, 41 insertions(+), 10 deletions(-) diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java index 797ef087..e454afaa 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java @@ -54,6 +54,9 @@ public class YxStoreBargain extends BaseDomain { @ApiModelProperty(value = "砍价产品图片") private String image; + /** 砍价活动图片 */ + @ApiModelProperty(value = "砍价链接图片") + private String linkImage; /** 单位名称 */ @ApiModelProperty(value = "砍价产品单位名称") diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java index ecc1a80d..fd1d1a3d 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java @@ -56,6 +56,10 @@ public class YxStoreCombination extends BaseDomain { @ApiModelProperty(value = "推荐图") private String image; + /** 链接图 */ + @ApiModelProperty(value = "链接图") + private String linkImage; + /** 轮播图 */ @NotBlank(message = "请上传商品轮播") diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java index 8f89a8a0..13d0abc3 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java @@ -51,6 +51,9 @@ public class YxStoreSeckill extends BaseDomain { @ApiModelProperty(value = "推荐图") private String image; + /** 推荐图 */ + @ApiModelProperty(value = "链接图") + private String linkImage; /** 轮播图 */ @NotBlank(message = "请上传商品轮播") diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index fb8cbdfa..74ab3441 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -83,4 +83,12 @@ public class StoreBargainController { yxStoreBargainService.removeById(id); return new ResponseEntity(HttpStatus.OK); } + + @Log("查询砍价详情") + @ApiOperation(value = "查询砍价详情") + @GetMapping(value = "/yxStoreBargain/info/{id}") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_SELECT')") + public ResponseEntity getInfo(@PathVariable Integer id){ + return new ResponseEntity<>(yxStoreBargainService.getById(id),HttpStatus.OK); + } } diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java index 2c59f125..9063f339 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java @@ -39,6 +39,9 @@ public class YxStoreCombinationDto implements Serializable { // 推荐图 private String image; + // 链接图 + private String linkImage; + private String images; /** 轮播图 */ diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java index e3014977..3e9a9fdc 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java @@ -39,6 +39,9 @@ public class YxStoreSeckillDto implements Serializable { // 推荐图 private String image; + // 轮播图 + private String linkImage; + // 轮播图 private String images; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index a92a05cd..38dbf20c 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -333,8 +333,7 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl)returnMap.get("productAttr")) .productValue((Map)returnMap.get("productValue")) - .storeInfo(generator.convert(storeSeckill, YxStoreSeckillQueryVo.class).setConfig(storeProductMapper.selectById(storeSeckill.getProductId()).getConfig()) - .setLinkImage(storeProductMapper.selectById(storeSeckill.getProductId()).getLinkImage())) + .storeInfo(generator.convert(storeSeckill, YxStoreSeckillQueryVo.class).setConfig(storeProductMapper.selectById(storeSeckill.getProductId()).getConfig())) .reply(replyService.getReply(storeSeckill.getProductId())) .replyCount(replyService.productReplyCount(storeSeckill.getProductId())) .tempName(tempName) @@ -272,8 +271,12 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl{ Integer sum = item.getSales() + item.getStock(); - item.setPercent(NumberUtil.round(NumberUtil.mul(NumberUtil.div(item.getSales(),sum), - 100),0).intValue()); + if (sum==0){ + item.setPercent(100); + }else { + item.setPercent(NumberUtil.round(NumberUtil.mul(NumberUtil.div(item.getSales(),sum), + 100),0).intValue()); + } }); return yxStoreSeckillQueryVos; } @@ -317,8 +320,13 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl{ Integer sum = item.getSales() + item.getStock(); - item.setPercent(NumberUtil.round(NumberUtil.mul(NumberUtil.div(item.getSales(),sum), - 100),0).intValue()); + if (sum==0){ + item.setPercent(100); + }else { + item.setPercent(NumberUtil.round(NumberUtil.mul(NumberUtil.div(item.getSales(),sum), + 100),0).intValue()); + } + }); return yxStoreSeckillQueryVos; } @@ -464,6 +472,7 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl