Skip to content

H
huhu-partner
Commit 749319fe by guanchen
Options

结算bug修复

parent c472caf6
Showing with 38 additions and 13 deletions
src/main/java/com/lanren/huhu/partner/domain/PartnerAccount.java
......@@ -146,7 +146,7 @@ public class PartnerAccount implements Serializable {
* 会员截止日期
*/
@TableField(value = "vip_deadline")
private Integer vipDeadline;
private Long vipDeadline;
private static final long serialVersionUID = 1L;
......
src/main/java/com/lanren/huhu/partner/schedule/AgentSettleTask.java
......@@ -88,6 +88,7 @@ public class AgentSettleTask {
int cnt = 0;
while (true) {
int pageNo = 1;
logger.info("pageNo is {}", pageNo);
Page<AgentSettle> page = new Page<AgentSettle>(pageNo, PAGE_SIZE);
page.setOptimizeCountSql(false);
page.setSearchCount(false);
......@@ -137,6 +138,7 @@ public class AgentSettleTask {
int totalPage = 0;
int cnt = 0;
while (true) {
logger.info("pageNo is {}", pageNo);
Page<AgentReward> page = new Page<AgentReward>(pageNo, PAGE_SIZE);
page.setOptimizeCountSql(false);
IPage<AgentReward> ipage;
......@@ -334,6 +336,7 @@ public class AgentSettleTask {
private Map<SubOrderParam, OrderTaobaoJdGoodsCommission> generateSubOrderMap(Set<SubOrderParam> subOrderParamsSet) {
Map<SubOrderParam, OrderTaobaoJdGoodsCommission> map = new HashMap<SubOrderParam, OrderTaobaoJdGoodsCommission>();
if (subOrderParamsSet.size() > 0) {
List<OrderTaobaoJdGoodsCommission> list = orderTaobaoJdGoodsCommissionService.selectListBySubOrderParamsSet(subOrderParamsSet);
for (OrderTaobaoJdGoodsCommission subOrder : list) {
SubOrderParam key = new SubOrderParam();
......@@ -342,11 +345,13 @@ public class AgentSettleTask {
key.setSubOrderSn(subOrder.getSubOrderSn());
map.put(key, subOrder);
}
}
return map;
}
private Map<OrderParam, OrderTaobaoJdCommission> generateOrderMap(Set<OrderParam> orderParamsSet) {
Map<OrderParam, OrderTaobaoJdCommission> map = new HashMap<OrderParam, OrderTaobaoJdCommission>();
if (orderParamsSet.size() > 0) {
List<OrderTaobaoJdCommission> list = orderTaobaoJdCommissionService.selectListByOrderParamSet(orderParamsSet);
for (OrderTaobaoJdCommission order : list) {
OrderParam key = new OrderParam();
......@@ -354,11 +359,13 @@ public class AgentSettleTask {
key.setOrderSn(order.getOrderSn());
map.put(key, order);
}
}
return map;
}
private Map<OrderParam, OrdersActive> generateOrdersActiveMap(Set<OrderParam> orderParamSet) {
Map<OrderParam, OrdersActive> map = new HashMap<OrderParam, OrdersActive>();
if (orderParamSet.size() > 0) {
List<OrdersActive> list = ordersActiveService.selectListByOrderParamSet(orderParamSet);
for (OrdersActive order : list) {
OrderParam key = new OrderParam();
......@@ -366,29 +373,34 @@ public class AgentSettleTask {
key.setOrderSn(order.getOrderSn());
map.put(key, order);
}
}
return map;
}
private Set<SubOrderParam> generateSubOrderParamsSet(List<AgentReward> agentRewardList) {
Set<SubOrderParam> set = new HashSet<SubOrderParam>();
for (AgentReward reward : agentRewardList) {
if (reward.getRewardType() == 60 || reward.getRewardType() == 760) {
SubOrderParam orderParam = new SubOrderParam();
orderParam.setOrderType(reward.getOrderType());
orderParam.setOrderSn(reward.getOrderSn());
orderParam.setSubOrderSn(reward.getSubOrderSn());
set.add(orderParam);
}
}
return set;
}
private Set<OrderParam> generateOrderParamsSet(List<AgentReward> agentRewardList) {
Set<OrderParam> set = new HashSet<OrderParam>();
for (AgentReward reward : agentRewardList) {
if (reward.getRewardType() == 300 || reward.getRewardType() == 750) {
OrderParam orderParam = new OrderParam();
orderParam.setOrderType(reward.getOrderType());
orderParam.setOrderSn(reward.getOrderSn());
set.add(orderParam);
}
}
return set;
}
......
src/main/java/com/lanren/huhu/partner/schedule/PartnerSettleTask.java
......@@ -111,6 +111,7 @@ public class PartnerSettleTask {
int cnt = 0;
while (true) {
int pageNo = 1;
logger.info("pageNo is {}", pageNo);
Page<PartnerSettle> page = new Page<PartnerSettle>(pageNo, PAGE_SIZE);
page.setOptimizeCountSql(false);
page.setSearchCount(false);
......@@ -422,6 +423,7 @@ public class PartnerSettleTask {
int totalPage = 0;
int cnt = 0;
while (true) {
logger.info("pageNo is {}", pageNo);
Page<PartnerReward> page = new Page<PartnerReward>(pageNo, PAGE_SIZE);
page.setOptimizeCountSql(false);
IPage<PartnerReward> ipage;
......@@ -621,29 +623,34 @@ public class PartnerSettleTask {
private Set<OrderParam> generateOrderParamsSet(List<PartnerReward> partnerRewardList) {
Set<OrderParam> set = new HashSet<OrderParam>();
for (PartnerReward reward : partnerRewardList) {
if (reward.getRewardType() == 110) {
OrderParam orderParam = new OrderParam();
orderParam.setOrderType(reward.getOrderType());
orderParam.setOrderSn(reward.getOrderSn());
set.add(orderParam);
}
}
return set;
}
private Set<SubOrderParam> generateSubOrderParamsSet(List<PartnerReward> partnerRewardList) {
Set<SubOrderParam> set = new HashSet<SubOrderParam>();
for (PartnerReward reward : partnerRewardList) {
if (reward.getRewardType() == 120) {
SubOrderParam orderParam = new SubOrderParam();
orderParam.setOrderType(reward.getOrderType());
orderParam.setOrderSn(reward.getOrderSn());
orderParam.setSubOrderSn(reward.getSubOrderSn());
set.add(orderParam);
}
}
return set;
}
private Map<SubOrderParam, OrderTaobaoJdGoodsCommission> generateSubOrderMap(Set<SubOrderParam> subOrderParamsSet) {
Map<SubOrderParam, OrderTaobaoJdGoodsCommission> map = new HashMap<SubOrderParam, OrderTaobaoJdGoodsCommission>();
if (subOrderParamsSet.size() > 0) {
List<OrderTaobaoJdGoodsCommission> list = orderTaobaoJdGoodsCommissionService.selectListBySubOrderParamsSet(subOrderParamsSet);
for (OrderTaobaoJdGoodsCommission subOrder : list) {
SubOrderParam key = new SubOrderParam();
......@@ -652,11 +659,13 @@ public class PartnerSettleTask {
key.setSubOrderSn(subOrder.getSubOrderSn());
map.put(key, subOrder);
}
}
return map;
}
private Map<OrderParam, OrderTaobaoJdCommission> generateOrderMap(Set<OrderParam> orderParamSet) {
Map<OrderParam, OrderTaobaoJdCommission> map = new HashMap<OrderParam, OrderTaobaoJdCommission>();
if (orderParamSet.size() > 0) {
List<OrderTaobaoJdCommission> list = orderTaobaoJdCommissionService.selectListByOrderParamSet(orderParamSet);
for (OrderTaobaoJdCommission order : list) {
OrderParam key = new OrderParam();
......@@ -664,11 +673,13 @@ public class PartnerSettleTask {
key.setOrderSn(order.getOrderSn());
map.put(key, order);
}
}
return map;
}
private Map<OrderParam, OrdersActive> generateOrdersActiveMap(Set<OrderParam> orderParamSet) {
Map<OrderParam, OrdersActive> map = new HashMap<OrderParam, OrdersActive>();
if (orderParamSet.size() > 0) {
List<OrdersActive> list = ordersActiveService.selectListByOrderParamSet(orderParamSet);
for (OrdersActive order : list) {
OrderParam key = new OrderParam();
......@@ -676,6 +687,7 @@ public class PartnerSettleTask {
key.setOrderSn(order.getOrderSn());
map.put(key, order);
}
}
return map;
}
......
src/main/resources/application.yml
......@@ -79,6 +79,7 @@ logging:
level:
#打印SQL信息
com.lanren.huhu.partner.dao: info
# com.lanren.huhu.partner.dao: debug
......
src/main/resources/mapper/AgentRewardMapper.xml
......@@ -791,7 +791,7 @@
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (60,760,125,300,750) then amount * 0.06 else 0 end) techChargeOrder,
SUM(case when reward_type in (40) then amount else 0 end) opencardBalance,
SUM(case when reward_type in (50,740) then amount else 0 end) rechargeBalance,
SUM(case when reward_type in (30,710,720,210,80,230 ,780,290,800,810,790) then amount else 0 end) upgradeBalance,
SUM(case when reward_type in (30,710,720,210,360,80,70,230 ,780,290,800,810,790) then amount else 0 end) upgradeBalance,
SUM(case when reward_type in (20,730) then amount else 0 end) upgradeSuperBalance,
SUM(case when reward_type in (60,760,125) then amount else 0 end) shareBalance,
SUM(case when reward_type in (300,750) then amount else 0 end) zigoushengBalance,
......@@ -802,8 +802,8 @@
COUNT(reward_type IN (50, 740) OR NULL) AS onlinerechargeNum,
SUM(if(reward_type=40, amount, 0)) AS open_card_cash,
COUNT(reward_type=40 OR NULL) AS open_card_num,
SUM(if(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,800,810,790),amount, 0)) AS upgrade_partner_cash,
COUNT(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,800,810,790) OR NULL) AS upgrade_partner_num,
SUM(if(reward_type IN (30, 20, 710, 720, 730, 210,360, 80,70, 230 ,780,290,800,810,790),amount, 0)) AS upgrade_partner_cash,
COUNT(reward_type IN (30, 20, 710, 720, 730, 210,360, 80,70, 230 ,780,290,800,810,790) OR NULL) AS upgrade_partner_num,
SUM(if(reward_type IN (50, 30, 20),cash_code, 0)) AS marketPerformance,
SUM(if(reward_type IN (30, 20),cash_code, 0)) AS upgrade_market_cash,
SUM(if(reward_type=50, cash_code, 0)) AS recharge_market_cash
......@@ -854,7 +854,7 @@
SUM(case when recharge_time &lt; '2019-08-16 12:03:50' and agent_level=4 and reward_type in (60,760,125,300,750) then amount * 0.06 else 0 end) techChargeOrder,
SUM(case when reward_type in (40) then amount else 0 end) opencardBalance,
SUM(case when reward_type in (50,740) then amount else 0 end) rechargeBalance,
SUM(case when reward_type in (30,710,720,210, 80, 230 ,780,290,800,810,790) then amount else 0 end) upgradeBalance,
SUM(case when reward_type in (30,710,720,210,360, 80,70, 230 ,780,290,800,810,790) then amount else 0 end) upgradeBalance,
SUM(case when reward_type in (20,730) then amount else 0 end) upgradeSuperBalance,
SUM(case when reward_type in (60,760,125) then amount else 0 end) shareBalance,
SUM(case when reward_type in (300,750) then amount else 0 end) zigoushengBalance,
......@@ -865,8 +865,8 @@
COUNT(reward_type IN (50, 740) OR NULL) AS onlinerechargeNum,
SUM(if(reward_type=40, amount, 0)) AS open_card_cash,
COUNT(reward_type=40 OR NULL) AS open_card_num,
SUM(if(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,800,810,790),amount, 0)) AS upgrade_partner_cash,
COUNT(reward_type IN (30, 20, 710, 720, 730, 210, 80, 230 ,780,290,800,810,790) OR NULL) AS upgrade_partner_num,
SUM(if(reward_type IN (30, 20, 710, 720, 730, 210,360, 80,70, 230 ,780,290,800,810,790),amount, 0)) AS upgrade_partner_cash,
COUNT(reward_type IN (30, 20, 710, 720, 730, 210,360, 80,70, 230 ,780,290,800,810,790) OR NULL) AS upgrade_partner_num,
SUM(if(reward_type IN (50, 30, 20),cash_code, 0)) AS marketPerformance,
SUM(if(reward_type IN (30, 20),cash_code, 0)) AS upgrade_market_cash,
SUM(if(reward_type=50, cash_code, 0)) AS recharge_market_cash
......
src/main/resources/mapper/PartnerRewardMapper.xml
......@@ -855,7 +855,7 @@
user_id,
SUM(CASE WHEN reward_type IN (110,120,125) THEN commission_acount ELSE 0 END) -
SUM(CASE WHEN reward_type IN (110, 120,125) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120,125) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
WHEN reward_type IN (110, 120,125) AND tech_fee_rate &gt; 0 AND settle_state > 0 THEN all_money_ori * tech_fee_rate
ELSE 0
END) sum_order_commission,
SUM(CASE WHEN reward_type=60 THEN commission_acount ELSE 0 END) -
......@@ -874,8 +874,8 @@
0 bank_tax,
SUM(if(reward_type=60 AND is_show_on_client=1, commission_acount, 0)) AS cash,
COUNT(reward_type=60 OR NULL) AS num,
SUM(if(reward_type IN (70,210,220,320,330,230,290,500,100) AND is_show_on_client=1,commission_acount, 0)) AS upCash,
COUNT(reward_type IN (70,210,220,320,330,230,290,500,100)OR NULL) AS upNum,
SUM(if(reward_type IN (70,210,220,320,330,360,230,290,500,550,340,100) AND is_show_on_client=1,commission_acount, 0)) AS upCash,
COUNT(reward_type IN (70,210,220,320,330,360,230,290,500,550,340,100)OR NULL) AS upNum,
SUM(if(reward_type=80 AND is_show_on_client=1, commission_acount, 0)) AS icash,
COUNT(reward_type=80 OR NULL) AS inum,
SUM(if(reward_type=90 AND is_show_on_client=1, commission_acount, 0)) AS pcash,
......@@ -897,7 +897,7 @@
user_id,
SUM(CASE WHEN reward_type IN (110,120,125) THEN commission_acount ELSE 0 END) -
SUM(CASE WHEN reward_type IN (110, 120,125) AND recharge_time &lt; '2019-08-16 12:03:50' THEN commission_acount * CASE WHEN user_is_super=1 THEN 0.03 WHEN user_partner_level=20 THEN 0.06 ELSE 0 END
WHEN reward_type IN (110, 120,125) AND tech_fee_rate &gt; 0 THEN all_money_ori * tech_fee_rate
WHEN reward_type IN (110, 120,125) AND tech_fee_rate &gt; 0 AND settle_state > 0 THEN all_money_ori * tech_fee_rate
ELSE 0
END) sum_order_commission,
SUM(CASE WHEN reward_type=60 THEN commission_acount ELSE 0 END) -
......@@ -916,8 +916,8 @@
0 bank_tax,
SUM(if(reward_type=60 AND is_show_on_client=1, commission_acount, 0)) AS cash,
COUNT(reward_type=60 OR NULL) AS num,
SUM(if(reward_type IN (70,210,220,320,330,230,290,500, 100) AND is_show_on_client=1,commission_acount, 0)) AS upCash,
COUNT(reward_type IN (70,210,220,320,330,230,290,500, 100)OR NULL) AS upNum,
SUM(if(reward_type IN (70,210,220,320,330,360,230,290,500,550,340, 100) AND is_show_on_client=1,commission_acount, 0)) AS upCash,
COUNT(reward_type IN (70,210,220,320,330,360,230,290,500,550,340, 100)OR NULL) AS upNum,
SUM(if(reward_type=80 AND is_show_on_client=1, commission_acount, 0)) AS icash,
COUNT(reward_type=80 OR NULL) AS inum,
SUM(if(reward_type=90 AND is_show_on_client=1, commission_acount, 0)) AS pcash,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment