diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index e80eebfb..94c7c97f 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -1285,319 +1285,320 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl item_rows = new ArrayList(); - if (ifcart > 0) { + Integer ifCart = getParameter("ifcart", 0); + // 购物车商品列表 + List cartItemRows = new ArrayList(); + if (ifCart > 0) { // 从购物车走 QueryWrapper cartQueryWrapper = new QueryWrapper<>(); - cartQueryWrapper.eq("chain_id", chain_id).eq("user_id", user_id).eq("cart_select", 1).gt("cart_quantity", 0); - if (checked_store > 0) { + cartQueryWrapper.eq("chain_id", chainId).eq("user_id", userId).eq("cart_select", 1).gt("cart_quantity", 0); + if (checkedStore > 0) { // 权限判断 - cartQueryWrapper.eq("store_id", checked_store); + cartQueryWrapper.eq("store_id", checkedStore); } - Map cart_data = shopUserCartService.getLists(cartQueryWrapper, 1, 500); - item_rows = (List) cart_data.get("items"); + // 购物车数据 + Map cartResultData = shopUserCartService.getLists(cartQueryWrapper); + cartItemRows = (List) cartResultData.get("items"); } // 注：重要方法 - return doQuickAddOrder(user_id, item_rows, ud_id, true, "", StateCode.ORDER_TYPE_DD, null); + return doQuickAddOrder(userId, cartItemRows, udId, true, "", StateCode.ORDER_TYPE_DD, null); } + /** * 添加订单详细信息 预处理 -> addOrder 转移过来，所以直接读取request 不合规范，兼容前后端下单逻辑 * - * @param user_id 用户编号 - * @param item_rows 订单数据 - * @param ud_id 地址编号 或者 地址数据Map - * @param cal_freight 是否需要计算运费 - * @param src_order_id 供应商转单源订单 - * @param order_type 订单类型 + * @param userId 用户编号 + * @param itemRows 订单数据 + * @param udId 地址编号 或者 地址数据Map + * @param calFreight 是否需要计算运费 + * @param srcOrderId 供应商转单源订单 + * @param orderType 订单类型 * @return * @access public */ @Override - public CommonResult doQuickAddOrder(Integer user_id, List item_rows, Object ud_id, boolean cal_freight, String src_order_id, Integer order_type, FixOrderVo fixOrderVo) { - AccountUserBase user_row = accountService.getUserBase(user_id); - Integer pfgb_id = Convert.toInt(getParameter("pfgb_id"), 0); - Integer activity_id = Convert.toInt(getParameter("activity_id"), 0); + public CommonResult doQuickAddOrder(Integer userId, List itemRows, Object udId, boolean calFreight, String srcOrderId, Integer orderType, FixOrderVo fixOrderVo) { + AccountUserBase userRow = accountService.getUserBase(userId); + Integer pfgbId = Convert.toInt(getParameter("pfgb_id"), 0); + Integer activityId = Convert.toInt(getParameter("activity_id"), 0); Integer quantity = getParameter("quantity", 1); - Integer channel_type = getParameter("channel_type", 0); - Map activity_rows = new HashMap(); + Integer channelType = getParameter("channel_type", 0); + Map activityRows = new HashMap(); - if (!activity_id.equals(0)) { - activity_rows = shopStoreActivityBaseService.getActivityFormatOne(activity_id, quantity); + if (!activityId.equals(0)) { + activityRows = shopStoreActivityBaseService.getActivityFormatOne(activityId, quantity); } - Boolean force_bind_mobile = accountBaseConfigService.getConfig("force_bind_mobile", false); - Map userBind = accountService.getBind(user_id, BindCode.MOBILE); + Boolean forceBindMobile = accountBaseConfigService.getConfig("force_bind_mobile", false); + Map userBind = accountService.getBind(userId, BindCode.MOBILE); - Map cart_data; + Map cartData; - if (!force_bind_mobile || CollUtil.isNotEmpty(userBind)) { + if (!forceBindMobile || CollUtil.isNotEmpty(userBind)) { // 手机绑定的情况 - Integer chain_id = Convert.toInt(getParameter("chain_id")); - Boolean if_chain = Convert.toBool(getParameter("if_chain"), false); - Integer checked_store = getParameter("checked_store", 0); + Integer chainId = Convert.toInt(getParameter("chain_id")); + Boolean ifChain = Convert.toBool(getParameter("if_chain"), false); + Integer checkedStore = getParameter("checked_store", 0); // 优惠券id检测 - List user_voucher_ids = checkCoupon(); + List userVoucherIds = checkCoupon(); - Map checkout_row = new HashMap(); + Map checkoutRow = new HashMap(); // 配送方式：5-门店自提；10-普通快递；16-同城配送； - Integer delivery_type_id = getParameter("delivery_type_id", StateCode.DELIVERY_TYPE_SAME_CITY); - logger.debug("提交订单时，配送方式 delivery_type_id:{}", delivery_type_id); + Integer deliveryTypeId = getParameter("delivery_type_id", StateCode.DELIVERY_TYPE_SAME_CITY); + logger.debug("提交订单时，配送方式 delivery_type_id:{}", deliveryTypeId); if (getParameter("checkout_row") == null) { - Date cur_date = new Date(); - checkout_row.put("payment_type_id", StateCode.PAYMENT_TYPE_ONLINE); - checkout_row.put("delivery_type_id", delivery_type_id); - checkout_row.put("delivery_time_id", 1); - checkout_row.put("invoice_type_id", 1); - checkout_row.put("order_invoice_title", ""); - checkout_row.put("delivery_time", cur_date); - checkout_row.put("delivery_time_h", DateUtil.hour(cur_date, true)); + Date curDate = new Date(); + checkoutRow.put("payment_type_id", StateCode.PAYMENT_TYPE_ONLINE); + checkoutRow.put("delivery_type_id", deliveryTypeId); + checkoutRow.put("delivery_time_id", 1); + checkoutRow.put("invoice_type_id", 1); + checkoutRow.put("order_invoice_title", ""); + checkoutRow.put("delivery_time", curDate); + checkoutRow.put("delivery_time_h", DateUtil.hour(curDate, true)); } else { - checkout_row = Convert.toMap(String.class, Object.class, JSONUtil.parseObj(getParameter("checkout_row"))); + checkoutRow = Convert.toMap(String.class, Object.class, JSONUtil.parseObj(getParameter("checkout_row"))); } //// 配送方式：5-门店自提；10-普通快递；16-同城配送； - if (delivery_type_id.equals(StateCode.DELIVERY_TYPE_SELF_PICK_UP)) { + if (deliveryTypeId.equals(StateCode.DELIVERY_TYPE_SELF_PICK_UP)) { // 5-门店自提 - cal_freight = false; + calFreight = false; } - Integer user_invoice_id = Convert.toInt(getParameter("user_invoice_id")); + Integer userInvoiceId = Convert.toInt(getParameter("user_invoice_id")); // 用户发票检测 - checkUserInvoice(user_id, checkout_row, user_invoice_id); + checkUserInvoice(userId, checkoutRow, userInvoiceId); - - List cart_rows = new ArrayList(); - Integer ifcart = getParameter("ifcart", 0); - if (ifcart > 0) { + List cartRows = new ArrayList(); + Integer ifCart = getParameter("ifcart", 0); + if (ifCart > 0) { // 从购物车走 QueryWrapper cartQueryWrapper = new QueryWrapper<>(); - cartQueryWrapper.eq("user_id", user_id).eq("cart_select", 1).gt("cart_quantity", 0); - // .eq("chain_id", chain_id) TODO update 2024-12-23 蓝驰要求 - if (checked_store > 0) { - cartQueryWrapper.eq("store_id", checked_store); + cartQueryWrapper.eq("user_id", userId).eq("cart_select", 1).gt("cart_quantity", 0); + // .eq("chain_id", chainId) TODO update 2024-12-23 蓝驰要求 + if (checkedStore > 0) { + cartQueryWrapper.eq("store_id", checkedStore); } - cart_data = shopUserCartService.getLists(cartQueryWrapper, 1, 500); + cartData = shopUserCartService.getLists(cartQueryWrapper, 1, 500); } else { - String item_info = getParameter("cart_id"); - List item_info_row = new ArrayList(); - if (StrUtil.isNotBlank(item_info)) { - item_info_row = Convert.toList(String.class, item_info.split(",")); + String itemInfo = getParameter("cart_id"); + List itemInfoRow = new ArrayList(); + if (StrUtil.isNotBlank(itemInfo)) { + itemInfoRow = Convert.toList(String.class, itemInfo.split(",")); } else { - for (Map item_row : item_rows) { - Integer cart_quantity = Convert.toInt(item_row.get("cart_quantity")); - if (cart_quantity >= 1) { - Long item_id = Convert.toLong(item_row.get("item_id")); - item_info_row.add(item_id + "|" + cart_quantity); + for (Map itemRow : itemRows) { + Integer cartQuantity = Convert.toInt(itemRow.get("cart_quantity")); + if (cartQuantity >= 1) { + Long itemId = Convert.toLong(itemRow.get("item_id")); + itemInfoRow.add(itemId + "|" + cartQuantity); } } } - for (String item : item_info_row) { - String[] item_row = item.split("\\|"); - Long item_id = Convert.toLong(item_row[0]); - Integer cart_quantity = Convert.toInt(item_row[1]); + for (String item : itemInfoRow) { + String[] itemRow = item.split("\\|"); + Long itemId = Convert.toLong(itemRow[0]); + Integer cartQuantity = Convert.toInt(itemRow[1]); - HashMap cart_row = new HashMap(); - cart_rows.add(cart_row); + HashMap cartRow = new HashMap(); + cartRows.add(cartRow); - ShopProductItem product_row = shopProductItemService.get(item_id); - if (if_chain) { - cart_row.put("chain_id", chain_id); + ShopProductItem productRow = shopProductItemService.get(itemId); + if (ifChain) { + cartRow.put("chain_id", chainId); } - cart_row.put("user_id", user_id); - cart_row.put("store_id", product_row.getStore_id()); - cart_row.put("item_id", item_id); - cart_row.put("cart_quantity", cart_quantity); - cart_row.put("single_activity", shopUserCartService.ifSingleActivity()); - cart_row.put("cart_select", 1); - cart_row.put("cart_type", 1); - cart_row.put("activity_id", activity_id); - cart_row.put("cart_file", getParameter("cart_file")); - cart_row.put("pfgb_id", pfgb_id); + cartRow.put("user_id", userId); + cartRow.put("store_id", productRow.getStore_id()); + cartRow.put("item_id", itemId); + cartRow.put("cart_quantity", cartQuantity); + cartRow.put("single_activity", shopUserCartService.ifSingleActivity()); + cartRow.put("cart_select", 1); + cartRow.put("cart_type", 1); + cartRow.put("activity_id", activityId); + cartRow.put("cart_file", getParameter("cart_file")); + cartRow.put("pfgb_id", pfgbId); } - cart_data = shopUserCartService.formatCartRows(cart_rows, activity_rows, null, fixOrderVo); + cartData = shopUserCartService.formatCartRows(cartRows, activityRows, null, fixOrderVo); } - cart_data.put("payment_form_id", getParameter("payment_form_id")); + cartData.put("payment_form_id", getParameter("payment_form_id")); - Integer salesperson_id = Convert.toInt(getParameter("salesperson_id")); // 导购员用户编号 - cart_data.put("order_message", JSONUtil.parseObj(getParameter("order_message"))); - cart_data.put("salesperson_id", 0); + Integer salespersonId = Convert.toInt(getParameter("salesperson_id")); // 导购员用户编号 + cartData.put("order_message", JSONUtil.parseObj(getParameter("order_message"))); + cartData.put("salesperson_id", 0); // 来源订单 - cart_data.put("src_order_id", src_order_id); + cartData.put("src_order_id", srcOrderId); //订单类型：线上、线下 - cart_data.put("order_type", order_type); + cartData.put("order_type", orderType); // 配送方式 - cart_data.put("delivery_type_id", delivery_type_id); - + cartData.put("delivery_type_id", deliveryTypeId); // 修改为distributor_user_id - Integer distributor_user_id = getParameter("distributor_user_id", Integer.class); - if (CheckUtil.isNotEmpty(distributor_user_id)) { - cart_data.put("distributor_user_id", distributor_user_id); // 分销商店铺编号 + Integer distributorUserId = getParameter("distributor_user_id", Integer.class); + if (CheckUtil.isNotEmpty(distributorUserId)) { + cartData.put("distributor_user_id", distributorUserId); // 分销商店铺编号 } - Integer distributor_id = getParameter("distributor_id", Integer.class); - if (CheckUtil.isNotEmpty(distributor_id)) { + Integer distributorId = getParameter("distributor_id", Integer.class); + if (CheckUtil.isNotEmpty(distributorId)) { // 读取分销商编号 QueryWrapper employeeQueryWrapper = new QueryWrapper<>(); - employeeQueryWrapper.eq("store_id", distributor_id).eq("employee_is_admin", CommonConstant.USER_TYPE_ADMIN); - ShopStoreEmployee epl_row = storeEmployeeService.findOne(employeeQueryWrapper); + employeeQueryWrapper.eq("store_id", distributorId).eq("employee_is_admin", CommonConstant.USER_TYPE_ADMIN); + ShopStoreEmployee eplRow = storeEmployeeService.findOne(employeeQueryWrapper); - if (epl_row != null && ObjectUtil.equal(epl_row.getUser_id(), distributor_user_id)) { - cart_data.put("distributor_user_id", distributor_user_id); + if (eplRow != null && ObjectUtil.equal(eplRow.getUser_id(), distributorUserId)) { + cartData.put("distributor_user_id", distributorUserId); } } // 自提和上门服务走 User_DeliveryAddressModel，到店取货填写手机接受短信兑换码 - Integer _ud_id = getParameter("ud_id", Integer.class); - Integer is_edu = getParameter("is_edu", Integer.class); - Integer is_voucher = getParameter("is_voucher", Integer.class); + Integer udIdParam = getParameter("ud_id", Integer.class); + Integer isEdu = getParameter("is_edu", Integer.class); + Integer isVoucher = getParameter("is_voucher", Integer.class); - if (CheckUtil.isEmpty(is_edu) || CheckUtil.isEmpty(is_voucher)) { - if (ud_id != null && ud_id instanceof Map) { - cart_data.put("address_row", ud_id); - } else if (ud_id != null || (ud_id = _ud_id) != null) { - ShopUserDeliveryAddress deliveryAddress = userDeliveryAddressService.get((Integer) ud_id); - Map address_row = Convert.toMap(String.class, Object.class, deliveryAddress); - cart_data.put("address_row", address_row); + if (CheckUtil.isEmpty(isEdu) || CheckUtil.isEmpty(isVoucher)) { + if (udId != null && udId instanceof Map) { + cartData.put("address_row", udId); + } else if (udId != null || (udId = udIdParam) != null) { + ShopUserDeliveryAddress deliveryAddress = userDeliveryAddressService.get((Integer) udId); + Map addressRow = Convert.toMap(String.class, Object.class, deliveryAddress); + cartData.put("address_row", addressRow); // 用户选中的收货地址 2024-12-05 add - cart_data.put("delivery_address_row", deliveryAddress); - cart_data.put("is_delivery", true); + cartData.put("delivery_address_row", deliveryAddress); + cartData.put("is_delivery", true); } else { - cart_data.put("is_delivery", false); + cartData.put("is_delivery", false); } } else { - cart_data.put("is_delivery", false); + cartData.put("is_delivery", false); } // 如果后台下单只有一个教育商品则不走运费 - if (CheckUtil.isEmpty(is_edu) && item_rows.size() == 1) { - Integer kind_id = Convert.toInt(item_rows.get(0).get("kind_id"), 0); + if (CheckUtil.isEmpty(isEdu) && itemRows.size() == 1) { + Integer kindId = Convert.toInt(itemRows.get(0).get("kind_id"), 0); // 商品包含一个教育 - if (ObjectUtil.equal(kind_id, StateCode.PRODUCT_KIND_EDU)) { - cal_freight = false; - cart_data.put("is_delivery", false); + if (ObjectUtil.equal(kindId, StateCode.PRODUCT_KIND_EDU)) { + calFreight = false; + cartData.put("is_delivery", false); } } - cart_data.put("user_voucher_ids", user_voucher_ids); - cart_data.put("checkout_row", checkout_row); + cartData.put("user_voucher_ids", userVoucherIds); + cartData.put("checkout_row", checkoutRow); - cart_data.put("buyer_user_id", user_id); - cart_data.put("buyer_user_name", user_row.getUser_nickname()); + cartData.put("buyer_user_id", userId); + cartData.put("buyer_user_name", userRow.getUser_nickname()); // 判断是否拼团购买 - String str_gb_id = getParameter("gb_id"); - Integer gb_id = null; + String strGbId = getParameter("gb_id"); + Integer gbId = null; - if (StrUtil.isNotBlank(str_gb_id)) { - gb_id = NumberUtil.isNumber(str_gb_id) ? Convert.toInt(str_gb_id) : 0; - cart_data.put("gb_id", gb_id); // 拼团ID, 为0，在创建拼团 + if (StrUtil.isNotBlank(strGbId)) { + gbId = NumberUtil.isNumber(strGbId) ? Convert.toInt(strGbId) : 0; + cartData.put("gb_id", gbId); // 拼团ID, 为0，在创建拼团 } // 判断是否砍价购买 - Integer ac_id = getParameter("ac_id", Integer.class); - if (ac_id != null) { - cart_data.put("ac_id", ac_id); // 拼团ID, 为0，在创建拼团 + Integer acId = getParameter("ac_id", Integer.class); + if (acId != null) { + cartData.put("ac_id", acId); // 拼团ID, 为0，在创建拼团 } // 注：（重要）邮费检测和计算 - dealWithCalFee(cal_freight, cart_data, chain_id, is_edu); + dealWithCalFee(calFreight, cartData, chainId, isEdu); // 判断是否上传素材 - checkIsUploadMaterial(cart_data); + checkIsUploadMaterial(cartData); // 是否单品推广 - JSONObject source_item_id_rows = new JSONObject(); - String source_item_id = getParameter("source_item_id"); - if (StrUtil.isNotBlank(source_item_id)) { - source_item_id_rows = JSONUtil.parseObj(source_item_id); + JSONObject sourceItemIdRows = new JSONObject(); + String sourceItemId = getParameter("source_item_id"); + if (StrUtil.isNotBlank(sourceItemId)) { + sourceItemIdRows = JSONUtil.parseObj(sourceItemId); } - cart_data.put("source_item_id", source_item_id_rows); + cartData.put("source_item_id", sourceItemIdRows); //门店自提方式，则判断是否需要分店铺下单。 if (StateCode.DELIVERY_TYPE_SELF_PICK_UP == getParameter("delivery_type_id", StateCode.DELIVERY_TYPE_EXP)) { if (CommonConstant.Enable == accountBaseConfigService.getConfig("product_ziti_flag", CommonConstant.Disable)) { - List store_o2o_flag_row = ((List) cart_data.get("items")).stream().map(s -> Convert.toInt(s.get("store_o2o_flag"))).distinct().collect(Collectors.toList()); + List storeO2oFlagRow = ((List) cartData.get("items")).stream().map(s -> Convert.toInt(s.get("store_o2o_flag"))).distinct().collect(Collectors.toList()); - if (store_o2o_flag_row.size() > 1) { + if (storeO2oFlagRow.size() > 1) { throw new ApiException(I18nUtil._("请分店铺下单！")); } } } - // 添加订单（关键方法） - List order_id_row = addOrder(cart_data, true, false, null); + // 添加保存订单（关键方法） + List orderIdRow = addOrder(cartData, true, false, null); // 最终应付金额 - BigDecimal orderSelMoneyAmount = Convert.toBigDecimal(cart_data.get("orderSelMoneyAmount")); + BigDecimal orderSelMoneyAmount = Convert.toBigDecimal(cartData.get("orderSelMoneyAmount")); - if (CollUtil.isNotEmpty(order_id_row) && ObjectUtil.compare(orderSelMoneyAmount, BigDecimal.ZERO) <= 0) { + if (CollUtil.isNotEmpty(orderIdRow) && ObjectUtil.compare(orderSelMoneyAmount, BigDecimal.ZERO) <= 0) { // 处理订单支付成功 - Map notify_row = new HashMap(); - notify_row.put("store_id", 0); // 所属店铺 - notify_row.put("chain_id", 0); // 所属门店 - notify_row.put("payment_channel_id", StateCode.PAYMENT_MONEY); // 余额支付 - notify_row.put("order_id", order_id_row); // 所属店铺 + Map notifyRow = new HashMap(); + notifyRow.put("store_id", 0); // 所属店铺 + notifyRow.put("chain_id", 0); // 所属门店 + notifyRow.put("payment_channel_id", StateCode.PAYMENT_MONEY); // 余额支付 + notifyRow.put("order_id", orderIdRow); // 所属店铺 // todo 支付完成后[包含充值及订单支付],异步通知商城,更新订单状态 } - cart_data.put("order_id", order_id_row); + cartData.put("order_id", orderIdRow); // BigDecimal packingFee = BigDecimal.ZERO; // if (1 == 1) { -// cart_data.put("packing_fee", packingFee); +// cartData.put("packing_fee", packingFee); // } // 判断是否拼团购买 - if (gb_id != null) { + if (gbId != null) { QueryWrapper historyQueryWrapper = new QueryWrapper<>(); - historyQueryWrapper.eq("order_id", order_id_row.get(0)); - ShopActivityGroupbookingHistory ag_row = groupbookingHistoryService.findOne(historyQueryWrapper); + historyQueryWrapper.eq("order_id", orderIdRow.get(0)); + ShopActivityGroupbookingHistory agRow = groupbookingHistoryService.findOne(historyQueryWrapper); - if (ObjectUtil.isNotEmpty(ag_row) && CheckUtil.isNotEmpty(ag_row.getGb_id())) { - cart_data.put("gb_id", ag_row.getGb_id()); + if (ObjectUtil.isNotEmpty(agRow) && CheckUtil.isNotEmpty(agRow.getGb_id())) { + cartData.put("gb_id", agRow.getGb_id()); } } // 判断是否砍价购买 - if (ac_id != null) { + if (acId != null) { } - PayUserResource user_res_row = payService.getPayUserResource(user_id); - if (user_res_row != null) { - cart_data.put("user_money", user_res_row.getUser_money()); - cart_data.put("user_points", user_res_row.getUser_points()); + PayUserResource userResRow = payService.getPayUserResource(userId); + if (userResRow != null) { + cartData.put("user_money", userResRow.getUser_money()); + cartData.put("user_points", userResRow.getUser_points()); } } else { //未绑定手机返回参数封装,与前端约定该代码代表未绑定手机异常77011 @@ -1606,14 +1607,14 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl 0) { - packingFee = new BigDecimal("10"); - } - } + // 店铺统一设置的打包费(formatCartRows 方法里计算好的) + BigDecimal packingFee = Convert.toBigDecimal(store_item.get("packing_fee")); // 打包费 base_row.put("packing_fee", packingFee); BigDecimal voucher_price = Convert.toBigDecimal(order_voucher_row.get("voucher_price")); // 【重要】应付款金额计算 - BigDecimal order_payment_amount = NumberUtil.sub(NumberUtil.add(order_money_select_items, freight, packingFee), voucher_price); + BigDecimal order_payment_amount = NumberUtil.sub(NumberUtil.add(order_money_select_items, freight), voucher_price); order_payment_amount = NumberUtil.sub(order_payment_amount, dedu_price); order_payment_amount = NumberUtil.max(order_payment_amount, BigDecimal.valueOf(0)); + // 订单原价商品金额 base_row.put("order_product_amount", Convert.toBigDecimal(store_item.get("productMoneyOriginGoods"))); - // 【重要】应付款金额计算 + //【重要】应付款金额计算 base_row.put("order_payment_amount", order_payment_amount); // 增加汇率 @@ -6395,7 +6391,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl 0) { tmp_rate = NumberUtil.div(order_resource_ext1_use, order_resource_ext1); @@ -7501,7 +7496,10 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl { Map getLists(Integer store_id, Integer chain_id, Integer page, Integer rows); /** - * 读取购物车 + * 读取购物车（分页） * * @param queryWrapper * @param page @@ -42,6 +42,14 @@ public interface ShopUserCartService extends IBaseService { */ Map getLists(QueryWrapper queryWrapper, Integer page, Integer rows); + /** + * 读取购物车(不分页) + * + * @param queryWrapper + * @return + */ + Map getLists(QueryWrapper queryWrapper); + /** * 修改购物车数量 * diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java index 60abdc46..4b38b8c0 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java @@ -1216,6 +1216,7 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl queryWrapper, Integer page, Integer rows) { Page userCartPage = lists(queryWrapper, page, rows); @@ -1229,6 +1230,7 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl queryWrapper) { List cart_rows = find(queryWrapper); @@ -2287,7 +2289,7 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl