|
@@ -31,7 +31,7 @@ public class EnquiryServiceImpl implements EnquiryService {
|
|
param = promotionFactory.goodsListPrice(param);
|
|
param = promotionFactory.goodsListPrice(param);
|
|
|
|
|
|
//是否使用优惠券
|
|
//是否使用优惠券
|
|
- if (Emptys.check(param.get("couponId"))) {
|
|
|
|
|
|
+ if (Emptys.check(param.get("memberCouponId"))) {
|
|
//查询优惠券
|
|
//查询优惠券
|
|
MercCouponFactory mercCouponFactory = FactoryUtils.getService(MercCouponFactory.class, "merc_coupon_base");
|
|
MercCouponFactory mercCouponFactory = FactoryUtils.getService(MercCouponFactory.class, "merc_coupon_base");
|
|
mercCouponFactory.goodsListPrice(param);
|
|
mercCouponFactory.goodsListPrice(param);
|
|
@@ -59,7 +59,7 @@ public class EnquiryServiceImpl implements EnquiryService {
|
|
result.put("orderOldAmount", orderOldAmount);
|
|
result.put("orderOldAmount", orderOldAmount);
|
|
//订单总价
|
|
//订单总价
|
|
result.put("orderAmount", orderAmount);
|
|
result.put("orderAmount", orderAmount);
|
|
- result.put("couponId", param.getString("couponId"));
|
|
|
|
|
|
+ result.put("memberCouponId", param.getString("memberCouponId"));
|
|
result.put("resultGoodsList", resultGoodsList);
|
|
result.put("resultGoodsList", resultGoodsList);
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|