ufo / yohoufo-fore · Commits

Go to a project

Authored by wujiexiang
Commit 739c0791dd8ad5f35a874329385ceb2cc6f0c0e5 2 parents d736c817 18c4c796

Merge branch 'dev-coupon-recommend' into test6.9.6

Inline Side-by-side
Showing 2 changed files with 10 additions and 9 deletions
... ... @@ -22,7 +22,6 @@ import com.yohoufo.dal.order.model.SellerOrderGoods;
import com.yohobuy.ufo.model.order.constants.OrderConstant;
import com.yohoufo.order.charge.ChargeContext;
import com.yohoufo.order.charge.ChargeService;
import com.yohoufo.order.charge.coupon.CouponService;
import com.yohoufo.order.charge.model.*;
import com.yohoufo.order.constants.ActivityTypeEnum;
import com.yohoufo.order.event.BuyerCancelEvent;
... ... @@ -113,9 +112,6 @@ public class ShoppingServiceImpl implements IShoppingService {
private SellerOrderMapper sellerOrderMapper;
@Autowired
private CouponService couponService;
@Autowired
private ShoppingRiskWatchDog shoppingRiskWatchDog;
@Autowired
... ... @@ -515,10 +511,15 @@ public class ShoppingServiceImpl implements IShoppingService {
amountDetailBo.setActivityCutAmount(chargeResult.getActivityCutResult().getActivityCutAmount());
Optional<CouponPayResult> tempPayResult;
//活动券减免金额
amountDetailBo.setCouponCutAmount((tempPayResult = chargeResult.getCouponPayResultList().getCouponPayResultByCouponType(CouponTypeEnum.ACTIVITY_COUPON.getCode())).isPresent() ? tempPayResult.get().getCouponAmount() : 0.00);
//运费券减免金额
amountDetailBo.setShippingCouponCutAmount((tempPayResult = chargeResult.getCouponPayResultList().getCouponPayResultByCouponType(CouponTypeEnum.SHIPPING_COUPON.getCode())).isPresent() ? tempPayResult.get().getCouponAmount() : 0.00);
if ((tempPayResult = chargeResult.getCouponPayResultList().getCouponPayResultByCouponType(CouponTypeEnum.ACTIVITY_COUPON.getCode())).isPresent()) {
//活动券减免金额
amountDetailBo.setCouponCutAmount(tempPayResult.get().getCouponAmount());
}
if ((tempPayResult = chargeResult.getCouponPayResultList().getCouponPayResultByCouponType(CouponTypeEnum.SHIPPING_COUPON.getCode())).isPresent()) {
//运费券减免金额
amountDetailBo.setShippingCouponCutAmount(tempPayResult.get().getCouponAmount());
}
return amountDetailBo;
}
... ...
... ... @@ -134,7 +134,7 @@ public class ShoppingSupport {
List<CouponPayResult> couponPayResults = chargeResult.getCouponPayResultList().getCouponPayResults();
couponPayResults.forEach(couponPayResult -> {
PromotionFormula couponFormula = new PromotionFormula();
couponFormula.setPromotion(CouponTypeEnum.of(couponPayResult.getCouponType()).get().getName());
couponFormula.setPromotion(CouponTypeEnum.of(couponPayResult.getCouponType()).get().getDesc());
couponFormula.setPromotionAmount(OrderConstant.SUB_SIGN + MathUtils.formatCurrencyStr(couponPayResult.getCouponAmount()));
formulas.add(couponFormula);
... ...