修改店铺注销涉及代金券和团购以及金额的 bug

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

@@ -321,7 +321,7 @@ public class LifeGroupPackageServiceImpl extends ServiceImpl<LifeGroupPackageMap
         QueryWrapper<LifeCouponVo> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotEmpty(storeId), "coupon.store_id ", storeId)
 //                .eq(StringUtils.isNotEmpty(status), "coupon.status", status)
-                .eq("coupon.type", 2)
+                .eq("coupon.type", 1)
                 .eq("coupon.delete_flag", 0)
                 .and(StringUtils.isNotEmpty(couponCode) || StringUtils.isNotEmpty(name), wq -> wq.like(StringUtils.isNotEmpty(couponCode), "coupon.coupon_code", couponCode)
                         .or()

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

@@ -34,10 +34,7 @@ import shop.alien.mapper.*;
 import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.config.GaoDeMapUtil;
 import shop.alien.store.config.WebSocketProcess;
-import shop.alien.store.service.NearMeService;
-import shop.alien.store.service.StoreClockInService;
-import shop.alien.store.service.StoreCommentService;
-import shop.alien.store.service.StoreInfoService;
+import shop.alien.store.service.*;
 import shop.alien.store.util.CommonConstant;
 import shop.alien.store.util.FileUploadUtil;
 import shop.alien.store.util.GroupConstant;
@@ -46,7 +43,7 @@ import shop.alien.util.common.DistanceUtil;
 import shop.alien.util.common.constant.CouponStatusEnum;
 import shop.alien.util.common.constant.CouponTypeEnum;
 import shop.alien.util.common.constant.OrderStatusEnum;
-
+import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -127,6 +124,9 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
     private final AliOSSUtil aliOSSUtil;
 
     private final WebSocketProcess webSocketProcess;
+    @Resource
+    private StoreIncomeDetailsRecordService storeIncomeDetailsRecordService;
+
 
     @Value("${spring.web.resources.excel-path}")
     private String excelPath;
@@ -1917,10 +1917,16 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         LambdaQueryWrapper<StoreInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(StoreInfo::getId, id);
         StoreInfo storeInfo = storeInfoMapper.selectOne(queryWrapper);
+//      当前时间 string类型的当前时间
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date();
+        String formattedDate = sdf.format(date);
+        JSONObject  jsonObject =storeIncomeDetailsRecordService.noYetPayment(id, 0, 0,formattedDate,formattedDate, 1, 10);
+        String moneyNew = jsonObject.getString("money");
         if (storeInfo != null) {
             //判断店铺存在未体现金额 0：未通过 1：通过
             StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getStoreId, id));
-            if (storeUser.getMoney() != null && storeUser.getMoney() > 0) {
+            if (storeUser.getMoney() != null && storeUser.getMoney() > 0 && !"0.00".equals(moneyNew)) {
                 storeInfoMap.put("storeMoneyStatus", "0");
             } else {
                 storeInfoMap.put("storeMoneyStatus", "1");
@@ -1932,14 +1938,20 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
             } else {
                 storeInfoMap.put("storeOrderStatus", "1");
             }
-            //判断店铺存在正在售卖的商品 0：未通过 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));
-            if (!CollectionUtils.isEmpty(lifeCoupons) || !CollectionUtils.isEmpty(lifeGroupBuyMainList)) {
+            if (!CollectionUtils.isEmpty(lifeCoupons) ) {
                 storeInfoMap.put("storeGoodsStatus", "0");
             } else {
                 storeInfoMap.put("storeGoodsStatus", "1");
             }
+            if (!CollectionUtils.isEmpty(lifeGroupBuyMainList)) {
+                storeInfoMap.put("storeGroupStatus", "0");
+            } else {
+                storeInfoMap.put("storeGroupStatus", "1");
+            }
+
         }
         return storeInfoMap;
     }