Este sitio web funciona mejor con JavaScript.
Inicio
Explorar
Ayuda
Iniciar sesión
server
/
formallProject
Seguir
1
Destacar
0
Fork
0
Código
Incidencias
0
Pull Requests
0
Lanzamientos
0
Wiki
Actividad
Explorar el Código
[账单][修改][实收金额不能大于实际应收金额]
release_toaliyun_real
gongbiao
hace 7 años
padre
edf28b8659
commit
b7eddc5c66
Se han
modificado 8 ficheros
con
39 adiciones
y
2 borrados
Dividir vista
Opciones de diferencias
Mostrar estadísticas
Descargar archivo de parche
Descargar archivo de diferencias
+3
-0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java
+6
-0
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
+5
-1
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
+5
-0
mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
+5
-1
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
+5
-0
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
+5
-0
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
+5
-0
mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java
+ 3
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java
Ver fichero
@@ -283,6 +283,9 @@ public enum ErrorCode{
* */
BILL_ROUTINE_IS_NOT_FOUND(21000,"账单不存在"),
BILL_UPDATE_FAILED(21001,"账单更新失败"),
BILL_OWE_ZERO(21002,"账单欠缴为0"),
BILL_PAY_ERROR(21003,"账单支付错误"),
/**
* 商铺
* */
+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
Ver fichero
@@ -111,6 +111,12 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
@Override
public ResultData saveOrUpdate(WxBillDaily record) {
int receivepay = record.getReceivePay().intValue();
int pay = record.getPay().intValue();
if(pay>receivepay){
return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(),"实收金额不能大于实际应收金额");
}
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession");
if (record.getId() == null) {
logger.info("新增日常账单");
+ 5
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
Ver fichero
@@ -93,7 +93,11 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
@Override
public ResultData saveOrUpdate(WxBillDeposit record) {
int receivepay = record.getReceivePay().intValue();
int pay = record.getPay().intValue();
if(pay>receivepay){
return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额");
}
if (record.getId() == null) {
logger.info("新增租赁押金账单");
final IdWorker idWorker = IdWorker.get();
+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
Ver fichero
@@ -111,6 +111,11 @@ public class WxBillOtherServiceImpl implements WxBillOtherService {
@Override
public ResultData saveOrUpdate(WxBillOther record) {
int receivepay = record.getReceivePay().intValue();
int pay = record.getPay().intValue();
if(pay>receivepay){
return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额");
}
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession");
if (record.getId() == null) {
logger.info("新增其他账单");
+ 5
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
Ver fichero
@@ -94,7 +94,11 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe
@Override
public ResultData saveOrUpdate(WxBillPropertyDeposit record) {
int receivepay = record.getReceivePay().intValue();
int pay = record.getPay().intValue();
if(pay>receivepay){
return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额");
}
if (record.getId() == null) {
logger.info("新增物业押金账单");
final IdWorker idWorker = IdWorker.get();
+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
Ver fichero
@@ -92,6 +92,11 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
@Override
public ResultData saveOrUpdate(WxBillProperty record) {
int receivepay = record.getReceivePay().intValue();
int pay = record.getPay().intValue();
if(pay>receivepay){
return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额");
}
if (record.getId() == null) {
logger.info("新增物业账单");
final IdWorker idWorker = IdWorker.get();
+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
Ver fichero
@@ -93,6 +93,11 @@ public class WxBillRentServiceImpl implements WxBillRentService {
@Override
public ResultData saveOrUpdate(WxBillRent record) {
int receivepay = record.getReceivePay().intValue();
int pay = record.getPay().intValue();
if(pay>receivepay){
return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额");
}
if (record.getId() == null) {
logger.info("新增租赁账单");
final IdWorker idWorker = IdWorker.get();
+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java
Ver fichero
@@ -97,6 +97,11 @@ public class WxPayBillServiceImpl implements WxPayBillService {
}
//获取账单数据
Map<String, Object> bill = bills.get(0);
Integer owe = (Integer)bill.get("owe");
if(owe.intValue()<=0){
logger.info("账单欠缴为0");
return new ResultData(ErrorCode.BILL_OWE_ZERO);
}
//获取支付账户信息
WxPayAccountBill payAccount = wxPayAccountBillMapper.selectByPrimaryKey(appInfo.getPayBillId());
Date currentDate = new Date();
Escribir
Vista previa
Cargando…
Cancelar
Guardar