## 调整代码逻辑；
This commit is contained in:
parent
f9c50f26c3
commit
bbc299e50a
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
<!-- 通用查询映射结果 -->
|
||||
<resultMap id="WaresItemVo" type="com.hzs.sale.shopping.vo.WaresItemVo">
|
||||
<result column="WARES_CODE" property="waresCode"/>
|
||||
<result column="COVER" property="cover"/>
|
||||
<result column="COVER1" property="cover1"/>
|
||||
<result column="WARES_NAME" property="waresName"/>
|
||||
<result column="IS_MAKER_GIFT" property="isMakerGift"/>
|
||||
|
|
@ -144,10 +145,10 @@
|
|||
</foreach>
|
||||
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
|
||||
</select>
|
||||
|
||||
|
|
@ -217,7 +218,8 @@
|
|||
</select>
|
||||
|
||||
<select id="selectByPkIds" resultType="com.hzs.sale.shopping.vo.WaresItemWaresInfo">
|
||||
select wss.SPEC_COVER specCover,bw.WARES_NAME waresName,wd.QUANTITY quantity,bp.PRODUCT_NAME productName ,wd.PK_ID pkWaresDetail,wss.PK_ID pkWaresSpecsSku,
|
||||
select wss.SPEC_COVER specCover,bw.WARES_NAME waresName,wd.QUANTITY quantity,bp.PRODUCT_NAME productName ,wd.PK_ID pkWaresDetail,wss.PK_ID
|
||||
pkWaresSpecsSku,
|
||||
( select listagg(bs.SPECS_NAME,',') WITHIN GROUP(order by bs.SPECS_NAME) AS skuInfo from BD_WARES_SPECS_RELATION wsr
|
||||
left join BD_WARES_SPECS ws on ws.PK_ID = wsr.PK_WARES_SPECS
|
||||
left join BD_SPECS bs on bs.PK_ID = ws.PK_SPECS where wss.pk_id = wsr.PK_WARES_SPECS_SKU and wsr.del_flag = 0) skuInfo,
|
||||
|
|
@ -326,10 +328,20 @@
|
|||
|
||||
<select id="selectWaresItemsVO" resultMap="WaresItemVo">
|
||||
<foreach collection="productGroup" item="item" index="index" separator=" union ">
|
||||
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
|
||||
|
|
|
|||
|
|
@ -135,11 +135,11 @@
|
|||
<artifactId>dg-java-sdk</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 支付宝对接SDK -->
|
||||
<dependency>
|
||||
<groupId>com.alipay.sdk</groupId>
|
||||
<artifactId>alipay-sdk-java</artifactId>
|
||||
</dependency>
|
||||
<!-- <!– 支付宝对接SDK –>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.alipay.sdk</groupId>-->
|
||||
<!-- <artifactId>alipay-sdk-java</artifactId>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
</dependencies>
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
12
pom.xml
12
pom.xml
|
|
@ -314,12 +314,12 @@
|
|||
<version>${huifu-new.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 支付宝对接SDK -->
|
||||
<dependency>
|
||||
<groupId>com.alipay.sdk</groupId>
|
||||
<artifactId>alipay-sdk-java</artifactId>
|
||||
<version>${alipay.version}</version>
|
||||
</dependency>
|
||||
<!-- <!– 支付宝对接SDK –>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.alipay.sdk</groupId>-->
|
||||
<!-- <artifactId>alipay-sdk-java</artifactId>-->
|
||||
<!-- <version>${alipay.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
|
|
|||
Loading…
Reference in New Issue