From 74bf6dd8d268c8ed6e9a6f85b368a1bfd2779192 Mon Sep 17 00:00:00 2001 From: xm <1350250847@qq.com> Date: Wed, 20 May 2026 14:28:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=A8=E5=B9=BF=E7=A0=81=E5=BA=95?= =?UTF-8?q?=E5=9B=BE=E5=A2=9E=E5=8A=A0=E5=88=86=E4=BA=AB=E5=BA=95=E5=9B=BE?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=202=E3=80=81=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=A0=B8=E9=94=80=E7=A0=81=E3=80=81=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E4=BA=BA=E6=9F=A5=E8=AF=A2=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/entity/ShopActiveImage.java | 3 +++ .../com/gxwebsoft/shop/entity/ShopOrder.java | 4 ++++ .../shop/param/ShopActiveImageParam.java | 3 +++ .../impl/ShopOrderGoodsServiceImpl.java | 23 +++++++++---------- .../service/impl/ShopOrderServiceImpl.java | 20 ++++++++++++---- 5 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java b/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java index 86b3831..4a36503 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopActiveImage.java @@ -38,6 +38,9 @@ public class ShopActiveImage implements Serializable { @Schema(description = "图片地址，多个以‘,’隔开") private String imgUrl; + @Schema(description = "分享底图") + private String shareImg; + @Schema(description = "图片地址集合") @TableField(exist = false) private List imgUrlList; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index bb6de33..6ba76a0 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -335,6 +335,10 @@ public class ShopOrder implements Serializable { @Schema(description = "核销人") private Integer verifyUser; + @Schema(description = "核销人") + @TableField(exist = false) + private String verifyUserName; + @Schema(description = "推广核销佣金") private BigDecimal verifyMoney; diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java index f1eef56..f47df2a 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopActiveImageParam.java @@ -35,6 +35,9 @@ public class ShopActiveImageParam extends BaseParam { @Schema(description = "图片地址") private String imgUrl; + @Schema(description = "分享底图") + private String shareImg; + @Schema(description = "启用状态 0-启用 1-禁用") @QueryField(type = QueryType.EQ) private Integer status; diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java index d3471f1..f98f086 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderGoodsServiceImpl.java @@ -2,19 +2,19 @@ package com.gxwebsoft.shop.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; import com.gxwebsoft.shop.entity.ShopFlashSaleActivity; import com.gxwebsoft.shop.entity.ShopOrder; +import com.gxwebsoft.shop.entity.ShopOrderGoods; import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper; import com.gxwebsoft.shop.mapper.ShopOrderGoodsMapper; import com.gxwebsoft.shop.mapper.ShopOrderMapper; -import com.gxwebsoft.shop.service.ShopOrderGoodsService; -import com.gxwebsoft.shop.entity.ShopOrderGoods; import com.gxwebsoft.shop.param.ShopOrderGoodsParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.service.ShopOrderGoodsService; import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; import java.util.List; @@ -54,15 +54,14 @@ public class ShopOrderGoodsServiceImpl extends ServiceImpl { - shopOrderGoods.setVerifyCode(order.getVerifyCode()); - if(finalSaleActivity != null){ - if(shopOrderGoods.getGoodsId().equals(finalSaleActivity.getGoodsId())){ - shopOrderGoods.setActiveNam(finalSaleActivity.getName()); + for(ShopOrderGoods orderGoods : list){ + orderGoods.setVerifyCode(order.getVerifyCode()); + if(saleActivity != null){ + if(orderGoods.getGoodsId().equals(saleActivity.getGoodsId())){ + orderGoods.setActiveNam(saleActivity.getName()); } } - }); + } } } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index cc24fed..82f5440 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -358,11 +358,23 @@ public class ShopOrderServiceImpl extends ServiceImpl