Merge branch 'dev' into test

share-system/src/main/java/share/system/domain/GiftAmountLog.java

 package share.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -25,6 +27,7 @@ public class GiftAmountLog extends BaseEntity {
     /**
      * ID
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

share-system/src/main/java/share/system/domain/RechargeAmountLog.java

 package share.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -27,6 +25,7 @@ public class RechargeAmountLog extends BaseEntity {
     /**
      * ID
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -190,6 +190,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     @Autowired
     private EquityFundExcessService equityFundExcessService;
 
+    @Autowired
+    private RechargeAmountLogService rechargeAmountLogService;
+
+    @Autowired
+    private GiftAmountLogService giftAmountLogService;
+
 
     private final static Long FIVE = 5L;
 
@@ -1157,8 +1163,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 //计算充值金额和余额的比例
                 BigDecimal divide = consumerWallet.getRechargeAmount().divide(consumerWallet.getBalance(), 2, RoundingMode.HALF_UP);
                 //余额乘充值金额比例
-                BigDecimal oldRechargeAmount = consumerWallet.getBalance().multiply(divide);
-                BigDecimal oldGiftAmount = consumerWallet.getBalance().subtract(oldRechargeAmount);
+                BigDecimal oldRechargeAmount = sOrder.getBalance().multiply(divide);
+                BigDecimal oldGiftAmount = sOrder.getBalance().subtract(oldRechargeAmount);
                 rechargeAmountLog.setVariableAmount(oldRechargeAmount);
                 giftAmountLog.setVariableAmount(oldGiftAmount);
                 consumerWallet.setBalance(consumerWallet.getBalance().subtract(sOrder.getBalance()));
@@ -1167,6 +1173,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 sOrder.setRechargeAmount(oldRechargeAmount);
                 sOrder.setGiftAmount(oldGiftAmount);
                 balanceLogService.save(balanceLog);
+                rechargeAmountLogService.save(rechargeAmountLog);
+                giftAmountLogService.save(giftAmountLog);
                 consumerWalletService.updateById(consumerWallet);
             }
         }
@@ -1371,6 +1379,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 consumerWallet.setRechargeAmount(consumerWallet.getRechargeAmount().add(sOrder.getRechargeAmount()));
                 consumerWallet.setGiftAmount(consumerWallet.getGiftAmount().add(sOrder.getGiftAmount()));
                 balanceLogService.save(balanceLog);
+                rechargeAmountLogService.save(rechargeAmountLog);
+                giftAmountLogService.save(giftAmountLog);
                 consumerWalletService.updateById(consumerWallet);
             }
         }