|
|
|
@@ -237,7 +237,7 @@ public class WxCashBackActivityController extends BaseController { |
|
|
|
return new ResultData(activity); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("新增修改接口") |
|
|
|
@ApiOperation("审核") |
|
|
|
@PostMapping("recordAudit") |
|
|
|
public ResultData recordAudit(@RequestBody WxCashBackActivityRecord wxCashBackActivityRecord) { |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
@@ -246,16 +246,16 @@ public class WxCashBackActivityController extends BaseController { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("新增修改接口") |
|
|
|
@ApiOperation("计算金额") |
|
|
|
@PostMapping("calRecordMoney") |
|
|
|
public ResultData calRecordMoney(@RequestBody WxCashBackActivityRecord wxCashBackActivityRecord) { |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
wxCashBackActivityRecord.updateTenantInfo(tenantEntity); |
|
|
|
wxCashBackActivityService.auditRecord(wxCashBackActivityRecord); |
|
|
|
wxCashBackActivityService.calcuteMoney(wxCashBackActivityRecord); |
|
|
|
return new ResultData(wxCashBackActivityRecord); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("查询当前提现信息") |
|
|
|
@ApiOperation("当前统计") |
|
|
|
@GetMapping("total") |
|
|
|
public ResultData total() { |
|
|
|
TenantEntity tenantInfo = getTenantInfo(); |
|
|
|
@@ -277,7 +277,7 @@ public class WxCashBackActivityController extends BaseController { |
|
|
|
return new ResultData(retMap); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("查询当前提现信息") |
|
|
|
@ApiOperation("商户统计") |
|
|
|
@GetMapping("activityMerchantTotal") |
|
|
|
public ResultData activityMerchantTotal(@ModelAttribute WxCashBackActivityRecord wxCashBackActivityRecord) { |
|
|
|
if (null == wxCashBackActivityRecord.getActivityId()) { |
|
|
|
|