Quellcode durchsuchen

[解单][修改][完善istoday]

release_toaliyun_real
luozukai vor 7 Jahren
Ursprung
Commit
e5ecf8d903
4 geänderte Dateien mit 24 neuen und 6 gelöschten Zeilen
  1. +7
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  2. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java
  3. +12
    -5
      mallinkService/src/main/java/com/iformall/service/WxBillRentService.java
  4. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java

+ 7
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java Datei anzeigen

@@ -58,6 +58,13 @@ public class WxBillRentController extends BaseController {
return wxBillRentService.saveOrUpdate(wxBillRent, getUser()); return wxBillRentService.saveOrUpdate(wxBillRent, getUser());
} }


@PostMapping("updateReceiveDatePatch")
@SystemControllerLog(description = "租赁押金账单-更新")
public ResultData updateReceiveDatePatch(@RequestBody WxBillRent wxBillRent) {
logger.debug("[" + getIpAddr() + "] WxBillRentController::updateReceiveDatePatch");
return wxBillRentService.saveOrUpdate(wxBillRent, getUser());
}

@GetMapping("/del") @GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "租赁押金账单-删除") @SystemControllerLog(description = "租赁押金账单-删除")


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java Datei anzeigen

@@ -142,7 +142,7 @@ public class WxMerchantTradeDailyController extends BaseController {
List<WxMerchantTradeDaily> resultList = pageInfo.getList(); List<WxMerchantTradeDaily> resultList = pageInfo.getList();
// 判断第1条是否是当天 // 判断第1条是否是当天
if(CollectionUtils.isNotEmpty(resultList)){ if(CollectionUtils.isNotEmpty(resultList)){
if(sd.parse(resultList.get(0).getReportDate()).equals(sd.format(new Date()))){
if(resultList.get(0).getReportDate().equals(sd.format(new Date()))){
resultList.get(0).setIsToday(1); resultList.get(0).setIsToday(1);
} }
} }


+ 12
- 5
mallinkService/src/main/java/com/iformall/service/WxBillRentService.java Datei anzeigen

@@ -31,13 +31,20 @@ public interface WxBillRentService {
*/ */
Map<String, Object> getById(Long id); Map<String, Object> getById(Long id);
/**
/**
* 保存或更新实体 * 保存或更新实体
* *
* @param record
* @param user
*/
ResultData saveOrUpdate(WxBillRent record, MallUserInfo user);
* @param record
* @param user
*/
ResultData saveOrUpdate(WxBillRent record, MallUserInfo user);

/**
* 批量修改到账日期
* @param record
* @return
*/
ResultData updateReceiveDatePatch(WxBillRent record);


/** /**
* 根据Id删除实体 * 根据Id删除实体


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Datei anzeigen

@@ -272,4 +272,8 @@ public class WxBillRentServiceImpl implements WxBillRentService {
return new ResultData(Result.SUCCESS, "滞纳金结单成功", record); return new ResultData(Result.SUCCESS, "滞纳金结单成功", record);
} }


@Override
public ResultData updateReceiveDatePatch(WxBillRent record) {
return null;
}
} }

Laden…
Abbrechen
Speichern