diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java index 43cc3c61c..a7c723075 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -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); + } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java index bb663ea5b..30e0f704e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java @@ -143,7 +143,7 @@ public class WxCashBackActivityController extends BaseController { TenantEntity tenantInfo = getTenantInfo(); WxCashBackActivity a = wxCashBackActivityService.getActivityById(wxCashBackActivityRecord.getActivityId(), tenantInfo.getTenantId()); if (null == a) { - return new ResultData(); + return new ResultData(Result.ERROR,"参数错误"); } WxCashBackActivityRecord r = new WxCashBackActivityRecord(); r.setActivityId(a.getId()); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityRecordMapper.java index f2f59c134..af250fe09 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityRecordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCashBackActivityRecordMapper.java @@ -23,6 +23,8 @@ public interface WxCashBackActivityRecordMapper extends CommonMapper selectMerchantRecords(WxCashBackActivityRecord wxCashBackActivity); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java index ee0ce7e9b..e009f4417 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCashBackActivityService.java @@ -34,6 +34,7 @@ public interface WxCashBackActivityService { int getRecordCount(WxCashBackActivityRecord record); BigDecimal getRecordSum(WxCashBackActivityRecord record); BigDecimal getRecordMerchantSum(WxCashBackActivityRecord record); + BigDecimal getRecordOrderMoneySum(WxCashBackActivityRecord record); List getMerchantRecords(WxCashBackActivityRecord record); int getMerchantCount(WxCashBackActivity record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java index 9d1486a75..926df57ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java @@ -244,6 +244,11 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService public BigDecimal getRecordMerchantSum(WxCashBackActivityRecord record) { return wxCashBackActivityRecordMapper.sumMerchant(record); } + + @Override + public BigDecimal getRecordOrderMoneySum(WxCashBackActivityRecord record) { + return wxCashBackActivityRecordMapper.sumOrderMoney(record); + } @Override public int getMerchantCount(WxCashBackActivity record) { diff --git a/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml index 4a063d87a..d80cc1d47 100644 --- a/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml @@ -159,6 +159,11 @@ + +