Pārlūkot izejas kodu

bugfix:我的钱包增加返回值

lyx 2 mēneši atpakaļ
vecāks
revīzija
03ddb61c4f

+ 6 - 1
alien-store/src/main/java/shop/alien/store/service/impl/StoreIncomeDetailsRecordServiceImpl.java

@@ -58,6 +58,7 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
     private final LifeNoticeMapper lifeNoticeMapper;
 
     private final WebSocketProcess webSocketProcess;
+    private final StoreInfoMapper storeInfoMapper;
 
     /**
      * 提现-提现全部-手续费一单一算
@@ -492,6 +493,8 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
         } else {
             wrapper.eq(StoreIncomeDetailsRecord::getIncomeType, incomeType);
         }
+        // 查询店铺信息
+        StoreInfo storeInfo = storeInfoMapper.selectById(storeId);
 
         List<StoreIncomeDetailsRecord> list = this.list(wrapper);
         Integer allIncome = 0;
@@ -514,7 +517,9 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
         vo.setCommissionStr(new BigDecimal(commission).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
         // 收益(售价-手续费  存入的时候已经减完了)
         vo.setNoYetPaymentMoney(new BigDecimal(allIncome).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).toString());
-
+        // 设置店铺名称
+        vo.setStoreName(storeInfo.getStoreName());
+        vo.setStoreId(storeId);
 
         JSONObject jsonObject = new JSONObject();
         //收益