|
|
|
@@ -349,4 +349,33 @@ public class WxCashBackActivityController extends BaseController { |
|
|
|
} |
|
|
|
return new ResultData(result); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("查询当前提现信息") |
|
|
|
@GetMapping("merchantActivityRecordCount") |
|
|
|
public ResultData recordCount(@ModelAttribute WxCashBackActivityRecord wxCashBackActivityRecord) { |
|
|
|
if (null == wxCashBackActivityRecord.getMerchantId() || null == wxCashBackActivityRecord.getActivityId()) { |
|
|
|
return new ResultData(Result.ERROR,"参数错误"); |
|
|
|
} |
|
|
|
|
|
|
|
TenantEntity tenantInfo = getTenantInfo(); |
|
|
|
WxCashBackActivity a = wxCashBackActivityService.getActivityById(wxCashBackActivityRecord.getActivityId(), tenantInfo.getTenantId()); |
|
|
|
if (null == a) { |
|
|
|
return new ResultData(Result.ERROR,"参数错误"); |
|
|
|
} |
|
|
|
WxCashBackActivityRecord r = new WxCashBackActivityRecord(); |
|
|
|
r.setActivityId(a.getId()); |
|
|
|
r.updateTenantInfo(a); |
|
|
|
r.setMerchantId(wxCashBackActivityRecord.getMerchantId()); |
|
|
|
int allRecordCount = wxCashBackActivityService.getRecordCount(r); |
|
|
|
BigDecimal orderMoneySum = wxCashBackActivityService.getRecordOrderMoneySum(r); |
|
|
|
BigDecimal recordSum = wxCashBackActivityService.getRecordSum(r); |
|
|
|
BigDecimal merchantRecordSum = wxCashBackActivityService.getRecordMerchantSum(r); |
|
|
|
|
|
|
|
Map retMap = new HashMap(); |
|
|
|
retMap.put("allRecordCount", allRecordCount); |
|
|
|
retMap.put("orderMoneySum", orderMoneySum); |
|
|
|
retMap.put("recordSum", recordSum); |
|
|
|
retMap.put("merchantRecordSum", merchantRecordSum); |
|
|
|
return new ResultData(retMap); |
|
|
|
} |
|
|
|
} |