|
|
@@ -1955,20 +1955,23 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
JSONObject jsonObject =storeIncomeDetailsRecordService.noYetPayment(id, 0, 0,startDayS,formattedDate, 1, 10);
|
|
|
String moneyNew = jsonObject.getString("money");
|
|
|
if (storeInfo != null) {
|
|
|
+ Map<String, Object> map = storeIncomeDetailsRecordService.accountBalance(id);
|
|
|
+ double balance = Double.parseDouble(map.get("balance").toString());
|
|
|
+ double cashOutMoney = Double.parseDouble(map.get("cashOutMoney").toString());
|
|
|
//判断店铺存在未体现金额 0:未通过 1:通过
|
|
|
- StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getStoreId, id));
|
|
|
- if (storeUser.getMoney() != null && storeUser.getMoney() > 0 && !"0.00".equals(moneyNew)) {
|
|
|
+// StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getStoreId, id));
|
|
|
+ if (balance >= 0.1 || cashOutMoney >= 0.1 || !"0.00".equals(moneyNew)) {
|
|
|
storeInfoMap.put("storeMoneyStatus", "0");
|
|
|
} else {
|
|
|
storeInfoMap.put("storeMoneyStatus", "1");
|
|
|
}
|
|
|
//判断店铺存在未完成订单 0:未通过 1:通过
|
|
|
- List<LifeUserOrder> lifeUserOrders = lifeUserOrderMapper.selectList(new LambdaQueryWrapper<LifeUserOrder>().in(LifeUserOrder::getStatus, 0, 1).eq(LifeUserOrder::getStoreId, id).eq(LifeUserOrder::getDeleteFlag, 0));
|
|
|
- if (!CollectionUtils.isEmpty(lifeUserOrders)) {
|
|
|
- storeInfoMap.put("storeOrderStatus", "0");
|
|
|
- } else {
|
|
|
- storeInfoMap.put("storeOrderStatus", "1");
|
|
|
- }
|
|
|
+// List<LifeUserOrder> lifeUserOrders = lifeUserOrderMapper.selectList(new LambdaQueryWrapper<LifeUserOrder>().in(LifeUserOrder::getStatus, 0, 1).eq(LifeUserOrder::getStoreId, id).eq(LifeUserOrder::getDeleteFlag, 0));
|
|
|
+// if (!CollectionUtils.isEmpty(lifeUserOrders)) {
|
|
|
+// storeInfoMap.put("storeOrderStatus", "0");
|
|
|
+// } else {
|
|
|
+// storeInfoMap.put("storeOrderStatus", "1");
|
|
|
+// }
|
|
|
//判断店铺存在正在售卖的商品 0:未通过 1:通过 storeGoodsStatus 代金券 storeGroupStatus 团购
|
|
|
List<LifeGroupBuyMain> lifeGroupBuyMainList = lifeGroupBuyMainMapper.selectList(new LambdaQueryWrapper<LifeGroupBuyMain>().eq(LifeGroupBuyMain::getStoreId, id).eq(LifeGroupBuyMain::getStatus, 5).eq(LifeGroupBuyMain::getDeleteFlag, 0));
|
|
|
List<LifeCoupon> lifeCoupons = lifeCouponMapper.selectList(new LambdaQueryWrapper<LifeCoupon>().in(LifeCoupon::getStatus, 5).and(qw -> qw.gt(LifeCoupon::getSingleQty, 0)).eq(LifeCoupon::getStoreId, id).eq(LifeCoupon::getType, 1).eq(LifeCoupon::getDeleteFlag, 0));
|