|
@@ -21,6 +21,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.validation.Valid;
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.Arrays;
|
|
|
|
|
|
/**
|
|
@@ -75,6 +76,10 @@ public class SeparateAccountsController extends JeecgController<SeparateAccounts
|
|
|
if (separateAccountsOld!=null){
|
|
|
return Result.error("添加失败,该商铺分账已存在");
|
|
|
}
|
|
|
+ BigDecimal sum = separateAccounts.getPtSeparateAccounts().add(separateAccounts.getShSeparateAccounts());
|
|
|
+ if (!(sum.compareTo(new BigDecimal("30")) <= 0)){
|
|
|
+ return Result.error("添加失败,平台与商户的分账比例不可以大于30");
|
|
|
+ }
|
|
|
separateAccountsService.save(separateAccounts);
|
|
|
return Result.OK("添加成功!");
|
|
|
}
|