diff --git a/cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java b/cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java index 756da045e..92e253558 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java @@ -7,6 +7,7 @@ import com.czg.product.vo.RecommendProVO; import com.czg.resp.CzgResult; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; * 小程序主页相关接口 * @author Administrator */ +@Slf4j @RestController @RequestMapping("/user/home") public class HomeController { @@ -43,6 +45,7 @@ public class HomeController { */ @GetMapping("/product") public CzgResult> home(String lng, String lat, String address, Integer categoryId, Integer orderType, Integer distanceType, String name) { + log.info("请求参数, lng: {}, lat: {}, address: {}, caId: {}, orderType: {}, distan: {}, name: {}", lng,lat,address, categoryId, orderType, distanceType, name); return CzgResult.success(homePageService.getProd(lng, lat, address, categoryId, orderType, distanceType, name)); } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java index e9ed03e61..69c85f570 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java @@ -1,17 +1,14 @@ package com.czg.service.account.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; import com.czg.account.dto.freeding.FreeDineConfigEditDTO; -import com.czg.exception.ApiNotPrintException; -import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.FreeDineConfig; import com.czg.account.service.FreeDineConfigService; +import com.czg.exception.ApiNotPrintException; import com.czg.service.account.mapper.FreeDineConfigMapper; -import org.springframework.stereotype.Service; +import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import org.apache.dubbo.config.annotation.DubboService; /** * 霸王餐配置信息表 服务层实现。 @@ -19,7 +16,7 @@ import org.springframework.stereotype.Service; * @author zs * @since 2025-02-21 */ -@Service +@DubboService public class FreeDineConfigServiceImpl extends ServiceImpl implements FreeDineConfigService{ @Override public FreeDineConfig getConfig(long shopId) { diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 071116b48..b80b97533 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -466,7 +466,7 @@ public class OrderInfoServiceImpl extends ServiceImpl value = entry.getValue(); BigDecimal couponNum = BigDecimal.ZERO; - if (prodCouponMap.containsKey(key)) { + if (CollUtil.isNotEmpty(prodCouponMap) && prodCouponMap.containsKey(key)){ couponNum = new BigDecimal(prodCouponMap.get(key)); if (value.size() > 1) { value.sort(Comparator.comparing(OrderDetail::getPrice));