账期 商户收入明细 团购代金券类型修改

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

@@ -24,6 +24,7 @@ import shop.alien.store.service.StoreUserService;
 import shop.alien.store.util.ali.AliApi;
 import shop.alien.util.common.DateUtils;
 import shop.alien.util.common.ListToPage;
+import shop.alien.util.common.constant.CouponTypeEnum;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -314,6 +315,9 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
             Date endDate = DateUtils.calcDays(now, -4);
             jsonObject.put("date", df.format(startDate) + " ~ " + df.format(endDate));
         }
+        if(storeId!=null){
+            wrapper.eq(StoreIncomeDetailsRecord::getStoreId,storeId);
+        }
         //未绑定提现记录的
         LocalDate startDate = LocalDate.parse(startTime);
         LocalDate endDate = LocalDate.parse(endTime);
@@ -324,7 +328,7 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
                 .orderByDesc(StoreIncomeDetailsRecord::getCreatedTime);
         if(null != incomeType) {
             if (0 == incomeType) {
-                wrapper.in(StoreIncomeDetailsRecord::getIncomeType, "2", "3");
+                wrapper.in(StoreIncomeDetailsRecord::getIncomeType, CouponTypeEnum.COUPON,CouponTypeEnum.GROUP_BUY);
             } else {
                 wrapper.eq(StoreIncomeDetailsRecord::getIncomeType, incomeType);
             }