Преглед на файлове

Merge branch 'test' of jishutao/kede-server into prod

anderx преди 1 година
родител
ревизия
6932dbf911
променени са 1 файла, в които са добавени 4 реда и са изтрити 1 реда
  1. 4 1
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

+ 4 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1940,7 +1940,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					yearSum=tTaskMember.getYearSum();
 				}
 			}
-			BigDecimal divide = tOrderNew.getTotalAmount().divide(BigDecimal.valueOf(yearSum),  BigDecimal.ROUND_HALF_UP);
+			BigDecimal divide =BigDecimal.ZERO;
+			if (tOrderNew.getTotalAmount().compareTo(BigDecimal.valueOf(0))>0){
+				divide=tOrderNew.getTotalAmount().divide(BigDecimal.valueOf(yearSum),  BigDecimal.ROUND_HALF_UP);
+			}
 			if (divide.compareTo(BigDecimal.valueOf(1))<0){
 				amountName="此会员订单,本年度金额低于1万";
 				amountType="原则上技术人员不可下户";