code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加订单取消返还优惠券

Browse Source
This commit is contained in:
paulGao
2022-08-12 17:35:42 +08:00
parent ae833b245e
commit c3be2cdfe5
4 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
View File

@@ -6,6 +6,7 @@ import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.common.utils.BeanUtil;
import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
@@ -238,8 +239,8 @@ public class Order extends BaseEntity {
//店铺优惠券判定
if (tradeDTO.getStoreCoupons() != null && !tradeDTO.getStoreCoupons().isEmpty()) {
StringBuilder storeCouponIds = new StringBuilder();
for (String s : tradeDTO.getStoreCoupons().keySet()) {
storeCouponIds.append(s).append(",");
for (MemberCouponDTO value : tradeDTO.getStoreCoupons().values()) {
storeCouponIds.append(value.getMemberCoupon().getId()).append(",");
}
this.setUseStoreMemberCouponIds(storeCouponIds.toString());
}

8
framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java
View File

@@ -139,4 +139,12 @@ public interface MemberCouponService extends IService<MemberCoupon> {
*/
void closeMemberCoupon(List<String> couponIds);
/**
* 恢复会员优惠券
*
* @param memberCouponIds 会员优惠券id列表
* @return 是否恢复成功
*/
boolean recoveryMemberCoupon(List<String> memberCouponIds);
}

8
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
View File

@@ -285,6 +285,14 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
this.update(memberCouponLambdaUpdateWrapper);
}
@Override
public boolean recoveryMemberCoupon(List<String> memberCouponIds) {
LambdaUpdateWrapper<MemberCoupon> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(MemberCoupon::getId, memberCouponIds);
updateWrapper.set(MemberCoupon::getMemberCouponStatus, MemberCouponStatusEnum.NEW.name());
return this.update(updateWrapper);
}
/**
* 清除无效的会员优惠券
*