From bbc299e50afb7802c0ba022277a112aff601a9d1 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 16:55:32 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/sale/shopping/vo/WaresItemVo.java | 21 ++++--------- .../sale/wares/BdWaresSpecsSkuMapper.xml | 30 +++++++++++++------ bd-third/pom.xml | 10 +++---- .../pay/constants/PayConfigConstants.java | 6 +--- .../pay/controller/api/PayController.java | 6 +--- .../third/pay/listener/HuiFuLoadListener.java | 8 ++--- pom.xml | 12 ++++---- 7 files changed, 41 insertions(+), 52 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java index 8fb34d72..97c68804 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/shopping/vo/WaresItemVo.java @@ -1,11 +1,4 @@ package com.hzs.sale.shopping.vo; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/20 14:03 - * @Classname: WaresItemVo - * @PackageName: com.hzs.sale.shopping.vo - */ import com.hzs.common.core.annotation.BigDecimalFormat; import lombok.AllArgsConstructor; @@ -16,14 +9,6 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.List; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.sale.shopping.vo - *@Author: yh - *@CreateTime: 2023-03-20 14:03 - *@Description: TODO - *@Version: 1.0 - */ @Data @Builder @AllArgsConstructor @@ -41,6 +26,11 @@ public class WaresItemVo { */ private String waresCode; + /** + * 商品展示图片 + */ + private String cover; + /** * 商品展示图片 */ @@ -64,7 +54,6 @@ public class WaresItemVo { private BigDecimal achieve; /** * bv - * */ @BigDecimalFormat private BigDecimal assAchieve; diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml index 66ae7eeb..06418e05 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresSpecsSkuMapper.xml @@ -52,6 +52,7 @@ + @@ -144,10 +145,10 @@ and br.del_flag = 0 and bk.del_flag = 0 - and wd.DEL_FLAG=0 - and bs.DEL_FLAG=0 - and st.DEL_FLAG=0 - and sp.DEL_FLAG=0 + and wd.DEL_FLAG = 0 + and bs.DEL_FLAG = 0 + and st.DEL_FLAG = 0 + and sp.DEL_FLAG = 0 order by bs.PK_SPECS_TYPE @@ -217,7 +218,8 @@ - select bw.wares_code,bw.cover1,bw.WARES_NAME,be.is_maker_gift, - bs.price price,bs.achieve achieve,bs.ass_achieve ass_achieve, - bd.pk_id pk_wares_detail,bs.pk_id pk_wares_specs_sku,bp.product_name, - bs.spec_cover,#{item.quantity} quantity from BD_WARES bw + select bw.wares_code, + bw.cover, + bw.cover1, + bw.WARES_NAME, + be.is_maker_gift, + bs.price price, + bs.achieve achieve, + bs.ass_achieve ass_achieve, + bd.pk_id pk_wares_detail, + bs.pk_id pk_wares_specs_sku, + bp.product_name, + bs.spec_cover, + #{item.quantity} quantity + from BD_WARES bw inner join bd_wares_extend be on bw.pk_id = be.pk_wares inner join bd_wares_detail bd diff --git a/bd-third/pom.xml b/bd-third/pom.xml index 82004846..f7855c12 100644 --- a/bd-third/pom.xml +++ b/bd-third/pom.xml @@ -135,11 +135,11 @@ dg-java-sdk - - - com.alipay.sdk - alipay-sdk-java - + + + + + diff --git a/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java b/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java index 276081ae..a29c4357 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java +++ b/bd-third/src/main/java/com/hzs/third/pay/constants/PayConfigConstants.java @@ -1,11 +1,7 @@ package com.hzs.third.pay.constants; /** - * @Description: 支付配置常量 - * @Author: jiang chao - * @Time: 2022/11/17 9:59 - * @Classname: PayConfigConstants - * @PackageName: com.hzs.common.constant + * 支付配置常量 */ public class PayConfigConstants { diff --git a/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java b/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java index 993b2664..9a9e4860 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java +++ b/bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java @@ -29,11 +29,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 统一支付控制器 - * @Author: jiang chao - * @Time: 2022/12/27 17:35 - * @Classname: PayController - * @PackageName: com.hzs.third.pay.controller + * 统一支付控制器 */ @Slf4j @RestController diff --git a/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java b/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java index 38591d47..43e5821c 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java +++ b/bd-third/src/main/java/com/hzs/third/pay/listener/HuiFuLoadListener.java @@ -12,13 +12,9 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; /** - * @Description: 汇付新支付的启动配置 - * @Author: jiang chao - * @Time: 2024/12/5 11:09 - * @Classname: HuiFuLoadListener - * @PackageName: com.hzs.third.pay.listener + * 汇付新支付的启动配置 */ -@Component +//@Component @Slf4j public class HuiFuLoadListener implements ServletContextListener { diff --git a/pom.xml b/pom.xml index c4d34d7a..c33de852 100644 --- a/pom.xml +++ b/pom.xml @@ -314,12 +314,12 @@ ${huifu-new.version} - - - com.alipay.sdk - alipay-sdk-java - ${alipay.version} - + + + + + +