From 10ec7e09fb786a1b627a0a97c0cb107dfec00520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 20 Nov 2024 09:44:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=87=92=E5=8A=A0=E8=BD=BDbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/ysk/cashier/mnt/domain/Deploy.java | 4 ++-- .../src/main/java/cn/ysk/cashier/system/domain/Role.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Deploy.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Deploy.java index 257167b6..e709541a 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Deploy.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/domain/Deploy.java @@ -27,14 +27,14 @@ public class Deploy extends BaseEntity implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ManyToMany + @ManyToMany(fetch = FetchType.EAGER) @ApiModelProperty(name = "服务器", hidden = true) @JoinTable(name = "mnt_deploy_server", joinColumns = {@JoinColumn(name = "deploy_id",referencedColumnName = "deploy_id")}, inverseJoinColumns = {@JoinColumn(name = "server_id",referencedColumnName = "server_id")}) private Set deploys; - @ManyToOne + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "app_id") @ApiModelProperty(value = "应用编号") private App app; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java index 8afd4b07..8c57bf19 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java @@ -34,7 +34,7 @@ public class Role extends BaseEntity implements Serializable { private Long id; @JSONField(serialize = false) - @ManyToMany(mappedBy = "roles") + @ManyToMany(mappedBy = "roles", fetch = FetchType.EAGER) @ApiModelProperty(value = "用户", hidden = true) private Set users; From d427fbd53ba425ab1b8a034e1e2c7c12fb23c019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 20 Nov 2024 09:50:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=87=92=E5=8A=A0=E8=BD=BDbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/service/impl/TbPayServiceImpl.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java index 807ca6d3..f004ce74 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java @@ -29,6 +29,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; +import org.hibernate.Hibernate; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; @@ -128,13 +129,8 @@ public class TbPayServiceImpl implements TbPayService { for (TbCashierCart cashierCart : cashierCarts) { body.append(cashierCart.getName()); } - - - TbMerchantThirdApply thirdApply = merchantThirdApplyRepository.getById(merchantId); - if (ObjectUtil.isEmpty(thirdApply) || ObjectUtil.isNull(thirdApply)) { - throw new BadRequestException("三方支付信息不存在"); - } - + TbMerchantThirdApply thirdApply = merchantThirdApplyRepository.findById(merchantId) + .orElseThrow(() -> new BadRequestException("三方支付信息不存在")); String payType; String payName; String qpay; From 845c9808fe454e732ebc0a109b38ff0ad9380cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 20 Nov 2024 09:58:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20detail=E5=A2=9E=E5=8A=A0isMember?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java | 1 + .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java index d33d9489..4f55578e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java @@ -130,6 +130,7 @@ public class TbOrderDetail implements Serializable { private BigDecimal memberPrice; private Integer userCouponId; + private Integer isMember; public void copy(TbOrderDetail source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index cdcd221f..f47b7f5e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -1517,6 +1517,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderDetail.setProductImg(cashierCart.getCoverImg()); orderDetail.setCartId(cashierCart.getId()); orderDetail.setOrderId(orderInfo == null ? null : orderInfo.getId()); + orderDetail.setIsMember(cashierCart.getIsMember()); priceDTO.getOrderDetailList().add(orderDetail); } return priceDTO;