Quellcode durchsuchen

[其他押金账单][修改][添加退回押金日志]

release_toaliyun_real
gongbiao vor 7 Jahren
Ursprung
Commit
6734fa8db8
3 geänderte Dateien mit 24 neuen und 5 gelöschten Zeilen
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java
  3. +22
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java Datei anzeigen

@@ -91,7 +91,7 @@ public class WxBillOtherDepositController extends BaseController {
@SystemControllerLog(description = "其它账单-退回押金") @SystemControllerLog(description = "其它账单-退回押金")
public ResultData returnDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) { public ResultData returnDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::returnDeposit"); logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::returnDeposit");
return wxBillOtherDepositService.returnDeposit(wxBillDeposit);
return wxBillOtherDepositService.returnDeposit(wxBillDeposit, getUser());


} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java Datei anzeigen

@@ -50,7 +50,7 @@ public interface WxBillOtherDepositService {


ResultData updatePaid(Long id); ResultData updatePaid(Long id);


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


ResultData adjustDeposit(WxBillOtherDeposit wxBillDeposit); ResultData adjustDeposit(WxBillOtherDeposit wxBillDeposit);
} }

+ 22
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java Datei anzeigen

@@ -210,7 +210,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService
} }


@Override @Override
public ResultData returnDeposit(WxBillOtherDeposit record) {
public ResultData returnDeposit(WxBillOtherDeposit record, MallUserInfo user) {
logger.info("其他押金退还"); logger.info("其他押金退还");
WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId());
if (wxBillDeposit == null) { if (wxBillDeposit == null) {
@@ -222,10 +222,29 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService
try { try {
wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillDeposit);
} catch (Exception e) { } catch (Exception e) {
logger.error("租赁押金退还失败,e:" + e.getMessage());
logger.error("押金退还失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
} }
return new ResultData(Result.SUCCESS, "租赁押金退还成功", wxBillDeposit);

//日志
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);
} }


@Override @Override


Laden…
Abbrechen
Speichern