diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/CityPartnerPrizeService.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/CityPartnerPrizeService.java index b52486f5c..aae861815 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/CityPartnerPrizeService.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/CityPartnerPrizeService.java @@ -29,6 +29,8 @@ public interface CityPartnerPrizeService { List getReferrerPrizeInfoList(String monthStr); + void generateAgent(String month,int orgId); + List listAgentAvailableMonths(String year); JSONObject getAgentPrizeInfo(String monthStr); diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java index aeaf8fb2c..8a8190ba2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java @@ -1,41 +1,5 @@ package au.com.royalpay.payment.manage.citypartner.core.impls; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.swing.plaf.basic.BasicScrollPaneUI; - -import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper; -import au.com.royalpay.payment.tools.CommonConsts; -import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.RandomStringUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateFormatUtils; -import org.apache.commons.lang3.time.DateUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.alibaba.fastjson.JSONObject; - import au.com.royalpay.payment.manage.citypartner.beans.AgentCommissionAnalysis; import au.com.royalpay.payment.manage.citypartner.beans.CityPartnerCommissionAnalysis; import au.com.royalpay.payment.manage.citypartner.beans.ReferrerCommissionAnalysis; @@ -105,9 +69,6 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { private FinancialSeniorPartnerCommissionMapper financialSeniorPartnerCommissionMapper; @Resource private FinancialSeniorPartnerCommissionDetailMapper financialSeniorPartnerCommissionDetailMapper; - @Resource - private MerchantInfoProvider merchantInfoProvider; - @Override public List listAvailableMonths(String year) { @@ -153,10 +114,6 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { for (JSONObject prize : partnerPrizes) { plusKey(sum, prize, "gross_amount"); plusKey(sum, prize, "total_charge"); - //暂只处理合伙人提成总额 - if (prize.get("parent_org_id") == null) { - prize.put("org_charge", prize.getBigDecimal("org_charge").add(prize.getBigDecimal("share_charge"))); - } plusKey(sum, prize, "royalpay_charge"); plusKey(sum, prize, "org_charge"); prize.put("monthstr", monthStr); @@ -274,7 +231,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { sumResult.put("net_charge", netCharge); sumResult.put("client_moniker", clientMoniker); sumResult.put("channel_detail", entry.getValue()); - sumResult.put("type",type); + sumResult.put("type", type); partnerClientInfos.add(sumResult); } result.put("partner_client_infos", partnerClientInfos); @@ -298,9 +255,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { return result; } - + @Override @Transactional - public void generateold(String monthStr) { + public void generate(String monthStr) { Date mon = checkMonth(monthStr); Calendar monthCal = Calendar.getInstance(); monthCal.setTime(mon); @@ -311,7 +268,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { BigDecimal alipayChargeRate = new BigDecimal("0.6"); BigDecimal wechatChargeRate = new BigDecimal("0.6"); BigDecimal jdChargeRate = new BigDecimal("0.9"); - BigDecimal alipayonlineChargeRate = new BigDecimal("0.6"); + BigDecimal alipayonlineChargeRate = new BigDecimal("2.0"); if (sysConfig.getBigDecimal("Alipay_charge_rate") != null) { alipayChargeRate = sysConfig.getBigDecimal("Alipay_charge_rate"); } @@ -372,7 +329,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { } Runnable task = () -> { orgIds.forEach((p) -> { - generateAgentold(monthStr, p); + generateAgent(monthStr, p); }); generateReferrer(monthStr); generateSenior(monthStr); @@ -380,285 +337,6 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { new Thread(task).start(); } - @Override - @Transactional - public void generate(String monthStr) { - Date mon = checkMonth(monthStr); - Calendar monthCal = Calendar.getInstance(); - monthCal.setTime(mon); - int year = monthCal.get(Calendar.YEAR); - int month = monthCal.get(Calendar.MONTH) + 1; - - financialPartnerCommissionDetailMapper.clearData(year, month, 1); - financialPartnerCommissionMapper.clearData(year, month, 1); - - JSONObject sysConfig = sysConfigManager.getSysConfig(); - BigDecimal alipayChargeRate = new BigDecimal("0.6"); - BigDecimal wechatChargeRate = new BigDecimal("0.6"); - BigDecimal jdChargeRate = new BigDecimal("0.9"); - BigDecimal alipayonlineChargeRate = new BigDecimal("0.6"); - if (sysConfig.getBigDecimal("Alipay_charge_rate") != null) { - alipayChargeRate = sysConfig.getBigDecimal("Alipay_charge_rate"); - } - if (sysConfig.getBigDecimal("Wechat_charge_rate") != null) { - wechatChargeRate = sysConfig.getBigDecimal("Wechat_charge_rate"); - } - if (sysConfig.getBigDecimal("jd_charge_rate") != null) { - jdChargeRate = sysConfig.getBigDecimal("jd_charge_rate"); - } - if (sysConfig.getBigDecimal("alipayonline_charge_rate") != null) { - alipayonlineChargeRate = sysConfig.getBigDecimal("alipayonline_charge_rate"); - } - JSONObject channelCharge = new JSONObject(); - channelCharge.put("alipayChargeRate", alipayChargeRate); - channelCharge.put("wechatChargeRate", wechatChargeRate); - channelCharge.put("jdChargeRate", jdChargeRate); - channelCharge.put("alipayonlineChargeRate", alipayonlineChargeRate); - - List transactionDetail = transactionMapper.listTransactionForCityPartnerCommissionByDate(year, month); - Map> groupByOrgMap = transactionDetail.stream().collect(Collectors.groupingBy(e -> e.getInteger("org_id"))); - for (Map.Entry> oneOrg : groupByOrgMap.entrySet()) { - - int orgId = oneOrg.getKey(); - JSONObject org = orgMapper.findOne(orgId); - if (org == null) { - // shall never happen - throw new ServerErrorException("Organization Id not exists:" + orgId); - } - if (org.getInteger("commission_type")!=1) { - generateold(monthStr); - return; - } - - - List items = oneOrg.getValue(); - Map> groupByChannelMap = items.stream().collect(Collectors.groupingBy(e -> e.getString("channel"))); - List channelAmount = orgChannelAmount(org,groupByChannelMap, channelCharge); - for (JSONObject channel : channelAmount) { - channel.put("share_charge", 0); - channel.put("month", month); - channel.put("year", year); - channel.put("org_id", orgId); - - financialPartnerCommissionMapper.save(channel); - } - } - Map> groupByClientMap = transactionDetail.stream().collect(Collectors.groupingBy(e -> e.getInteger("client_id"))); - for (Map.Entry> oneClient : groupByClientMap.entrySet()) { - - JSONObject org = orgMapper.findOne(oneClient.getValue().get(0).getInteger("org_id")); - Map> groupByChannel = oneClient.getValue().stream().collect(Collectors.groupingBy(e -> e.getString("channel"))); - - List clientChannelAmount = clientChannelAmount(oneClient.getKey(),org, groupByChannel, channelCharge,year,month,1); - for (JSONObject channel : clientChannelAmount) { - financialPartnerCommissionDetailMapper.save(channel); - } - - } - - Runnable task = () -> { - generateAgent(monthStr, channelCharge); - generateReferrer(monthStr); - generateSenior(monthStr); - }; - new Thread(task).start(); - - - } - - public List orgChannelAmount(JSONObject orgInfo,Map> channelMap,JSONObject channelCharge) { - List amountByChannel = new ArrayList<>(); - - for (Map.Entry> oneChannel : channelMap.entrySet()) { - BigDecimal total = BigDecimal.ZERO; - BigDecimal total_surage = BigDecimal.ZERO; - BigDecimal net_surage = BigDecimal.ZERO; - BigDecimal royalpay_surage = BigDecimal.ZERO; - JSONObject json = new JSONObject(); - String channel = oneChannel.getKey(); - if (orgInfo.get(channel.toLowerCase() + "_rate_value")==null) { - throw new ServerErrorException(orgInfo.get("org_id") + "组织未设置"+ channel + "渠道成本手续费"); - } - - for (JSONObject params : oneChannel.getValue()) { - //增加货币判断 - int i = currencyScale(params.getString("clearing_currency")); - - total = total.add(params.getBigDecimal("clearing_amount")); - total_surage = total_surage.add(params.getBigDecimal("total_surcharge")).setScale(i, RoundingMode.HALF_UP); - royalpay_surage = royalpay_surage.add(params.getBigDecimal("clearing_amount").multiply(orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP)); - // net_surage = net_surage.add(getThirdPartyCharge(params.getString("channel"), params.getBigDecimal("clearing_amount"), channelCharge)); - net_surage = net_surage.add(params.getBigDecimal("channel_surcharge")); - } - BigDecimal org_charge = total_surage.subtract(royalpay_surage); - json.put("channel",channel); - json.put("gross_amount",total); - json.put("total_charge",total_surage); - json.put("net_charge",net_surage); - json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value")); - json.put("royalpay_charge", royalpay_surage); - json.put("org_charge", org_charge); - json.put("commission_type", "1"); - json.put("create_time", new Date()); - amountByChannel.add(json); - } - - return amountByChannel; - } - - public List parentOrgChannelAmount(JSONObject orgInfo,JSONObject parentOrgInfo,Map> channelMap,JSONObject channelCharge) { - List amountByChannel = new ArrayList<>(); - - for (Map.Entry> oneChannel : channelMap.entrySet()) { - BigDecimal total = BigDecimal.ZERO; - BigDecimal total_surage = BigDecimal.ZERO; - BigDecimal net_surage = BigDecimal.ZERO; - BigDecimal royalpay_surage = BigDecimal.ZERO; - BigDecimal share_surage = BigDecimal.ZERO; - JSONObject json = new JSONObject(); - String channel = oneChannel.getKey(); - - for (JSONObject params : oneChannel.getValue()) { - //增加货币判断 - int i = currencyScale(params.getString("clearing_currency")); - BigDecimal parent_surage = params.getBigDecimal("clearing_amount").multiply(parentOrgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP); - BigDecimal roy_surage = (params.getBigDecimal("clearing_amount").multiply(orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP)); - total = total.add(params.getBigDecimal("clearing_amount")); - total_surage = total_surage.add(params.getBigDecimal("total_surcharge")).setScale(i, RoundingMode.HALF_UP); - royalpay_surage = royalpay_surage.add(roy_surage); - //net_surage = net_surage.add(getThirdPartyCharge(params.getString("channel"), params.getBigDecimal("clearing_amount"), channelCharge)); - net_surage = net_surage.add(params.getBigDecimal("channel_surcharge")); - share_surage = share_surage.add(roy_surage.subtract(parent_surage)).setScale(i,RoundingMode.HALF_UP); - - } - BigDecimal org_charge = total_surage.subtract(royalpay_surage); - json.put("channel",channel); - json.put("gross_amount",total); - json.put("total_charge",total_surage); - json.put("net_charge",net_surage); - json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value")); - json.put("partner_charge", royalpay_surage); - json.put("share_charge", share_surage); - json.put("org_charge", org_charge); - json.put("commission_type", "1"); - json.put("create_time", new Date()); - amountByChannel.add(json); - } - - return amountByChannel; - } - - //type 1:一级代理 2:二级代理 - public List clientChannelAmount(int clientId,JSONObject orgInfo,Map> channelMap,JSONObject channelCharge,int year,int month,int type) { - List amountByChannel = new ArrayList<>(); - - for (Map.Entry> oneChannel : channelMap.entrySet()) { - JSONObject rate = merchantInfoProvider.clientCurrentRate(clientId, oneChannel.getValue().get(0).getDate("transaction_time"),oneChannel.getKey()); - String recordId = ""; - if (type == 1) { - recordId = financialPartnerCommissionMapper.getRecordId(orgInfo.getInteger("org_id"), year, month, oneChannel.getKey()); - } - if (type == 2) { - recordId = financialAgentCommissionMapper.getRecordId(orgInfo.getInteger("org_id"), year, month, oneChannel.getKey()); - } - BigDecimal total = BigDecimal.ZERO; - BigDecimal total_surage = BigDecimal.ZERO; - BigDecimal net_surage = BigDecimal.ZERO; - BigDecimal royalpay_surage = BigDecimal.ZERO; - Date datefrom = new Date(); - Date dateto = new Date(); - JSONObject json = new JSONObject(); - String channel = oneChannel.getKey(); - - for (JSONObject params : oneChannel.getValue()) { - //增加货币判断 - int i = currencyScale(params.getString("clearing_currency")); - if (total.compareTo(BigDecimal.ZERO)==0 ) { - datefrom = params.getDate("transaction_time"); - dateto = params.getDate("transaction_time"); - }else { - if (params.getDate("transaction_time").before(datefrom)) { - datefrom = params.getDate("transaction_time"); - } - if (params.getDate("transaction_time").after(dateto)) { - dateto = params.getDate("transaction_time"); - } - } - - total = total.add(params.getBigDecimal("clearing_amount")); - total_surage = total_surage.add(params.getBigDecimal("total_surcharge")).setScale(i, RoundingMode.HALF_UP); - royalpay_surage = royalpay_surage.add(params.getBigDecimal("clearing_amount").multiply(orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP)); - //net_surage = net_surage.add(getThirdPartyCharge(params.getString("channel"), params.getBigDecimal("clearing_amount"), channelCharge)); - net_surage = net_surage.add(params.getBigDecimal("channel_surcharge")); - } - BigDecimal org_charge = total_surage.subtract(royalpay_surage); - if(channel.toLowerCase().equals("alipay_direct")){ - channel = channel.replace("_", ""); - } - json.put("channel",channel); - - json.put("record_id",recordId); - json.put("client_id",clientId); - json.put("client_rate",rate.getBigDecimal("rate_value").setScale(2,RoundingMode.DOWN)); - json.put("gross_amount",total); - json.put("total_charge",total_surage); - json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value")); - json.put("royalpay_charge", royalpay_surage); - if (type == 1) { - json.put("net_charge",net_surage); - } - if (type == 2) { - json.put("org_net_charge",net_surage); - } - json.put("org_charge", org_charge); - json.put("commission_type", "1"); - json.put("create_time", new Date()); - json.put("date_from", DateFormatUtils.format(datefrom,"yyyy-MM-dd")); - json.put("date_to", DateFormatUtils.format(dateto,"yyyy-MM-dd")); - json.put("year", year); - json.put("month", month); - amountByChannel.add(json); - } - - return amountByChannel; - } - - private int currencyScale(String currency) { - int i = 0; - switch (currency) { - case "JPY": - i = 0; - break; - default: - i = 2; - break; - } - return i; - } - - private BigDecimal getThirdPartyCharge(String channel, BigDecimal total,JSONObject chargeRate) { - BigDecimal thirdPartyPaymentCharge = BigDecimal.ZERO; - switch (channel) { - case "Alipay": - thirdPartyPaymentCharge = total.multiply(chargeRate.getBigDecimal("alipayChargeRate").divide(CommonConsts.HUNDRED, 4, BigDecimal.ROUND_DOWN)).setScale(2,RoundingMode.HALF_UP); - break; - case "Wechat": - thirdPartyPaymentCharge = total.multiply(chargeRate.getBigDecimal("wechatChargeRate").divide(CommonConsts.HUNDRED, 4, BigDecimal.ROUND_DOWN)).setScale(2,RoundingMode.HALF_UP); - break; - case "jd": - thirdPartyPaymentCharge = total.multiply(chargeRate.getBigDecimal("jdChargeRate").divide(CommonConsts.HUNDRED, 4, BigDecimal.ROUND_DOWN)).setScale(2,RoundingMode.HALF_UP); - break; - case "AlipayOnline": - thirdPartyPaymentCharge = total.multiply(chargeRate.getBigDecimal("alipayonlineChargeRate").divide(CommonConsts.HUNDRED, 4, BigDecimal.ROUND_DOWN)).setScale(2,RoundingMode.HALF_UP); - break; - default: - break; - } - return thirdPartyPaymentCharge; - } - - - @Override @Transactional public void generateReferrer(String monthStr) { @@ -693,8 +371,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { } } + @Override @Transactional - public void generateAgentold(String monthStr, int orgId) { + public void generateAgent(String monthStr, int orgId) { JSONObject org = orgMapper.findOne(orgId); if (org == null) { // shall never happen @@ -746,93 +425,6 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { financialAgentCommissionDetailMapper.save(detail); } } - } - - @Transactional - public void generateAgent(String monthStr,JSONObject channelCharge) { - - Date mon = checkMonth(monthStr); - Calendar monthCal = Calendar.getInstance(); - monthCal.setTime(mon); - int year = monthCal.get(Calendar.YEAR); - int month = monthCal.get(Calendar.MONTH) + 1; - - financialAgentCommissionMapper.clearData(year, month); - financialAgentCommissionDetailMapper.clearData(year, month); - List transactionDetail = transactionMapper.listTransactionForCityPartnerAgentCommissionByDate(year, month); - Map> groupByOrgMap = transactionDetail.stream().collect(Collectors.groupingBy(e -> e.getInteger("org_id"))); - for (Map.Entry> oneOrg : groupByOrgMap.entrySet()) { - - int orgId = oneOrg.getKey(); - JSONObject org = orgMapper.findOne(orgId); - if (org == null) { - // shall never happen - throw new ServerErrorException("Organization Id not exists:" + orgId); - } - JSONObject parentOrg = orgMapper.findOne(org.getInteger("parent_org_id")); - if (parentOrg == null) { - // shall never happen - throw new ServerErrorException("Parent Organization Id not exists:" + orgId); - } - if (org.getInteger("commission_type")!=1) { - generateold(monthStr); - return; - } - List items = oneOrg.getValue(); - Map> groupByChannelMap = items.stream().collect(Collectors.groupingBy(e -> e.getString("channel"))); - List channelAmount = parentOrgChannelAmount(org,parentOrg,groupByChannelMap, channelCharge); - for (JSONObject channel : channelAmount) { - if (channel.getBigDecimal("share_charge").compareTo(BigDecimal.ZERO) != 0) { - JSONObject parentCommission = financialPartnerCommissionMapper.findByChanel(year, month, parentOrg.getInteger("org_id"), channel.getString("channel")); - if (parentCommission == null) { - JSONObject temp = new JSONObject(); - temp.put("org_id", parentOrg.getInteger("org_id")); - temp.put("year", year); - temp.put("month", month); - temp.put("create_time", new Date()); - temp.put("org_rate", 0); - temp.put("gross_amount", 0); - temp.put("total_charge", 0); - temp.put("royalpay_charge", 0); - temp.put("org_charge", 0); - temp.put("share_charge", 0); - temp.put("channel", channel.getString("channel")); - temp.put("net_charge", 0); - temp.put("commission_type", 1); - temp.put("settle_surcharge", 0); - financialPartnerCommissionMapper.save(temp); - parentCommission = temp; - } - parentCommission.put("share_charge", parentCommission.getBigDecimal("share_charge").add(channel.getBigDecimal("share_charge"))); - financialPartnerCommissionMapper.update(parentCommission); - JSONObject mineCommission = financialPartnerCommissionMapper.findByChanel(year, month, orgId, channel.getString("channel")); - mineCommission.put("share_charge", mineCommission.getBigDecimal("share_charge").subtract(channel.getBigDecimal("share_charge"))); - financialPartnerCommissionMapper.update(mineCommission); - } - channel.put("month", month); - channel.put("year", year); - channel.put("org_id", orgId); - //撤销agent表 -// financialAgentCommissionMapper.save(channel); - } - } - //撤销agent表 -// Map> groupByClientMap = transactionDetail.stream().collect(Collectors.groupingBy(e -> e.getInteger("client_id"))); -// for (Map.Entry> oneClient : groupByClientMap.entrySet()) { -// -// JSONObject org = orgMapper.findOne(oneClient.getValue().get(0).getInteger("org_id")); -// Map> groupByChannel = oneClient.getValue().stream().collect(Collectors.groupingBy(e -> e.getString("channel"))); -// -// List clientChannelAmount = clientChannelAmount(oneClient.getKey(),org, groupByChannel, channelCharge,year,month,2); -// for (JSONObject channel : clientChannelAmount) { -// financialAgentCommissionDetailMapper.save(channel); -// } -// -// } - - - - } @Override diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java index c8c877767..c77a6bb4e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java @@ -69,7 +69,6 @@ public class CityPartnerPrizeController { BigDecimal royalpayCharge = BigDecimal.ZERO; BigDecimal orgCharge = BigDecimal.ZERO; BigDecimal netCharge = BigDecimal.ZERO; - BigDecimal shareCharge = BigDecimal.ZERO; String cityPartnerName = ""; int org_id = 0; int type = 1; @@ -77,7 +76,6 @@ public class CityPartnerPrizeController { grossAmount = grossAmount.add(jsonObject.getBigDecimal("gross_amount")); totalCharge = totalCharge.add(jsonObject.getBigDecimal("total_charge")); royalpayCharge = royalpayCharge.add(jsonObject.getBigDecimal("royalpay_charge")); - shareCharge = shareCharge.add(jsonObject.getBigDecimal("share_charge")); orgCharge = orgCharge.add(jsonObject.getBigDecimal("org_charge")); if (jsonObject.getBigDecimal("net_charge") != null) { netCharge = netCharge.add(jsonObject.getBigDecimal("net_charge")); @@ -86,14 +84,10 @@ public class CityPartnerPrizeController { cityPartnerName = jsonObject.getString("name"); type = jsonObject.getIntValue("commission_type"); } - if (entry.getValue().get(0).get("parent_org_id") != null) { - sumResult.put("org_type", "agent"); - } sumResult.put("gross_amount", grossAmount); sumResult.put("total_charge", totalCharge); sumResult.put("royalpay_charge", royalpayCharge); sumResult.put("org_charge", orgCharge); - sumResult.put("share_charge", shareCharge); sumResult.put("org_name", cityPartnerName); sumResult.put("org_id", org_id); sumResult.put("net_charge", netCharge); @@ -101,13 +95,7 @@ public class CityPartnerPrizeController { sumResult.put("channel_detail", entry.getValue()); resultTotalCharge = resultTotalCharge.add(totalCharge); resultRoyalpayCharge = resultRoyalpayCharge.add(royalpayCharge); - if ("agent".equals(sumResult.getString("org_type"))) { - resultRoyalpayCharge = resultRoyalpayCharge.add(shareCharge); - } resultOrgCharge = resultOrgCharge.add(orgCharge); - if (!"agent".equals(sumResult.getString("org_type"))) { - resultOrgCharge = resultOrgCharge.add(shareCharge); - } resultNetCharge = resultNetCharge.add(netCharge); partnerInfos.add(sumResult); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java index 96e129bd7..c0b847a56 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java @@ -27,6 +27,5 @@ public interface FinancialAgentCommissionMapper { List list(@Param("year") int year, @Param("month") int month); - String getRecordId(@Param("org_id") int orgId, @Param("year") int year, @Param("month") int month, @Param("channel") String channel); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java index 6c1a0b34c..aefc9e477 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java @@ -19,9 +19,6 @@ public interface FinancialPartnerCommissionMapper { @AutoSql(type = SqlType.INSERT) void save(JSONObject commissionAnalysis); - @AutoSql(type = SqlType.UPDATE) - void update(JSONObject commission); - List listAvailableMonths(@Param("year") int year); List listWithOrgInfo(@Param("year") int year, @Param("month") int month); @@ -35,9 +32,4 @@ public interface FinancialPartnerCommissionMapper { List analysisSenior(@Param("year") int year, @Param("month")int month,@Param("orgIds") List orgIds); JSONObject analysisSeniorForGenerate(@Param("year") int year, @Param("month")int month,@Param("orgIds") List orgIds); - - String getRecordId(@Param("org_id") int orgId, @Param("year") int year, @Param("month") int month, @Param("channel") String channel); - - JSONObject findByChanel(@Param("year") int year, @Param("month") int month, @Param("org_id") int orgId,@Param("channel") String channel); - } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java index f8579d039..9a47c34f4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java @@ -104,9 +104,6 @@ public interface TransactionMapper { BigDecimal TotalAmountForBDLeaderPrize(@Param("year") int year, @Param("month") int month, @Param("bd_group") String bd_group); BigDecimal TotalAmountForSydneyGMPrize(@Param("year") int year, @Param("month") int month); - List listTransactionForCityPartnerCommissionByDate(@Param("year") int year, @Param("month") int month); - - List listTransactionForCityPartnerAgentCommissionByDate(@Param("year") int year, @Param("month") int month); List listTransactionsForCityPartnerCommission(@Param("year") int year, @Param("month") int month); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.xml index 09ea9f0f7..0a2b3df45 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.xml @@ -23,10 +23,4 @@ INNER JOIN sys_org o ON o.org_id = c.org_id and o.parent_org_id is null WHERE c.year = #{year} AND c.month = #{month} - \ No newline at end of file diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml index 13e41f29e..84a5af0c4 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml @@ -58,18 +58,6 @@ ) - - \ No newline at end of file diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 906de6d47..9db314ed4 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -662,36 +662,7 @@ select sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion, ]]> - -