ソースを参照

bugfix:1063收益显示错误

lyx 1 ヶ月 前
コミット
165ad424fc

+ 1 - 1
alien-entity/src/main/java/shop/alien/entity/store/StoreIncomeDetailsRecord.java

@@ -34,7 +34,7 @@ public class StoreIncomeDetailsRecord extends Model<StoreIncomeDetailsRecord> {
     @TableField("cash_out_id")
     private Integer cashOutId;
 
-    @ApiModelProperty(value = "收入类型, 0:主页, 1:优惠券, 2:代金券, 3:套餐, 4:联名卡")
+    @ApiModelProperty(value = "收入类型, 0:全部, 1:代金, 2:团购")
     @TableField("income_type")
     private Integer incomeType;
 

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

@@ -500,9 +500,10 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
         //当前时间-3天大于创建时间
         wrapper.between(StoreIncomeDetailsRecord::getCreatedTime, date + " 00:00:00", date + " 23:59:59")
                 //未绑定提现记录的
-                .isNull(StoreIncomeDetailsRecord::getCashOutId);
+                .isNull(StoreIncomeDetailsRecord::getCashOutId)
+                .eq(StoreIncomeDetailsRecord::getStoreId, storeId);
         if(null != incomeType && 0 == incomeType){
-            wrapper.in(StoreIncomeDetailsRecord::getIncomeType, "2","3");
+            wrapper.in(StoreIncomeDetailsRecord::getIncomeType, CouponTypeEnum.COUPON.getCode(),CouponTypeEnum.GROUP_BUY.getCode());
         } else {
             wrapper.eq(StoreIncomeDetailsRecord::getIncomeType, incomeType);
         }