caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!102 适配优化更新索引促销方式的结算

Browse Source 
Merge pull request !102 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2021-12-30 01:53:48 +00:00 committed by Gitee
commit a318eb82c7
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buyer-api/src/main/java/cn/lili/controller/promotion/KanjiaGoodsActivityBuyerController.java
View File

@ -1,6 +1,6 @@
package cn.lili.controller.promotion; package cn.lili.controller.promotion;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.text.CharSequenceUtil;
import cn.lili.common.enums.ResultUtil; import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext; import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO; import cn.lili.common.vo.PageVO;
@ -79,7 +79,7 @@ public class KanjiaGoodsActivityBuyerController {
@ApiOperation(value = "获取砍价活动") @ApiOperation(value = "获取砍价活动")
public ResultMessage<KanjiaActivityVO> getKanJiaActivity(KanjiaActivitySearchParams kanjiaActivitySearchParams) { public ResultMessage<KanjiaActivityVO> getKanJiaActivity(KanjiaActivitySearchParams kanjiaActivitySearchParams) {
//如果是非被邀请关系则填写会员ID //如果是非被邀请关系则填写会员ID
if (StrUtil.isEmpty(kanjiaActivitySearchParams.getKanjiaActivityId())) { if (CharSequenceUtil.isEmpty(kanjiaActivitySearchParams.getKanjiaActivityId())) {
kanjiaActivitySearchParams.setMemberId(UserContext.getCurrentUser().getId()); kanjiaActivitySearchParams.setMemberId(UserContext.getCurrentUser().getId());
} }
return ResultUtil.data(kanJiaActivityService.getKanjiaActivityVO(kanjiaActivitySearchParams)); return ResultUtil.data(kanJiaActivityService.getKanjiaActivityVO(kanjiaActivitySearchParams));

6
framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
View File

@ -154,8 +154,10 @@ public class CheckDataRender implements CartRenderStep {
try { try {
//筛选属于当前店铺的优惠券 //筛选属于当前店铺的优惠券
storeCart.getValue().forEach(i -> i.getPromotionMap().forEach((key, value) -> { storeCart.getValue().forEach(i -> i.getPromotionMap().forEach((key, value) -> {
if (key.contains(PromotionTypeEnum.COUPON.name()) && ((Coupon) value).getStoreId().equals(storeCart.getKey())) { JSONObject promotionsObj = JSONUtil.parseObj(value);
cartVO.getCanReceiveCoupon().add(new CouponVO((Coupon) value)); Coupon coupon = JSONUtil.toBean(promotionsObj, Coupon.class);
if (key.contains(PromotionTypeEnum.COUPON.name()) && coupon.getStoreId().equals(storeCart.getKey())) {
cartVO.getCanReceiveCoupon().add(new CouponVO(coupon));
} }
})); }));
} catch (Exception e) { } catch (Exception e) {

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
View File

@ -137,7 +137,7 @@ public class CouponActivityServiceImpl extends AbstractPromotionsServiceImpl<Cou
* 更新优惠券活动商品信息 * 更新优惠券活动商品信息
* *
* @param couponActivity 优惠券活动实体 * @param couponActivity 优惠券活动实体
* @return * @return 是否更新成功
*/ */
@Override @Override
public boolean updatePromotionsGoods(CouponActivity couponActivity) { public boolean updatePromotionsGoods(CouponActivity couponActivity) {

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
View File

@ -107,7 +107,7 @@ public class FullDiscountServiceImpl extends AbstractPromotionsServiceImpl<FullD
* 更新促销商品信息 * 更新促销商品信息
* *
* @param promotions 促销实体 * @param promotions 促销实体
* @return * @return 是否更新成功
*/ */
@Override @Override
public boolean updatePromotionsGoods(FullDiscount promotions) { public boolean updatePromotionsGoods(FullDiscount promotions) {

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
View File

@ -204,7 +204,7 @@ public class PintuanServiceImpl extends AbstractPromotionsServiceImpl<PintuanMap
* 更新促销商品信息 * 更新促销商品信息
* *
* @param promotions 促销实体 * @param promotions 促销实体
* @return * @return 是否更新成功
*/ */
@Override @Override
public boolean updatePromotionsGoods(Pintuan promotions) { public boolean updatePromotionsGoods(Pintuan promotions) {

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
View File

@ -204,7 +204,7 @@ public class PointsGoodsServiceImpl extends AbstractPromotionsServiceImpl<Points
* 更新促销商品信息 * 更新促销商品信息
* *
* @param promotions 促销实体 * @param promotions 促销实体
* @return * @return 是否更新成功
*/ */
@Override @Override
public boolean updatePromotionsGoods(PointsGoods promotions) { public boolean updatePromotionsGoods(PointsGoods promotions) {