Commit 328e4148 by 周晓航

修改 bug

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent dff7e16c
...@@ -405,8 +405,8 @@ public class ActivityAdapter { ...@@ -405,8 +405,8 @@ public class ActivityAdapter {
couponAvailableCartInfo.setRealAmount(0L); couponAvailableCartInfo.setRealAmount(0L);
couponAvailableCartInfo.setDiscountAmount(0L); couponAvailableCartInfo.setDiscountAmount(0L);
} }
couponAvailableCartInfo.setDeliveryAmount(discountResult.getDeliveryAmount()); couponAvailableCartInfo.setDeliveryAmount(discountResult!=null?discountResult.getDeliveryAmount():0);
couponAvailableCartInfo.setDistributionFee(discountResult.getDistributionFee()); couponAvailableCartInfo.setDistributionFee(discountResult!=null?discountResult.getDistributionFee():0);
return couponAvailableCartInfo; return couponAvailableCartInfo;
} }
public CouponAvailableCartInfo convert2CouponAvailableCartInfo(String partnerId,String storeId,ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult, List<String> orgCodes) { public CouponAvailableCartInfo convert2CouponAvailableCartInfo(String partnerId,String storeId,ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult, List<String> orgCodes) {
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
*/ */
package cn.freemud.service.thirdparty; package cn.freemud.service.thirdparty;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.coupon.CouponAvailableRespDto; import cn.freemud.entities.dto.coupon.CouponAvailableRespDto;
import cn.freemud.entities.vo.coupon.CouponAvailableReqVo; import cn.freemud.entities.vo.coupon.CouponAvailableReqVo;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
......
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