Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
This commit is contained in:
commit
d8792e9e27
@ -293,6 +293,8 @@ public enum ResultCode {
|
||||
COUPON_MEMBER_NOT_EXIST(41015, "没有当前会员优惠券"),
|
||||
COUPON_MEMBER_STATUS_ERROR(41016, "当前会员优惠券已过期/作废无法变更状态!"),
|
||||
|
||||
SPECIAL_CANT_USE(41020, "特殊商品不能使用优惠券,不能使用"),
|
||||
|
||||
|
||||
/**
|
||||
* 拼团
|
||||
|
@ -94,6 +94,9 @@ public class DistributionOrderServiceImpl extends ServiceImpl<DistributionOrderM
|
||||
//循环店铺流水记录判断是否包含分销商品
|
||||
//包含分销商品则进行记录分销订单、计算分销总额
|
||||
for (StoreFlow storeFlow : storeFlowList) {
|
||||
if (storeFlow.getDistributionRebate() == null || storeFlow.getDistributionRebate() == 0) {
|
||||
continue;
|
||||
}
|
||||
rebate = CurrencyUtil.add(rebate, storeFlow.getDistributionRebate());
|
||||
DistributionOrder distributionOrder = new DistributionOrder(storeFlow);
|
||||
distributionOrder.setDistributionId(order.getDistributionId());
|
||||
|
@ -21,14 +21,9 @@ import java.util.Date;
|
||||
@Data
|
||||
public class ManagerMemberEditDTO {
|
||||
|
||||
@ApiModelProperty(value = "会员用户名,用户名不能进行修改", required = true)
|
||||
@NotNull(message = "会员用户名不能为空")
|
||||
@NotNull(message = "用户ID不能为空")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "会员用户名,用户名不能进行修改", required = true)
|
||||
@NotNull(message = "会员用户名不能为空")
|
||||
private String username;
|
||||
|
||||
@ApiModelProperty(value = "会员密码")
|
||||
private String password;
|
||||
|
||||
|
@ -287,9 +287,10 @@ public class CartServiceImpl implements CartService {
|
||||
|
||||
/**
|
||||
* 当购物车商品发生变更时,取消已选择当优惠券
|
||||
*
|
||||
* @param tradeDTO
|
||||
*/
|
||||
private void remoteCoupon(TradeDTO tradeDTO){
|
||||
private void remoteCoupon(TradeDTO tradeDTO) {
|
||||
tradeDTO.setPlatformCoupon(null);
|
||||
tradeDTO.setStoreCoupons(new HashMap<>());
|
||||
}
|
||||
@ -526,6 +527,12 @@ public class CartServiceImpl implements CartService {
|
||||
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
|
||||
//获取购物车,然后重新写入优惠券
|
||||
CartTypeEnum cartTypeEnum = getCartType(way);
|
||||
|
||||
//积分商品不允许使用优惠券
|
||||
if (cartTypeEnum.equals(CartTypeEnum.POINTS)) {
|
||||
throw new ServiceException(ResultCode.SPECIAL_CANT_USE);
|
||||
}
|
||||
|
||||
TradeDTO tradeDTO = this.readDTO(cartTypeEnum);
|
||||
|
||||
MemberCouponSearchParams searchParams = new MemberCouponSearchParams();
|
||||
|
Loading…
x
Reference in New Issue
Block a user