Browse Source

[押金][修改][退还添加行为日志]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
f3a279d365
6 changed files with 40 additions and 6 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java
  5. +18
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  6. +18
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java View File

@@ -87,7 +87,7 @@ public class WxBillDepositController extends BaseController {
@SystemControllerLog(description = "租赁押金-退回押金")
public ResultData returnDeposit(@RequestBody WxBillDeposit wxBillDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillDepositController::returnDeposit");
return wxBillDepositService.returnDeposit(wxBillDeposit);
return wxBillDepositService.returnDeposit(wxBillDeposit, getUser());

}



+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java View File

@@ -86,7 +86,7 @@ public class WxBillPropertyDepositController extends BaseController {
@SystemControllerLog(description = "物业押金账单-退回押金")
public ResultData returnDeposit(@RequestBody WxBillPropertyDeposit wxBillPropertyDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::returnDeposit");
return wxBillPropertyDepositService.returnDeposit(wxBillPropertyDeposit);
return wxBillPropertyDepositService.returnDeposit(wxBillPropertyDeposit, getUser());

}



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java View File

@@ -47,7 +47,7 @@ public interface WxBillDepositService {
ResultData updatePaid(Long id);


ResultData returnDeposit(WxBillDeposit wxBillDeposit);
ResultData returnDeposit(WxBillDeposit wxBillDeposit, MallUserInfo user);

ResultData adjustDeposit(WxBillDeposit wxBillDeposit);
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java View File

@@ -50,7 +50,7 @@ public interface WxBillPropertyDepositService {
ResultData updatePaid(Long id);


ResultData returnDeposit(WxBillPropertyDeposit wxBillPropertyDeposit);
ResultData returnDeposit(WxBillPropertyDeposit wxBillPropertyDeposit, MallUserInfo user);

ResultData adjustDeposit(WxBillPropertyDeposit wxBillPropertyDeposit);



+ 18
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java View File

@@ -189,7 +189,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {

@Transactional(rollbackFor = {Exception.class})
@Override
public ResultData returnDeposit(WxBillDeposit record) {
public ResultData returnDeposit(WxBillDeposit record, MallUserInfo user) {
logger.info("租赁押金退还");
WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(record.getId());
if (wxBillDeposit == null) {
@@ -204,6 +204,23 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
logger.error("租赁押金退还失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
//日志
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(wxBillDeposit.getId());
String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage();
String price = new BigDecimal(record.getReturnPrice()).divide(new BigDecimal(100)).toPlainString();
wxBillAction.setDetails(message + price + "元");
wxBillAction.setAction(EnumBillAction.DEPOSIT_RETURN.getCode());
wxBillAction.setUserId(user.getId());
wxBillAction.setUserName(user.getName());
wxBillAction.setPhone(user.getPhone());
wxBillAction.setTenantId(wxBillDeposit.getTenantId());
try {
wxBillActionService.save(wxBillAction);
} catch (Exception e) {
logger.error("添加租赁押金账单行为日志,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
return new ResultData(Result.SUCCESS, "租赁押金退还成功", wxBillDeposit);
}



+ 18
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java View File

@@ -188,7 +188,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe
}

@Override
public ResultData returnDeposit(WxBillPropertyDeposit record) {
public ResultData returnDeposit(WxBillPropertyDeposit record, MallUserInfo user) {
logger.info("物业押金退还");
WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(record.getId());
if (wxBillDeposit == null) {
@@ -203,6 +203,23 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe
logger.error("物业押金退还失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
//日志
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(wxBillDeposit.getId());
String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage();
String price = new BigDecimal(record.getReturnPrice()).divide(new BigDecimal(100)).toPlainString();
wxBillAction.setDetails(message + price + "元");
wxBillAction.setAction(EnumBillAction.DEPOSIT_RETURN.getCode());
wxBillAction.setUserId(user.getId());
wxBillAction.setUserName(user.getName());
wxBillAction.setPhone(user.getPhone());
wxBillAction.setTenantId(wxBillDeposit.getTenantId());
try {
wxBillActionService.save(wxBillAction);
} catch (Exception e) {
logger.error("添加物业押金账单行为日志,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}
return new ResultData(Result.SUCCESS, "物业押金退还成功", wxBillDeposit);
}



Loading…
Cancel
Save