Skip to content

O
order-group
Commit 7b3ce3ab by chongfu.liang
Options

Merge branch 'feature/20210318-满减文案修复-lcf'

parents ebfb86ad 892be9f6
Showing with 22 additions and 20 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
...@@ -198,7 +198,7 @@ public class FullPromotionService implements IPromotionService { ...@@ -198,7 +198,7 @@ public class FullPromotionService implements IPromotionService {
int len = dto.getSendGoodsList().size(); int len = dto.getSendGoodsList().size();
notInShopping.setSatisfy(WebUtil.formatAmount(dto.getThresholdAmount() * 1.00 / 100).toString()); notInShopping.setSatisfy(WebUtil.formatAmount(dto.getThresholdAmount() * 1.00 / 100).toString());
List<ActivityList.SendGoods> sends = new ArrayList(); List<ActivityList.SendGoods> sends = new ArrayList();
for (int i = len - 1; i >= 0; i--) { for (int i = 0; i < len; i++) {
ActivityList.SendGoods goods = new ActivityList.SendGoods(); ActivityList.SendGoods goods = new ActivityList.SendGoods();
goods.setQty(dto.getSendGoodsList().get(i).getSendNumber()); goods.setQty(dto.getSendGoodsList().get(i).getSendNumber());
goods.setGoodsName(dto.getSendGoodsList().get(i).getGoodsName()); goods.setGoodsName(dto.getSendGoodsList().get(i).getGoodsName());
...@@ -221,7 +221,7 @@ public class FullPromotionService implements IPromotionService { ...@@ -221,7 +221,7 @@ public class FullPromotionService implements IPromotionService {
ActivityList satisfyList = new ActivityList(); ActivityList satisfyList = new ActivityList();
ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ActivityPrompt activityPrompt = activityPrompts.get(0); ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ActivityPrompt activityPrompt = activityPrompts.get(0);
if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) { if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
if (activityPrompt.getAlreadyDiscountAmount() == null if (activityPrompt.getAlreadyDiscountAmount() == null
|| activityPrompt.getAlreadyDiscountAmount() == 0) { || activityPrompt.getAlreadyDiscountAmount() == 0) {
messageBuilder.append("满 <span style=\"color:#fa5555\">") messageBuilder.append("满 <span style=\"color:#fa5555\">")
...@@ -240,7 +240,7 @@ public class FullPromotionService implements IPromotionService { ...@@ -240,7 +240,7 @@ public class FullPromotionService implements IPromotionService {
} else { } else {
Long toDiscountAmout; Long toDiscountAmout;
//每满减 //每满减
if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) { if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType())) {
toDiscountAmout = activityPrompt.getDiscountAmout() + activityPrompt.getAlreadyDiscountAmount(); toDiscountAmout = activityPrompt.getDiscountAmout() + activityPrompt.getAlreadyDiscountAmount();
} else { } else {
toDiscountAmout = activityPrompt.getDiscountAmout(); toDiscountAmout = activityPrompt.getDiscountAmout();
...@@ -272,18 +272,18 @@ public class FullPromotionService implements IPromotionService { ...@@ -272,18 +272,18 @@ public class FullPromotionService implements IPromotionService {
satisfyList.setSends(sends); satisfyList.setSends(sends);
satisfyList.setSatisfy(WebUtil.formatAmount(activityPrompt.getThresholdAmount() * 1.00 / 100).toString()); satisfyList.setSatisfy(WebUtil.formatAmount(activityPrompt.getThresholdAmount() * 1.00 / 100).toString());
satisfyList.setMissing(WebUtil.formatAmount((activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()) * 1.00 / 100).toString()); satisfyList.setMissing(WebUtil.formatAmount((activityPrompt.getThresholdAmount() - activityPrompt.getTotalAmount()) * 1.00 / 100).toString());
if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) { if (GiftTypeEnum.TYPE_1.getType().equals(activityResponseDto.getActivitySubType())) {
satisfyList.setTipType(8); satisfyList.setTipType(8);
} }
else { else {
satisfyList.setTipType(9); satisfyList.setTipType(7);
} }
if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) { if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) {
if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) { if (GiftTypeEnum.TYPE_1.getType().equals(activityResponseDto.getActivitySubType())) {
satisfyList.setTipType(6); satisfyList.setTipType(10);
} }
else { else {
satisfyList.setTipType(6); satisfyList.setTipType(7);
} }
} }
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullSubtractionActivityServiceImpl.java
...@@ -216,6 +216,7 @@ public class FullSubtractionActivityServiceImpl { ...@@ -216,6 +216,7 @@ public class FullSubtractionActivityServiceImpl {
// 没有加入购物车 // 没有加入购物车
if (calculationDiscountResult == null) { if (calculationDiscountResult == null) {
List<BenefitBeanDto> benefitBeanDtos = activityResponseDto.getBenefits(); List<BenefitBeanDto> benefitBeanDtos = activityResponseDto.getBenefits();
ArrayList<ActivityList> arrayList = new ArrayList();
//BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0); //BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
BenefitBeanDto benefitBeanDto = null; BenefitBeanDto benefitBeanDto = null;
// 每满减 // 每满减
...@@ -236,6 +237,7 @@ public class FullSubtractionActivityServiceImpl { ...@@ -236,6 +237,7 @@ public class FullSubtractionActivityServiceImpl {
notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString()); notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
notInShopping.setMaxDeduct(WebUtil.formatAmount(activityResponseDto.getMaxMoney() * 1.00 / 100).toString()); notInShopping.setMaxDeduct(WebUtil.formatAmount(activityResponseDto.getMaxMoney() * 1.00 / 100).toString());
activityList.add(notInShopping); activityList.add(notInShopping);
arrayList.add(notInShopping);
} }
if (Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) { if (Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
benefitBeanDto = benefitBeanDtos.get(0); benefitBeanDto = benefitBeanDtos.get(0);
...@@ -258,6 +260,7 @@ public class FullSubtractionActivityServiceImpl { ...@@ -258,6 +260,7 @@ public class FullSubtractionActivityServiceImpl {
notInShopping.setSatisfy(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100).toString()); notInShopping.setSatisfy(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100).toString());
notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString()); notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
activityList.add(notInShopping); activityList.add(notInShopping);
arrayList.add(notInShopping);
} }
} }
if (Objects.equals(ActivityTypeEnum.TYPE_230.getCode(), activityResponseDto.getActivityType())) { if (Objects.equals(ActivityTypeEnum.TYPE_230.getCode(), activityResponseDto.getActivityType())) {
...@@ -279,7 +282,7 @@ public class FullSubtractionActivityServiceImpl { ...@@ -279,7 +282,7 @@ public class FullSubtractionActivityServiceImpl {
notInShopping.setSatisfy(WebUtil.formatAmount(beanDto.getThresholdAmount() * 1.00 / 100).toString()); notInShopping.setSatisfy(WebUtil.formatAmount(beanDto.getThresholdAmount() * 1.00 / 100).toString());
int len = beanDto.getSendGoodsList().size(); int len = beanDto.getSendGoodsList().size();
List<ActivityList.SendGoods> sends = new ArrayList(); List<ActivityList.SendGoods> sends = new ArrayList();
for (int i = len - 1; i >= 0; i--) { for (int i = 0; i < len; i++) {
ActivityList.SendGoods goods = new ActivityList.SendGoods(); ActivityList.SendGoods goods = new ActivityList.SendGoods();
goods.setQty(beanDto.getSendGoodsList().get(i).getSendNumber()); goods.setQty(beanDto.getSendGoodsList().get(i).getSendNumber());
goods.setGoodsName(beanDto.getSendGoodsList().get(i).getGoodsName()); goods.setGoodsName(beanDto.getSendGoodsList().get(i).getGoodsName());
...@@ -288,10 +291,9 @@ public class FullSubtractionActivityServiceImpl { ...@@ -288,10 +291,9 @@ public class FullSubtractionActivityServiceImpl {
notInShopping.setSends(sends); notInShopping.setSends(sends);
break; break;
} }
ArrayList<ActivityList> arrayList = new ArrayList();
arrayList.add(notInShopping); arrayList.add(notInShopping);
promotionMessageDto.setActivityList(arrayList);
} }
promotionMessageDto.setActivityList(arrayList);
} }
// 有商品在购物车 // 有商品在购物车
else { else {
...@@ -319,10 +321,10 @@ public class FullSubtractionActivityServiceImpl { ...@@ -319,10 +321,10 @@ public class FullSubtractionActivityServiceImpl {
else { else {
Long toDiscountAmout; Long toDiscountAmout;
//每满减 //每满减
if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) { if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType())
|| GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) { || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
toDiscountAmout = activityPrompt.getDiscountAmout() + activityPrompt.getAlreadyDiscountAmount(); toDiscountAmout = activityPrompt.getDiscountAmout() + activityPrompt.getAlreadyDiscountAmount();
} else { } else {
toDiscountAmout = activityPrompt.getDiscountAmout(); toDiscountAmout = activityPrompt.getDiscountAmout();
...@@ -349,10 +351,10 @@ public class FullSubtractionActivityServiceImpl { ...@@ -349,10 +351,10 @@ public class FullSubtractionActivityServiceImpl {
List<ActivityList.SendGoods> sends = new ArrayList(); List<ActivityList.SendGoods> sends = new ArrayList();
sends.add(send); sends.add(send);
satisfyList.setSends(sends); satisfyList.setSends(sends);
if (GiftTypeEnum.TYPE_1.equals(activityResponseDto.getActivitySubType())) { if (GiftTypeEnum.TYPE_1.getType().equals(activityResponseDto.getActivitySubType())) {
satisfyList.setTipType(8); satisfyList.setTipType(8);
} else { } else {
satisfyList.setTipType(9); satisfyList.setTipType(7);
} }
} }
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java
...@@ -291,7 +291,7 @@ public class FullSharingService { ...@@ -291,7 +291,7 @@ public class FullSharingService {
int len = dto.getSendGoodsList().size(); int len = dto.getSendGoodsList().size();
notInShopping.setSatisfy(WebUtil.formatAmount(dto.getThresholdAmount() * 1.00 / 100).toString()); notInShopping.setSatisfy(WebUtil.formatAmount(dto.getThresholdAmount() * 1.00 / 100).toString());
List<ActivityList.SendGoods> sends = new ArrayList(); List<ActivityList.SendGoods> sends = new ArrayList();
for (int i = len - 1; i >= 0; i--) { for (int i = 0; i < len; i++) {
ActivityList.SendGoods goods = new ActivityList.SendGoods(); ActivityList.SendGoods goods = new ActivityList.SendGoods();
goods.setQty(dto.getSendGoodsList().get(i).getSendNumber()); goods.setQty(dto.getSendGoodsList().get(i).getSendNumber());
goods.setGoodsName(dto.getSendGoodsList().get(i).getGoodsName()); goods.setGoodsName(dto.getSendGoodsList().get(i).getGoodsName());
...@@ -314,7 +314,7 @@ public class FullSharingService { ...@@ -314,7 +314,7 @@ public class FullSharingService {
ActivityList satisfyList = new ActivityList(); ActivityList satisfyList = new ActivityList();
CalculationSharingDiscountResponseDto.CalculationDiscountResult.ActivityPrompt activityPrompt = activityPrompts.get(0); CalculationSharingDiscountResponseDto.CalculationDiscountResult.ActivityPrompt activityPrompt = activityPrompts.get(0);
if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) { if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType()) || Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
if (activityPrompt.getAlreadyDiscountAmount() == null || activityPrompt.getAlreadyDiscountAmount() == 0) { if (activityPrompt.getAlreadyDiscountAmount() == null || activityPrompt.getAlreadyDiscountAmount() == 0) {
messageBuilder.append("满 <span style=\"color:#fa5555\">") messageBuilder.append("满 <span style=\"color:#fa5555\">")
.append(WebUtil.formatAmount(activityPrompt.getThresholdAmount() * 1.00 / 100)) .append(WebUtil.formatAmount(activityPrompt.getThresholdAmount() * 1.00 / 100))
...@@ -367,14 +367,14 @@ public class FullSharingService { ...@@ -367,14 +367,14 @@ public class FullSharingService {
satisfyList.setTipType(8); satisfyList.setTipType(8);
} }
else { else {
satisfyList.setTipType(9); satisfyList.setTipType(7);
} }
if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) { if (activityPrompt.getTotalAmount()>=activityPrompt.getThresholdAmount()) {
if (GiftTypeEnum.TYPE_1.getType().equals(activityResponseDto.getActivitySubType())) { if (GiftTypeEnum.TYPE_1.getType().equals(activityResponseDto.getActivitySubType())) {
satisfyList.setTipType(6); satisfyList.setTipType(10);
} }
else { else {
satisfyList.setTipType(6); satisfyList.setTipType(7);
} }
} }
} }
......
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