angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 乐学复购专区处理；

This commit is contained in:
cabbage 2025-04-08 20:22:36 +08:00
parent ecb3de527a
commit ae43f60f8b
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -1730,7 +1730,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
cuMember.setConsumeAchieve(gradeDTO.getStartValue()); cuMember.setConsumeAchieve(gradeDTO.getStartValue());
} }
// 乐学升级需要抽除代金券 // 乐学升级需要扣除代金券
if (EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { if (EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
iAcPickService.deductionsCouponByOrder(saOrderExt.getPkMember(), saOrderExt.getPkId()); iAcPickService.deductionsCouponByOrder(saOrderExt.getPkMember(), saOrderExt.getPkId());
} }

1
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/shopping/service/impl/ShoppingCartServiceImpl.java
View File

@ -237,6 +237,7 @@ public class ShoppingCartServiceImpl implements IShoppingCartService {
} }
} }
// 购物车中显示的商品价格
shoppingCart.setWaresPrice(waresPrice); shoppingCart.setWaresPrice(waresPrice);
shoppingCart.setAchieve(achieve); shoppingCart.setAchieve(achieve);
shoppingCart.setAssAchieve(assAchieve); shoppingCart.setAssAchieve(assAchieve);

13
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java
View File

@ -231,7 +231,8 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
public CuWaresParams queryWaresSpecsSkuCount(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) { public CuWaresParams queryWaresSpecsSkuCount(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) {
List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList; List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList;
if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) { if (EOrderType.REPURCHASE_ORDER.getValue() == specialArea
|| EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == specialArea) {
R<CuMember> memberDate = memberServiceApi.getMember(loginMemberId); R<CuMember> memberDate = memberServiceApi.getMember(loginMemberId);
CuMember cuMember = memberDate.getData(); CuMember cuMember = memberDate.getData();
@ -372,8 +373,14 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
} else { } else {
price = MagicNumberConstants.LXYK_V1; price = MagicNumberConstants.LXYK_V1;
} }
int finalPrice = price.intValue() / productParamsResultList.size(); BigDecimal finalPrice = price;
productParamsResultList.forEach(param -> param.getWaresItemsParamsList().forEach(item -> item.setPriceTotal(new BigDecimal(finalPrice)))); productParamsResultList.forEach(param -> param.getWaresItemsParamsList().forEach(item -> {
if (EYesNo.NO.getIntValue() == item.getIsGift()) {
// 非赠品
item.setPrice(finalPrice);
item.setPriceTotal(finalPrice.multiply(new BigDecimal(item.getQuantity())));
}
}));
} }
cuWaresParams.setProductParams(productParamsResultList); cuWaresParams.setProductParams(productParamsResultList);

2
hzs-business/hzs-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml
View File

@ -45,7 +45,7 @@
</resultMap> </resultMap>
<select id="queryWaresDetailByCondition" resultMap="BdWaresDetailExt"> <select id="queryWaresDetailByCondition" resultMap="BdWaresDetailExt">
<foreach collection="orderItemsParams" item="item" index="index" separator="union"> <foreach collection="orderItemsParams" item="item" index="index" separator=" union all ">
select bd.pk_id,bs.pk_id pk_wares_specs_sku,bw.is_free_mail,be.pk_land_postage, select bd.pk_id,bs.pk_id pk_wares_specs_sku,bw.is_free_mail,be.pk_land_postage,
be.pk_air_postage,be.pk_ocean_postage,bw.pk_id pk_wares,be.is_maker_gift,be.pre_sale_status, be.pk_air_postage,be.pk_ocean_postage,bw.pk_id pk_wares,be.is_maker_gift,be.pre_sale_status,
be.pk_special_currency,bw.wares_code, bw.wares_name, bd.is_gift is_gift, be.pk_special_currency,bw.wares_code, bw.wares_name, bd.is_gift is_gift,

2
hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java
View File

@ -299,7 +299,7 @@ public class CacheConstants {
/** /**
* 购物车 * 购物车
*/ */
public static final String SHOPPIN_GCART = CACHE_PREFIX + "shoppin:gcart:"; public static final String SHOPPIN_GCART = CACHE_PREFIX + "shopping:cart:";
/** /**
* 短信缓存key前缀 * 短信缓存key前缀

4
hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EAccount.java
View File

@ -69,9 +69,9 @@ public enum EAccount {
LIVE_CASH_COUPON(11, "直播代金券", EnumsPrefixConstants.ACCOUNT + "11"), LIVE_CASH_COUPON(11, "直播代金券", EnumsPrefixConstants.ACCOUNT + "11"),
/** /**
* 代金券 * 法宝券
*/ */
CASH_COUPON(12, "乐学代金券", EnumsPrefixConstants.ACCOUNT + "12"), CASH_COUPON(12, "法宝券", EnumsPrefixConstants.ACCOUNT + "12"),
// /** // /**
// * 海豆账号 // * 海豆账号