| @@ -349,4 +349,33 @@ public class WxCashBackActivityController extends BaseController { | |||||
| } | } | ||||
| return new ResultData(result); | 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); | |||||
| } | |||||
| } | } | ||||
| @@ -143,7 +143,7 @@ public class WxCashBackActivityController extends BaseController { | |||||
| TenantEntity tenantInfo = getTenantInfo(); | TenantEntity tenantInfo = getTenantInfo(); | ||||
| WxCashBackActivity a = wxCashBackActivityService.getActivityById(wxCashBackActivityRecord.getActivityId(), tenantInfo.getTenantId()); | WxCashBackActivity a = wxCashBackActivityService.getActivityById(wxCashBackActivityRecord.getActivityId(), tenantInfo.getTenantId()); | ||||
| if (null == a) { | if (null == a) { | ||||
| return new ResultData(); | |||||
| return new ResultData(Result.ERROR,"参数错误"); | |||||
| } | } | ||||
| WxCashBackActivityRecord r = new WxCashBackActivityRecord(); | WxCashBackActivityRecord r = new WxCashBackActivityRecord(); | ||||
| r.setActivityId(a.getId()); | r.setActivityId(a.getId()); | ||||
| @@ -23,6 +23,8 @@ public interface WxCashBackActivityRecordMapper extends CommonMapper<WxCashBackA | |||||
| BigDecimal sumMerchant(WxCashBackActivityRecord wxCashBackActivity); | BigDecimal sumMerchant(WxCashBackActivityRecord wxCashBackActivity); | ||||
| BigDecimal sumOrderMoney(WxCashBackActivityRecord wxCashBackActivity); | |||||
| List<Map> selectMerchantRecords(WxCashBackActivityRecord wxCashBackActivity); | List<Map> selectMerchantRecords(WxCashBackActivityRecord wxCashBackActivity); | ||||
| } | } | ||||
| @@ -34,6 +34,7 @@ public interface WxCashBackActivityService { | |||||
| int getRecordCount(WxCashBackActivityRecord record); | int getRecordCount(WxCashBackActivityRecord record); | ||||
| BigDecimal getRecordSum(WxCashBackActivityRecord record); | BigDecimal getRecordSum(WxCashBackActivityRecord record); | ||||
| BigDecimal getRecordMerchantSum(WxCashBackActivityRecord record); | BigDecimal getRecordMerchantSum(WxCashBackActivityRecord record); | ||||
| BigDecimal getRecordOrderMoneySum(WxCashBackActivityRecord record); | |||||
| List<Map> getMerchantRecords(WxCashBackActivityRecord record); | List<Map> getMerchantRecords(WxCashBackActivityRecord record); | ||||
| int getMerchantCount(WxCashBackActivity record); | int getMerchantCount(WxCashBackActivity record); | ||||
| @@ -244,6 +244,11 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService | |||||
| public BigDecimal getRecordMerchantSum(WxCashBackActivityRecord record) { | public BigDecimal getRecordMerchantSum(WxCashBackActivityRecord record) { | ||||
| return wxCashBackActivityRecordMapper.sumMerchant(record); | return wxCashBackActivityRecordMapper.sumMerchant(record); | ||||
| } | } | ||||
| @Override | |||||
| public BigDecimal getRecordOrderMoneySum(WxCashBackActivityRecord record) { | |||||
| return wxCashBackActivityRecordMapper.sumOrderMoney(record); | |||||
| } | |||||
| @Override | @Override | ||||
| public int getMerchantCount(WxCashBackActivity record) { | public int getMerchantCount(WxCashBackActivity record) { | ||||
| @@ -159,6 +159,11 @@ | |||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||
| <select id="sumOrderMoney" parameterType="com.iformall.domain.po.WxCashBackActivityRecord" resultType="BigDecimal"> | |||||
| select sum(order_money) from wx_cash_back_activity_record | |||||
| <include refid="dynamicWhereConditions" /> | |||||
| </select> | |||||
| <select id="selectMerchantRecords" parameterType="com.iformall.domain.po.WxCashBackActivityRecord" resultType="java.util.HashMap"> | <select id="selectMerchantRecords" parameterType="com.iformall.domain.po.WxCashBackActivityRecord" resultType="java.util.HashMap"> | ||||
| select merchant_id as merchantId,count(1) as orderCount,sum(order_money) as orderMoney, sum(cash_money) as allMoney,sum(merchant_cash_money) as merchantMenoy from wx_cash_back_activity_record | select merchant_id as merchantId,count(1) as orderCount,sum(order_money) as orderMoney, sum(cash_money) as allMoney,sum(merchant_cash_money) as merchantMenoy from wx_cash_back_activity_record | ||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||