Jelajahi Sumber

bugfix:已到账期删除已经提现条件

lyx 1 bulan lalu
induk
melakukan
c81607e61c

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

@@ -147,6 +147,9 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
                 }
                 //增加提现记录
                 StoreCashOutRecord storeCashOutRecord = new StoreCashOutRecord();
+                if(null == pay){
+                    return R.fail("支付宝转账失败");
+                }
                 if (pay.getStoreAliPayErrorLog() == null) {
                     storeCashOutRecord.setStoreId(storeId);
                     storeCashOutRecord.setOrderNo(pay.getOutBizNo());
@@ -415,7 +418,7 @@ public class StoreIncomeDetailsRecordServiceImpl extends ServiceImpl<StoreIncome
             Date startDate = DateUtils.calcDays(now, -3);
             jsonObject.put("date", df.format(startDate) + " ~ " + df.format(now));
         } else {
-            wrapper.isNotNull("sidr.cash_out_id");
+//            wrapper.isNotNull("sidr.cash_out_id");
             //已到账期, 当前时间-4~27天大于创建时间
             wrapper.between("sidr.created_time", DateUtils.calcDays(new Date(), -27), DateUtils.calcDays(new Date(), -4));
             Date startDate = DateUtils.calcDays(now, -27);