Skip to content

H
huhu-partner
Commit 15d8f6c4 by guanchen
Options

修复结算bug

去掉所有select *
parent 4b8d344e
Showing with 324 additions and 11 deletions
src/main/java/com/lanren/huhu/partner/schedule/PartnerSettleTask.java
......@@ -85,6 +85,7 @@ public class PartnerSettleTask {
PartnerSettle partnerSettle = partnerRewardService.selectPartnerSettleByTsAndUid(beginTs, endTs, userId);
errPartnerSettle = partnerSettle;
if (partnerSettle != null && setIncomeAndTax(partnerSettle)) {
logger.info("partner settle is {}", partnerSettle.toString());
return doDbUpdate(partnerSettle, beginTs, endTs);
} else {
logger.info("没有待奖励记录 跳过不处理, 用户{}", userId);
......@@ -479,8 +480,9 @@ public class PartnerSettleTask {
// 所有按左开右闭统计
if (base.compareTo(Constants.TAX_STAGE_FREE_BASE) <= 0) {
/**
* 小于 [0,800]
* [0,800]
*/
wxIncome = wxIncome.add(base);
} else if (base.compareTo(Constants.TAX_STAGE_FREE_BASE) == 1 && base.compareTo(Constants.TAX_STAGE_1) <= 0) {
/**
* (800,4000]
......
src/main/resources/mapper/AgentAccountMapper.xml
......@@ -422,6 +422,27 @@
</trim>
</insert>
<select id="getOneByUserIdForUpdate" resultMap="BaseResultMap">
SELECT * FROM agent_account WHERE agent_id = #{agentId}
SELECT
id,
user_id,
agent_id,
account_type,
balance,
frozen_balance,
income_freeze,
pay_freeze,
free_balance,
income_balance,
recharge_income,
opencard_income,
created_at,
updated_at,
deleted_at,
withdraw_balance,
consume_balance,
account_version,
account_status,
create_time
FROM agent_account WHERE agent_id = #{agentId}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/AgentRewardMapper.xml
......@@ -735,7 +735,40 @@
ORDER BY 1,2,3
</select>
<select id="selectOrderRewardPageByTs" resultMap="BaseResultMap">
SELECT *
SELECT
id,
agent_id,
agent_level,
user_id,
reward_type,
reward_type_child,
source_type_v,
reward_remark,
reward_status,
money,
amount,
cash_code,
recharge_time,
commission_acount,
commission_rate,
commission,
reference_id,
settle_state,
source_order,
source_user_id,
source_user_level,
goods_id,
title,
order_type,
order_sn,
sub_order_sn,
reward_extend,
created_at,
updated_at,
deleted_at,
create_time,
all_money_ori,
ratio_all
FROM agent_reward
WHERE recharge_time BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
AND reward_status = 100
......@@ -743,7 +776,40 @@
ORDER BY id
</select>
<select id="selectOrderRewardPageByTsAndAgentId" resultMap="BaseResultMap">
SELECT *
SELECT
id,
agent_id,
agent_level,
user_id,
reward_type,
reward_type_child,
source_type_v,
reward_remark,
reward_status,
money,
amount,
cash_code,
recharge_time,
commission_acount,
commission_rate,
commission,
reference_id,
settle_state,
source_order,
source_user_id,
source_user_level,
goods_id,
title,
order_type,
order_sn,
sub_order_sn,
reward_extend,
created_at,
updated_at,
deleted_at,
create_time,
all_money_ori,
ratio_all
FROM agent_reward
WHERE recharge_time BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
AND reward_status = 100
......
src/main/resources/mapper/OrdersActiveMapper.xml
......@@ -830,7 +830,50 @@
</trim>
</insert>
<select id="selectOneByOrderSn" resultMap="BaseResultMap">
SELECT * FROM orders_active
SELECT
id,
order_id,
user_id,
order_sn,
type,
title,
commission_snapshot,
estimate_effect,
commission_amount,
refund_amount,
all_money,
money,
status,
create_time,
settle_time,
last_time,
amount,
is_for_new,
huhu_subsidy_snapshot,
huhu_subsidy_actual,
active_state,
post_time,
active_time,
created_at,
updated_at,
has_deposit,
first_withdraw_cash,
is_first_withdraw,
is_split_order,
parent_order_sn,
no_invite_reward,
goods_cnt,
order_state,
settlement_parent_order_sn,
is_surplus_order,
is_consume_money,
is_advance_settle_order,
active_identity,
is_push_settle_task,
is_assist,
max_rate,
mini_rate
FROM orders_active
WHERE type=#{type} AND order_sn=#{orderSn}
LIMIT 1
</select>
......
src/main/resources/mapper/PartnerAccountMapper.xml
......@@ -499,10 +499,59 @@
</trim>
</insert>
<select id="selectOneForUpdate" resultMap="BaseResultMap">
SELECT * FROM partner_account WHERE user_id = #{userId} FOR UPDATE;
SELECT
id,
user_id,
partner_level,
become_high_time,
is_super_partner,
become_super_time,
all_income,
curr_untaxed_income,
revoke_balance,
first_month_free,
income_after_tax,
wx_free_balance,
wx_withdrawn_balance,
bank_free_balance,
bank_withdrawn_balance,
frozen_withdraw_balance,
frozen_wx_withdraw_balance,
frozen_bank_withdraw_balance,
first_income_time,
created_at,
updated_at,
deleted_at,
create_time,
vip_deadline
FROM partner_account WHERE user_id = #{userId} FOR UPDATE;
</select>
<select id="getPartnerAccountByPhone" resultMap="BaseResultMap">
SELECT a.*
SELECT
a.id,
a.user_id,
a.partner_level,
a.become_high_time,
a.is_super_partner,
a.become_super_time,
a.all_income,
a.curr_untaxed_income,
a.revoke_balance,
a.first_month_free,
a.income_after_tax,
a.wx_free_balance,
a.wx_withdrawn_balance,
a.bank_free_balance,
a.bank_withdrawn_balance,
a.frozen_withdraw_balance,
a.frozen_wx_withdraw_balance,
a.frozen_bank_withdraw_balance,
a.first_income_time,
a.created_at,
a.updated_at,
a.deleted_at,
a.create_time,
a.vip_deadline
FROM partner_account a
JOIN user_info b on a.user_id=b.user_id
WHERE b.user_phone=#{phone}
......
src/main/resources/mapper/PartnerInviteRelationMapper.xml
......@@ -628,6 +628,38 @@
</trim>
</insert>
<select id="selectPageByTs" resultType="com.lanren.huhu.partner.domain.PartnerInviteRelation">
SELECT * FROM partner_invite_relation WHERE regiter_time BETWEEN #{beginTs} AND #{endTs}
SELECT
id,
user_id,
direct_num,
indirect_num,
partner_level,
invite_type,
regiter_time,
agent_id,
parent_agent_list,
active_order_id,
invite_user_id,
invite_partner_level,
amount,
reward_type,
coupon_id,
indirect_invite_uid,
indirect_partner_level,
indirect_amount,
indirect_reward_type,
indirect_coupon_id,
state,
active_time,
settle_time,
created_at,
updated_at,
last_active_order_id,
agent_level_one,
agent_level_two,
agent_level_three,
agent_level_four,
agent_level_five
FROM partner_invite_relation WHERE regiter_time BETWEEN #{beginTs} AND #{endTs}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/PartnerRewardMapper.xml
......@@ -626,7 +626,39 @@
</trim>
</insert>
<select id="selectOrderRewardPageByTs" resultType="com.lanren.huhu.partner.domain.PartnerReward">
SELECT *
SELECT
id,
user_id,
user_is_super,
user_partner_level,
reward_type,
reward_type_child,
reward_status,
commission_acount,
commission_rate,
reference_id,
recharge_time,
price,
cash,
source_user_id,
source_user_level,
invite_user_id,
invite_user_level,
invite_user_is_super,
created_at,
updated_at,
create_time,
source_type,
reward_times,
settle_state,
goods_id,
title,
order_type,
order_sn,
sub_order_sn,
all_money_ori,
ratio_all,
is_show_on_client
FROM partner_reward
WHERE recharge_time BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
AND reward_status = 100
......@@ -634,7 +666,39 @@
ORDER BY id
</select>
<select id="selectOrderRewardPageByTsAndUid" resultMap="BaseResultMap">
SELECT *
SELECT
id,
user_id,
user_is_super,
user_partner_level,
reward_type,
reward_type_child,
reward_status,
commission_acount,
commission_rate,
reference_id,
recharge_time,
price,
cash,
source_user_id,
source_user_level,
invite_user_id,
invite_user_level,
invite_user_is_super,
created_at,
updated_at,
create_time,
source_type,
reward_times,
settle_state,
goods_id,
title,
order_type,
order_sn,
sub_order_sn,
all_money_ori,
ratio_all,
is_show_on_client
FROM partner_reward
WHERE recharge_time BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
AND reward_status = 100
......
src/main/resources/mapper/UserAgentMapper.xml
......@@ -644,6 +644,39 @@
</trim>
</insert>
<select id="getUserAgentByPhone" resultMap="BaseResultMap">
SELECT * FROM user_agent b WHERE agent_phone=#{phone}
SELECT
agent_id,
user_id,
agent_name,
agent_phone,
agent_level,
node_agent_level_name,
parent_agent_id,
company,
parent_agent_list,
card_num,
card_activate_num,
commission_rate,
pid,
jd_pid,
identity,
account_type,
account,
have_card,
remark,
register_from,
invite_time,
active_time,
agent_state,
created_at,
updated_at,
deleted_at,
presenter_id,
present_time,
agent_level_one,
agent_level_two,
agent_level_three,
agent_level_four
FROM user_agent b WHERE agent_phone=#{phone}
</select>
</mapper>
\ No newline at end of file
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