Commit e6152da4 by 徐康

问题修复

parent 0b8a62f6
......@@ -261,7 +261,8 @@ public class OrderAdapter {
.sequence(orderAccountIndex++)
.build();
if (mcCafePartnerId.equals(createOrderDto.getCompanyId())) {
if(activityDiscountsDto.getDiscountAmount() == 0 && activityDiscountsDto.getActivityType() == 38 && activityDiscountsDto.getExtendType() == 12
if(activityDiscountsDto.getDiscountAmount() == 0 && ActivityTypeEnum.TYPE_38.getCode().equals(activityDiscountsDto.getActivityType())
&& activityDiscountsDto.getExtendType() == 12 //12=月享卡2.0
&& (shoppingCartGoodsDto.getMonthCardDiscount() == null || shoppingCartGoodsDto.getMonthCardDiscount().getDiscountAmount() == 0)) {
continue;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment