|
|
@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import shop.alien.entity.result.R;
|
|
|
+import shop.alien.entity.store.StoreCashOutRecord;
|
|
|
import shop.alien.storeplatform.service.IncomeManageService;
|
|
|
import shop.alien.storeplatform.util.LoginUserUtil;
|
|
|
|
|
|
@@ -126,9 +127,26 @@ public class IncomeManageController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @ApiOperation("团购收益查询")
|
|
|
+ @ApiOperation("提现记录详情查询")
|
|
|
@ApiOperationSupport(order = 5)
|
|
|
@ApiImplicitParams({
|
|
|
+ @ApiImplicitParam(name = "id", value = "提现记录ID", dataType = "Integer", paramType = "query", required = true)
|
|
|
+ })
|
|
|
+ @GetMapping("/getCashOutRecordDetail")
|
|
|
+ public R<StoreCashOutRecord> getCashOutRecordDetail(@RequestParam("id") Integer id) {
|
|
|
+ log.info("IncomeManageController.getCashOutRecordDetail?id={}", id);
|
|
|
+ try {
|
|
|
+ StoreCashOutRecord result = incomeManageService.getCashOutRecordDetail(id);
|
|
|
+ return R.data(result);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("IncomeManageController.getCashOutRecordDetail ERROR: {}", e.getMessage(), e);
|
|
|
+ return R.fail("查询失败:" + e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @ApiOperation("团购收益查询")
|
|
|
+ @ApiOperationSupport(order = 6)
|
|
|
+ @ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "date", value = "日期(格式:yyyy-MM-dd)", dataType = "String", paramType = "query", required = true),
|
|
|
@ApiImplicitParam(name = "incomeType", value = "收入类型, 0:主页, 1:优惠券, 2:代金券, 3:套餐, 4:联名卡", dataType = "Integer", paramType = "query"),
|
|
|
@ApiImplicitParam(name = "page", value = "页码", dataType = "Integer", paramType = "query"),
|
|
|
@@ -153,7 +171,7 @@ public class IncomeManageController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation("快速提现申请(免审核)")
|
|
|
- @ApiOperationSupport(order = 6)
|
|
|
+ @ApiOperationSupport(order = 7)
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "payPassword", value = "支付密码", dataType = "String", paramType = "query", required = true),
|
|
|
@ApiImplicitParam(name = "withdrawalMoney", value = "提现金额(单位:分)", dataType = "Integer", paramType = "query", required = true)
|
|
|
@@ -174,7 +192,7 @@ public class IncomeManageController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation("已入账/未入账详情查询")
|
|
|
- @ApiOperationSupport(order = 7)
|
|
|
+ @ApiOperationSupport(order = 8)
|
|
|
@ApiImplicitParams({
|
|
|
@ApiImplicitParam(name = "incomeType", value = "收入类型, 0:主页, 1:优惠券, 2:代金券, 3:套餐, 4:联名卡", dataType = "Integer", paramType = "query"),
|
|
|
@ApiImplicitParam(name = "paymentType", value = "账期类型, 0:未入账, 1:已入账", dataType = "Integer", paramType = "query", required = true),
|
|
|
@@ -205,7 +223,7 @@ public class IncomeManageController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation("收入汇总统计")
|
|
|
- @ApiOperationSupport(order = 8)
|
|
|
+ @ApiOperationSupport(order = 9)
|
|
|
@GetMapping("/getIncomeSummary")
|
|
|
public R<Map<String, Object>> getIncomeSummary() {
|
|
|
log.info("IncomeManageController.getIncomeSummary - 查询收入汇总统计");
|