debug

smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/Bonus.java

@@ -101,4 +101,5 @@ public class Bonus extends BaseEntity
     @ApiModelProperty("是否需要加入到余额中")
     private Boolean toBalance;
 
+    private Boolean byHand;
 }

smart-switch-service/src/main/java/com/ruoyi/ss/bonus/domain/BonusQuery.java

@@ -55,4 +55,7 @@ public class BonusQuery extends BonusVO {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime prePayTimeEnd;
 
+    @ApiModelProperty("是否有退款")
+    private Boolean hasRefund;
 }
+

smart-switch-service/src/main/java/com/ruoyi/ss/bonus/mapper/BonusMapper.xml

@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sb.pre_pay_time,
             sb.payed_amount,
             sb.wait_amount,
-            sb.to_balance
+            sb.to_balance,
+            sb.by_hand
         <include refid="searchTables"/>
     </sql>
 
@@ -51,7 +52,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.prePayTimeStart != null "> and sb.pre_pay_time >= #{query.prePayTimeStart}</if>
         <if test="query.prePayTimeEnd != null "> and sb.pre_pay_time &lt;= #{query.prePayTimeEnd}</if>
         <if test="query.toBalance != null "> and sb.to_balance = #{query.toBalance}</if>
+        <if test="query.byHand != null "> and sb.by_hand = #{query.byHand}</if>
         <if test="query.payDate != null "> and date(sb.pay_time) = #{query.payDate}</if>
+        <if test="query.hasRefund != null ">
+            <if test="query.hasRefund">
+                and sb.refund_amount > 0
+            </if>
+            <if test="!query.hasRefund">
+                and sb.refund_amount = 0
+            </if>
+        </if>
         <if test="query.billIds != null and query.billIds.size() > 0 ">
             and sb.bill_id in
             <foreach collection="query.billIds" item="item" open="(" close=")" separator=",">
@@ -250,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payedAmount != null">payed_amount,</if>
             <if test="waitAmount != null">wait_amount,</if>
             <if test="toBalance != null">to_balance,</if>
+            <if test="byHand != null">by_hand,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="billId != null">#{billId},</if>
@@ -269,6 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payedAmount != null">#{payedAmount},</if>
             <if test="waitAmount != null">#{waitAmount},</if>
             <if test="toBalance != null">#{toBalance},</if>
+            <if test="byHand != null">#{byHand},</if>
          </trim>
     </insert>
 
@@ -441,6 +453,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="data.payedAmount != null">payed_amount = #{data.payedAmount},</if>
         <if test="data.waitAmount != null">wait_amount = #{data.waitAmount},</if>
         <if test="data.toBalance != null">to_balance = #{data.toBalance},</if>
+        <if test="data.byHand != null">by_hand = #{data.byHand},</if>
     </sql>
 
     <delete id="deleteBonusById" parameterType="Long">

smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/BonusService.java

@@ -176,4 +176,8 @@ public interface BonusService
 
     List<Bonus> buildBonusListByCustom(TransactionBillVO bill);
 
+    /**
+     * 扣减分成方余额
+     */
+    int subtractBalance(Long id, BigDecimal amount);
 }

smart-switch-service/src/main/java/com/ruoyi/ss/bonus/service/impl/BonusServiceImpl.java

@@ -460,6 +460,34 @@ public class BonusServiceImpl implements BonusService
         return bonusList;
     }
 
+    /**
+     * FIXME
+     * !!!! 重要 !!!!
+     * 临时用法，2025-01-17 发生大规模的退款账变BUG，需要临时处理
+     * 这个方法是用来直接修改数据库，所以需要谨慎使用
+     */
+    @Override
+    public int subtractBalance(Long id, BigDecimal amount) {
+        BonusVO bonus = this.selectBonusById(id);
+        ServiceUtil.assertion(bonus == null, "分成不存在");
+        ServiceUtil.assertion(bonus.getToBalance() == null || !bonus.getToBalance(), "分成未变动余额");
+        ServiceUtil.assertion(!BonusArrivalType.userList().contains(bonus.getArrivalType()), "该分成方不是用户");
+        ServiceUtil.assertion(bonus.getByHand(), "该分成已经手动处理过了");
+
+        Integer result = transactionTemplate.execute(status -> {
+            Bonus data = new BonusVO();
+            data.setId(id);
+            data.setByHand(true);
+            int update = this.updateBonus(data);
+            ServiceUtil.assertion(update != 1, "修改状态失败，请刷新后重试");
+
+            userService.subtractBalance(bonus.getArrivalId(), amount, false, String.format("订单退款:%s", bonus.getBillNo()), RecordBalanceBstType.RECHARGE, bonus.getBillId());
+
+            return update;
+        });
+        return result == null ? 0 : result;
+    }
+
     private int batchUpdateAmount(List<Bonus> list) {
         if (CollectionUtils.isEmptyElement(list)) {
             return 0;

smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/BonusController.java

@@ -15,6 +15,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -89,4 +90,12 @@ public class BonusController extends BaseController
         return toAjax(bonusService.payBonusById(id));
     }
 
+    @PreAuthorize("@ss.hasPermi('ss:bonus:subtract')")
+    @PutMapping("/{id}/subtract")
+    public AjaxResult subtract(@PathVariable Long id, @RequestParam BigDecimal amount) {
+        return error("当前接口不可用");
+//        return toAjax(bonusService.subtractBalance(id, amount));
+    }
+
+
 }