空指针 跟 queryChain

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java

@@ -327,7 +327,7 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
                 JSONObject couponJson = coupons.get(tbUserCouponVo.getCouponId());
                 tbUserCouponVo.setUseRestrictions(couponJson.getString("useRestrictions"));
                 tbUserCouponVo.setUse(couponJson.getBoolean("isUse"));
-                if (tbUserCouponVo.getType() == 1 ||tbUserCouponVo.getType() == 2 || tbUserCouponVo.getType() == 4 || tbUserCouponVo.getType() == 6) {
+                if (tbUserCouponVo.getType() == 1 || tbUserCouponVo.getType() == 2 || tbUserCouponVo.getType() == 4 || tbUserCouponVo.getType() == 6) {
                     if (StrUtil.isNotBlank(tbUserCouponVo.getFoods()) && !",".equals(tbUserCouponVo.getFoods())) {
                         List<Long> couponFoodIds = Arrays.stream(tbUserCouponVo.getFoods().split(",")).map(Long::parseLong).toList();
                         if (CollUtil.isNotEmpty(couponFoodIds)) {
@@ -347,9 +347,9 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
                             }
                             String foods = list.stream().map(Product::getName).collect(Collectors.joining(","));
                             tbUserCouponVo.setFoods(foods);
-                        } else {
-                            tbUserCouponVo.setFoods("全部商品");
                         }
+                    } else {
+                        tbUserCouponVo.setFoods("全部商品");
                     }
                 }
             }

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java

@@ -277,7 +277,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean deliver(Long shopId, Long userId, TableValueConstant.MemberExpFlow.Type type, BigDecimal money, Integer expVal, Long sourceId) {
-        ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId,  shopInfoService.getMainIdByShopId(shopId)).eq(ShopUser::getUserId, userId));
+        ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, shopInfoService.getMainIdByShopId(shopId)).eq(ShopUser::getUserId, userId));
         if (shopUser == null || shopUser.getIsVip() == 0) {
             return false;
         }
@@ -362,8 +362,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
             // 修改会员等级
             MemberLevelConfig nextConfig = levelConfigService.getOne(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId)
                     .gt(MemberLevelConfig::getExperienceValue, levelVO.getExperienceValue()).orderBy(MemberLevelConfig::getExperienceValue, true).limit(1));
-
+            if (nextConfig != null && shopUser.getExperience() >= nextConfig.getExperienceValue()) {
-            if (shopUser.getExperience() >= nextConfig.getExperienceValue()) {
                 shopUser.setMemberLevelId(nextConfig.getId());
             }
             shopUserService.updateInfo(shopUser);
@@ -540,7 +539,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getUserId, userId).eq(ShopUser::getMainShopId, mainIdByShopId));
         MemberLevelVO levelVO = null;
         if (shopUser.getMemberLevelId() != null) {
-             levelVO = levelConfigService.detail(shopUser.getMemberLevelId());
+            levelVO = levelConfigService.detail(shopUser.getMemberLevelId());
         }
         TbMemberConfig memberConfig = getOne(new QueryWrapper().eq(TbMemberConfig::getShopId, shopId));
         if ("CONDITION".equals(memberConfig.getOpenType())) {

cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java

@@ -12,6 +12,7 @@ import com.czg.account.service.ShopInfoService;
 import com.czg.order.entity.OrderDetail;
 import com.czg.order.entity.OrderInfo;
 import com.czg.service.order.enums.OrderStatusEnums;
+import com.mybatisflex.core.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -157,11 +158,10 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
     @Override
     protected void normalOrderPrint(OrderInfo orderInfo, boolean isPre, PrintMachine machine, String balance, List<OrderDetail> detailList) {
         ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId());
-        long count = orderInfoService.queryChain()
+        long count = orderInfoService.count(new QueryWrapper().eq(OrderInfo::getTradeDay, orderInfo.getTradeDay())
-                .eq(OrderInfo::getTradeDay, orderInfo.getTradeDay())
                 .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
                 .eq(OrderInfo::getShopId, orderInfo.getShopId())
-                .le(OrderInfo::getCreateTime,orderInfo.getCreateTime()).count();
+                .le(OrderInfo::getCreateTime, orderInfo.getCreateTime()));
         PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName())
                 .setPrintType("普通打印").setPickupNum(getPickupNum(orderInfo))
                 .setOrderNo(orderInfo.getOrderNo()).setTradeDate(DateUtil.format(orderInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss")).setOperator("【POS-1】001").setPayAmount(orderInfo.getPayAmount().toPlainString())