From 616b119c283147deef21fbc519291221ba4897b1 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@MS-20170306HGUF> Date: 星期二, 18 二月 2020 11:30:03 +0800 Subject: [PATCH] Merge branch 'div' of ssh://yujian@193.112.35.168:29418/fanli-server.git into div --- fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java index 2434fd1..88b1c6d 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java @@ -7,11 +7,11 @@ import org.springframework.stereotype.Component; +import com.yeshi.fanli.dto.HongBao; import com.yeshi.fanli.dto.HongBaoDTO; -import com.yeshi.fanli.entity.bus.user.HongBao; import com.yeshi.fanli.entity.bus.user.Order; import com.yeshi.fanli.entity.bus.user.UserInfo; -import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; +import com.yeshi.fanli.service.inter.order.config.HongBaoManageService; import com.yeshi.fanli.util.Constant; @Component @@ -92,7 +92,7 @@ hongBao.setId(hongBaoDTO.getId()); hongBao.setOrderId(hongBaoDTO.getOrderId()); - if (hongBaoDTO.getSettlement() != null) + if (hongBaoDTO.getSettlement() != null&&hongBaoDTO.getSettlement().compareTo(new BigDecimal(0))>0) hongBao.setPayMoney(hongBaoDTO.getSettlement()); else hongBao.setPayMoney(hongBaoDTO.getPayMoney()); -- Gitblit v1.8.0