9月份 结算 合伙人/代理商 收入

src/main/java/com/lanren/huhu/partner/dao/PartnerRewardMapper.java

@@ -29,6 +29,4 @@ public interface PartnerRewardMapper extends BaseMapper<PartnerReward> {
     PartnerSettle selectPartnerSettleByTsAndUid(Long beginTs, Long endTs, Integer userId);
 
     int updateRewardStatusByUidAndTs(Integer userId, Long beginTs, Long endTs);
-
-//    PartnerSummaryContent getPartnerSummaryContentByUidAndTime(int userId, long beginTs, long endTs);
 }
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/domain/AgentReward.java

@@ -8,7 +8,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -39,7 +38,7 @@ public class AgentReward implements Serializable {
     private Integer userId;
 
     /**
-     * 奖励类型 40 开卡奖励 50 充值奖励 30 购买VIP会员 20 购买超级VIP会员 60 分享赚 300 自购省
+     * 奖励类型 40 开卡奖励 50 充值奖励 30 购买VIP会员 20 购买超级VIP会员 60 分享赚 300 自购省 得的购买年-VIP; 720 城市代理商所得的购买半年-VIP; 730 城市代理商所得的购买超级VIP收益; 740 城市代理商的红包收益; 750 城市代理商的自购省收益; 760 城市代理商的分享赚收益
      */
     @TableField(value = "reward_type")
     private Integer rewardType;
@@ -189,7 +188,7 @@ public class AgentReward implements Serializable {
      * 创建时间
      */
     @TableField(value = "create_time")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * 来源基础金额
@@ -203,6 +202,18 @@ public class AgentReward implements Serializable {
     @TableField(value = "ratio_all")
     private String ratioAll;
 
+    /**
+     * 结算奖励的时间: 淘宝客/京东联盟为确认收货时间, 其他类型奖励同于recharge_time
+     */
+    @TableField(value = "settle_time")
+    private Date settleTime;
+
+    /**
+     * 是否提前结算: 1是,0否
+     */
+    @TableField(value = "settle_in_advance")
+    private Integer settleInAdvance;
+
     private static final long serialVersionUID = 1L;
 
     public static final String COL_AGENT_ID = "agent_id";
@@ -268,4 +279,8 @@ public class AgentReward implements Serializable {
     public static final String COL_ALL_MONEY_ORI = "all_money_ori";
 
     public static final String COL_RATIO_ALL = "ratio_all";
+
+    public static final String COL_SETTLE_TIME = "settle_time";
+
+    public static final String COL_SETTLE_IN_ADVANCE = "settle_in_advance";
 }
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/domain/PartnerReward.java

@@ -8,7 +8,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -39,7 +38,7 @@ public class PartnerReward implements Serializable {
     private Integer userPartnerLevel;
 
     /**
-     * 合伙人奖励类型 60 用户在线充值 70 升高开户充值,80邀请奖励,90下单奖励,100购买超级VIP会员,110购物奖励,120分享赚奖励 130 平台奖励
+     * 合伙人奖励类型 60 用户在线充值 70 升高开户充值,80邀请奖励,90下单奖励,100购买超级VIP会员,110购物奖励
      */
     @TableField(value = "reward_type")
     private Integer rewardType;
@@ -99,6 +98,12 @@ public class PartnerReward implements Serializable {
     private Integer sourceUserId;
 
     /**
+     * 源用户级别
+     */
+    @TableField(value = "source_user_level")
+    private Integer sourceUserLevel;
+
+    /**
      * 源用户邀请人id
      */
     @TableField(value = "invite_user_id")
@@ -126,7 +131,7 @@ public class PartnerReward implements Serializable {
      * 创建时间
      */
     @TableField(value = "create_time")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * 是直接还是间接邀请人 10直接 20间接 30自己
@@ -147,13 +152,13 @@ public class PartnerReward implements Serializable {
     private Integer settleState;
 
     /**
-     * 商品id
+     * 商品ID
      */
     @TableField(value = "goods_id")
     private String goodsId;
 
     /**
-     * 标题
+     * 商品标题
      */
     @TableField(value = "title")
     private String title;
@@ -177,12 +182,6 @@ public class PartnerReward implements Serializable {
     private String subOrderSn;
 
     /**
-     * 是否在客户端展示 1展示 0 不展示
-     */
-    @TableField(value = "is_show_on_client")
-    private Boolean isShowOnClient;
-
-    /**
      * 来源基础金额
      */
     @TableField(value = "all_money_ori")
@@ -194,6 +193,27 @@ public class PartnerReward implements Serializable {
     @TableField(value = "ratio_all")
     private String ratioAll;
 
+    @TableField(value = "is_show_on_client")
+    private Boolean isShowOnClient;
+
+    /**
+     * 技术服务费扣除比例
+     */
+    @TableField(value = "tech_fee_rate")
+    private BigDecimal techFeeRate;
+
+    /**
+     * 结算奖励的时间: 淘宝客/京东联盟为确认收货时间, 其他类型奖励同于recharge_time
+     */
+    @TableField(value = "settle_time")
+    private Date settleTime;
+
+    /**
+     * 是否提前结算: 1是,0否
+     */
+    @TableField(value = "settle_in_advance")
+    private Integer settleInAdvance;
+
     private static final long serialVersionUID = 1L;
 
     public static final String COL_USER_ID = "user_id";
@@ -222,6 +242,8 @@ public class PartnerReward implements Serializable {
 
     public static final String COL_SOURCE_USER_ID = "source_user_id";
 
+    public static final String COL_SOURCE_USER_LEVEL = "source_user_level";
+
     public static final String COL_INVITE_USER_ID = "invite_user_id";
 
     public static final String COL_INVITE_USER_LEVEL = "invite_user_level";
@@ -250,9 +272,15 @@ public class PartnerReward implements Serializable {
 
     public static final String COL_SUB_ORDER_SN = "sub_order_sn";
 
-    public static final String COL_IS_SHOW_ON_CLIENT = "is_show_on_client";
-
     public static final String COL_ALL_MONEY_ORI = "all_money_ori";
 
     public static final String COL_RATIO_ALL = "ratio_all";
+
+    public static final String COL_IS_SHOW_ON_CLIENT = "is_show_on_client";
+
+    public static final String COL_TECH_FEE_RATE = "tech_fee_rate";
+
+    public static final String COL_SETTLE_TIME = "settle_time";
+
+    public static final String COL_SETTLE_IN_ADVANCE = "settle_in_advance";
 }
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/service/AgentRewardService.java

@@ -46,3 +46,4 @@ public interface AgentRewardService extends IService<AgentReward> {
 
 
 
+

src/main/java/com/lanren/huhu/partner/service/PartnerRewardService.java

@@ -38,10 +38,12 @@ public interface PartnerRewardService extends IService<PartnerReward> {
      * 获取每个合伙人的汇总收入
      */
     IPage<PartnerSettle> selectPartnerSettlePageByTs(Page<PartnerSettle> page, Long beginTs, Long endTs);
+
     /**
      * 获取单个合伙人的汇总收入
      */
     PartnerSettle selectPartnerSettleByTsAndUid(Long beginTs, Long endTs, Integer userId);
+
     /**
      * 更新奖励状态
      */
@@ -50,3 +52,4 @@ public interface PartnerRewardService extends IService<PartnerReward> {
 //    PartnerSummaryContent getPartnerSummaryContentByUidAndTime(int userId, long beginTs, long endTs);
 }
 
+

src/main/java/com/lanren/huhu/partner/service/impl/AgentRewardServiceImpl.java

@@ -50,6 +50,7 @@ public class AgentRewardServiceImpl extends ServiceImpl<AgentRewardMapper, Agent
         wrapper.eq("reference_id", refId).gt("settle_state", 0);
         return baseMapper.selectList(wrapper);
     }
+
     @Override
     public List<AgentReward> getListBySubOrderSn(String orderType, String orderSn, String subOrderSn) {
         QueryWrapper<AgentReward> wrapper = new QueryWrapper<AgentReward>();
@@ -57,6 +58,7 @@ public class AgentRewardServiceImpl extends ServiceImpl<AgentRewardMapper, Agent
                 .gt("settle_state", 0);
         return baseMapper.selectList(wrapper);
     }
+
     @Override
     public int insertOne(AgentReward record) {
         List<AgentReward> list = new ArrayList<AgentReward>();
@@ -92,3 +94,4 @@ public class AgentRewardServiceImpl extends ServiceImpl<AgentRewardMapper, Agent
 
 
 
+

src/main/java/com/lanren/huhu/partner/service/impl/PartnerRewardServiceImpl.java

@@ -73,3 +73,4 @@ public class PartnerRewardServiceImpl extends ServiceImpl<PartnerRewardMapper, P
 //    }
 }
 
+

src/main/resources/logback.xml

@@ -2,7 +2,7 @@
 <configuration>
     <property name="pattern" value="[%level] %d{yy-MM-dd HH:mm:ss.SSS} [%thread] %logger{50}:%line - %msg%n"/>
     <property name="log_file" value="@logfile_path@/@profiles.active@/@artifactId@-@profiles.active@"/>
-    <property name="MaxHistory" value="7"/><!--日志保留天数-->
+    <property name="MaxHistory" value="90"/><!--日志保留天数-->
     <property name="MaxFileSize" value="256MB"/><!--单个文件大小-->
     <property name="totalSizeCap" value="256MB"/><!--单个文件大小-->
 

src/main/resources/mapper/AgentRewardMapper.xml

@@ -36,6 +36,8 @@
     <result column="create_time" property="createTime" />
     <result column="all_money_ori" property="allMoneyOri" />
     <result column="ratio_all" property="ratioAll" />
+    <result column="settle_time" property="settleTime" />
+    <result column="settle_in_advance" property="settleInAdvance" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -43,7 +45,8 @@
     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
+    created_at, updated_at, deleted_at, create_time, all_money_ori, ratio_all, settle_time, 
+    settle_in_advance
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
@@ -209,6 +212,16 @@
           when id = #{item.id} then #{item.ratioAll}
         </foreach>
       </trim>
+      <trim prefix="settle_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id} then #{item.settleTime}
+        </foreach>
+      </trim>
+      <trim prefix="settle_in_advance = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id} then #{item.settleInAdvance}
+        </foreach>
+      </trim>
     </trim>
     where id in
     <foreach close=")" collection="list" item="item" open="(" separator=", ">
@@ -222,7 +235,8 @@
       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)
+      updated_at, deleted_at, create_time, all_money_ori, ratio_all, settle_time, settle_in_advance
+      )
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.agentId}, #{item.agentLevel}, #{item.userId}, #{item.rewardType}, #{item.rewardTypeChild}, 
@@ -232,7 +246,7 @@
         #{item.sourceOrder}, #{item.sourceUserId}, #{item.sourceUserLevel}, #{item.goodsId}, 
         #{item.title}, #{item.orderType}, #{item.orderSn}, #{item.subOrderSn}, #{item.rewardExtend}, 
         #{item.createdAt}, #{item.updatedAt}, #{item.deletedAt}, #{item.createTime}, #{item.allMoneyOri}, 
-        #{item.ratioAll})
+        #{item.ratioAll}, #{item.settleTime}, #{item.settleInAdvance})
     </foreach>
   </insert>
   <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.lanren.huhu.partner.domain.AgentReward" useGeneratedKeys="true">
@@ -274,6 +288,8 @@
       create_time,
       all_money_ori,
       ratio_all,
+      settle_time,
+      settle_in_advance,
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -312,6 +328,8 @@
       #{createTime},
       #{allMoneyOri},
       #{ratioAll},
+      #{settleTime},
+      #{settleInAdvance},
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -350,6 +368,8 @@
       create_time = #{createTime},
       all_money_ori = #{allMoneyOri},
       ratio_all = #{ratioAll},
+      settle_time = #{settleTime},
+      settle_in_advance = #{settleInAdvance},
     </trim>
   </insert>
   <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.lanren.huhu.partner.domain.AgentReward" useGeneratedKeys="true">
@@ -455,6 +475,12 @@
       <if test="ratioAll != null">
         ratio_all,
       </if>
+      <if test="settleTime != null">
+        settle_time,
+      </if>
+      <if test="settleInAdvance != null">
+        settle_in_advance,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -557,6 +583,12 @@
       <if test="ratioAll != null">
         #{ratioAll},
       </if>
+      <if test="settleTime != null">
+        #{settleTime},
+      </if>
+      <if test="settleInAdvance != null">
+        #{settleInAdvance},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -659,6 +691,12 @@
       <if test="ratioAll != null">
         ratio_all = #{ratioAll},
       </if>
+      <if test="settleTime != null">
+        settle_time = #{settleTime},
+      </if>
+      <if test="settleInAdvance != null">
+        settle_in_advance = #{settleInAdvance},
+      </if>
     </trim>
   </insert>
   <select id="selectAgentSettlePageByTs" resultType="com.lanren.huhu.partner.model.AgentSettle">
@@ -715,9 +753,10 @@
             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
         FROM agent_reward
-        WHERE recharge_time
+        WHERE settle_time
         BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
             AND reward_status=100
+            AND settle_in_advance = 0
         GROUP BY 1
     ) a
     JOIN user_agent b ON a.agent_id=b.agent_id
@@ -777,10 +816,11 @@
             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
         FROM agent_reward
-        WHERE recharge_time
+        WHERE settle_time
         BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
             AND reward_status = 100
             AND agent_id = #{agentId}
+            AND settle_in_advance = 0
         GROUP BY 1
     ) a
     JOIN user_agent b ON a.agent_id = b.agent_id
@@ -822,9 +862,10 @@
     all_money_ori,
     ratio_all
     FROM agent_reward
-    WHERE recharge_time BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
+    WHERE settle_time BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
     AND reward_status = 100
     AND reward_type in (60,760,300,750)
+    AND settle_in_advance = 0
     ORDER BY id
   </select>
   <select id="selectOrderRewardPageByTsAndAgentId" resultMap="BaseResultMap">
@@ -863,18 +904,20 @@
     all_money_ori,
     ratio_all
     FROM agent_reward
-    WHERE recharge_time BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
+    WHERE settle_time BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
     AND reward_status = 100
     AND agent_id = #{agentId}
     AND reward_type in (60,760,300,750)
+    AND settle_in_advance = 0
     ORDER BY id
   </select>
   <update id="updateRewardStatusByAgentIdAndTs">
     UPDATE agent_reward
-    SET reward_status=120, settle_state=case when settle_state>=0 then 300 else settle_state end
-    WHERE recharge_time
+    SET reward_status=120, settle_state=CASE WHEN settle_state&gt;0 THEN 300 WHEN settle_state&lt;0 THEN -300 ELSE 0 END
+    WHERE settle_time
     BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
         AND agent_id = #{agentId}
         AND reward_status=100
+        AND settle_in_advance = 0
   </update>
 </mapper>
\ No newline at end of file