添加逻辑处理 重复发送的revoke记录, 如果存在120的revoke 不再做处理

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

@@ -2,10 +2,11 @@ package com.lanren.huhu.partner.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lanren.huhu.partner.domain.AgentRevokeRecords;
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface AgentRevokeRecordsMapper extends BaseMapper<AgentRevokeRecords> {
     int updateBatch(List<AgentRevokeRecords> list);
@@ -15,4 +16,6 @@ public interface AgentRevokeRecordsMapper extends BaseMapper<AgentRevokeRecords>
     int insertOrUpdate(AgentRevokeRecords record);
 
     int insertOrUpdateSelective(AgentRevokeRecords record);
+
+    int getSuccessExisting(String refId, Integer revokeType);
 }
\ 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/schedule/RevokeAgentRewardTask.java

@@ -15,6 +15,7 @@ import org.springframework.transaction.TransactionStatus;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import static com.lanren.huhu.partner.constants.Constants.*;
@@ -76,6 +77,16 @@ public class RevokeAgentRewardTask {
                 return;
             }
             /**
+             * 如果存在已成功扣除的记录
+             * 不再重复处理, 写190
+             */
+            int existingCnt = agentRevokeRecordsService.getSuccessExisting(revokeRecord.getRefId(), revokeRecord.getRevokeType());
+            if (existingCnt > 0) {
+                revokeRecord.setState(REVOKE_STATE_DO_NOTHING);
+                agentRevokeRecordsService.updateById(revokeRecord);
+                return;
+            }
+            /**
              * 开启事务
              */
             transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
@@ -95,9 +106,11 @@ public class RevokeAgentRewardTask {
              */
             if (null != agentRewardList && agentRewardList.size() > 0) {
                 for (AgentReward agentReward : agentRewardList) {
-                    if (agentReward.getSettleState() == SETTLE_STATE_DONE) {
+                    if (agentReward.getSettleState() == SETTLE_STATE_DONE &&
+                            agentReward.getAmount().compareTo(BigDecimal.ZERO) > 0) {
                         agentReward.setAmount(agentReward.getAmount().negate());
-                        agentReward.setCommission(agentReward.getCommission().negate());
+                        agentReward.setCommission(agentReward.getAmount().negate());
+                        agentReward.setSettleTime(new Date());
                         insertList.add(agentReward);
                     } else if (agentReward.getSettleState() == SETTLE_STATE_ON_THE_WAY || agentReward.getSettleState() == SETTLE_STATE_PRE) {
                         agentReward.setAmount(new BigDecimal(0));

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

@@ -23,4 +23,6 @@ public interface AgentRevokeRecordsService extends IService<AgentRevokeRecords>{
     int insertOrUpdateSelective(AgentRevokeRecords record);
 
     List<AgentRevokeRecords> getAllPending();
+
+    int getSuccessExisting(String refId, Integer revokeType);
 }

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

@@ -43,4 +43,9 @@ public class AgentRevokeRecordsServiceImpl extends ServiceImpl<AgentRevokeRecord
         wrapper.eq("state", REVOKE_STATE_PENDING).orderByAsc("updated_at");
         return baseMapper.selectList(wrapper);
     }
+
+    @Override
+    public int getSuccessExisting(String refId, Integer revokeType) {
+        return baseMapper.getSuccessExisting(refId, revokeType);
+    }
 }

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

@@ -92,3 +92,4 @@ public class AgentRewardServiceImpl extends ServiceImpl<AgentRewardMapper, Agent
 
 
 
+

src/main/resources/mapper/AgentRevokeRecordsMapper.xml

@@ -254,4 +254,9 @@
       </if>
     </trim>
   </insert>
+    <select id="getSuccessExisting" resultType="int">
+      SELECT count(*)
+      FROM agent_revoke_records
+      WHERE state=120 and ref_id=#{refId} and revoke_type=#{revokeType}
+    </select>
 </mapper>
\ No newline at end of file

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">
@@ -871,7 +909,7 @@
   </select>
   <update id="updateRewardStatusByAgentIdAndTs">
     UPDATE agent_reward
-    SET reward_status=120, settle_state=case when settle_state>=0 then 300 else settle_state end
+    SET reward_status=120, settle_state=case when settle_state&gt;=0 then 300 else settle_state end
     WHERE recharge_time
     BETWEEN FROM_UNIXTIME(#{beginTs}) AND FROM_UNIXTIME(#{endTs})
         AND agent_id = #{agentId}