From 0ddc86f819e167ef658c7248c6973d5e1b9fe993 Mon Sep 17 00:00:00 2001 From: wst <2450473462@qq.com> Date: Fri, 6 Dec 2024 16:13:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=A7=84=E6=A0=BC=E4=BF=A1=E6=81=AF=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=BB=8E=E5=95=86=E5=9F=8E=E6=8B=BF=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/skyeye/order/entity/OrderItem.java | 2 +- .../service/impl/OrderItemServiceImpl.java | 4 +-- .../order/service/impl/OrderServiceImpl.java | 26 ++++++++++--------- .../skyeye/store/entity/ShopTradeCart.java | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderItem.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderItem.java index b1c31246..3971b49e 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderItem.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/entity/OrderItem.java @@ -74,7 +74,7 @@ public class OrderItem extends OperatorUserInfo { private Integer count; @TableField("comment_state") - @Property(value = "是否评价",enumClass = WhetherEnum.class) + @Property(value = "是否评价", enumClass = WhetherEnum.class) private Integer commentState; @TableField("price") diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderItemServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderItemServiceImpl.java index 85eaccdf..a0b39bd8 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderItemServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderItemServiceImpl.java @@ -118,7 +118,7 @@ public class OrderItemServiceImpl extends SkyeyeBusinessServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq(CommonConstants.ID, id) .set(MybatisPlusUtil.toColumns(OrderItem::getCommentState), WhetherEnum.ENABLE_USING.getKey()); @@ -135,7 +135,7 @@ public class OrderItemServiceImpl extends SkyeyeBusinessServiceImpl updateWrapper = new UpdateWrapper<>(); diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java index ee9e0cec..a7632259 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java @@ -13,8 +13,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.google.common.base.Joiner; import com.skyeye.annotation.service.SkyeyeService; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; +import com.skyeye.common.constans.CommonCharConstants; import com.skyeye.common.constans.CommonConstants; import com.skyeye.common.constans.CommonNumConstants; import com.skyeye.common.constans.QuartzConstants; @@ -31,8 +33,6 @@ import com.skyeye.coupon.enums.PromotionDiscountType; import com.skyeye.coupon.enums.PromotionMaterialScope; import com.skyeye.coupon.service.CouponUseMaterialService; import com.skyeye.coupon.service.CouponUseService; -import com.skyeye.erp.service.IMaterialNormsService; -import com.skyeye.erp.service.IMaterialService; import com.skyeye.eve.rest.quartz.SysQuartzMation; import com.skyeye.eve.service.IAreaService; import com.skyeye.eve.service.IQuartzService; @@ -47,6 +47,7 @@ import com.skyeye.order.enums.ShopOrderState; import com.skyeye.order.service.OrderItemService; import com.skyeye.order.service.OrderService; import com.skyeye.rest.pay.service.IPayService; +import com.skyeye.rest.shopmaterialnorms.sevice.IShopMaterialNormsService; import com.skyeye.store.entity.ShopAddress; import com.skyeye.store.service.ShopAddressService; import com.skyeye.store.service.ShopTradeCartService; @@ -79,10 +80,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl private IAreaService iAreaService; @Autowired - private IMaterialService iMaterialService; - - @Autowired - private IMaterialNormsService iMaterialNormsService; + private IShopMaterialNormsService iShopMaterialNormsService; @Autowired private CouponUseService couponUseService; @@ -134,17 +132,21 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl checkAndSetVariable(order); // 活动信息及积分操作方法 checkAndSetActive(order); - refreshCache(order.getId()); } private void checkAndSetItemCouponUse(Order order) {// 子单的优惠券操作 List orderItemList = order.getOrderItemList(); // 设置商品信息、商品规格信息和优惠券信息 - iMaterialNormsService.setDataMation(orderItemList, OrderItem::getNormsId); - iMaterialService.setDataMation(orderItemList, OrderItem::getMaterialId); + List normsIdList = orderItemList.stream().map(OrderItem::getNormsId).collect(Collectors.toList()); + List> normsListMap = iShopMaterialNormsService.queryShopMaterialByNormsIdList(Joiner.on(CommonCharConstants.COMMA_MARK).join(normsIdList)); + Map normsPriceMap = normsListMap.stream() + .collect(Collectors.toMap(map -> map.get("normsId").toString(), map -> map.get("salePrice").toString())); for (OrderItem orderItem : orderItemList) {// 计算每一个子单的总价 + if (!normsPriceMap.containsKey(orderItem.getNormsId())) { + throw new CustomException("商城不存在normsId: " + orderItem.getNormsId()); + } // 获取子单单价 元 -> 分 - String salePrice = CalculationUtil.multiply(orderItem.getNormsMation().get("salePrice").toString(), "100"); + String salePrice = CalculationUtil.multiply(normsPriceMap.get(orderItem.getNormsId()), "100"); // 设置子单总价 String price = CalculationUtil.multiply(String.valueOf(orderItem.getCount()), salePrice, CommonNumConstants.NUM_SIX); orderItem.setPrice(price); @@ -354,7 +356,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl ShopOrderState.COMPLETED.getKey(), // 已完成 ShopOrderState.UNEVALUATE.getKey(), // 待评价 ShopOrderState.EVALUATED.getKey()});// 已评价 - ShopOrderState.PARTIALLYDONE.getKey();//部分完成 + ShopOrderState.PARTIALLYDONE.getKey();//部分完成 break; case "4":// 已取消 stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()}); @@ -605,7 +607,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl orderItemService.UpdateOrderItemState(orderItemId); List orderItemList = orderItemService.queryOrderItemByParentId(orderId); boolean allTwo = orderItemList.stream().map(OrderItem::getOrderItemState) - .allMatch(orderItemState -> orderItemState == CommonNumConstants.NUM_TWO); + .allMatch(orderItemState -> orderItemState == CommonNumConstants.NUM_TWO); if (allTwo) { Integer partiallydoneKey = ShopOrderState.COMPLETED.getKey(); updateOrderState(orderId, partiallydoneKey); diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/entity/ShopTradeCart.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/entity/ShopTradeCart.java index 3f05f0f3..a2e04a3c 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/entity/ShopTradeCart.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/entity/ShopTradeCart.java @@ -65,6 +65,6 @@ public class ShopTradeCart extends OperatorUserInfo { private Integer count; @TableField("selected") - @ApiModelProperty(value = "是否选中", required = "required,num",enumClass = WhetherEnum.class) + @ApiModelProperty(value = "是否选中", required = "required,num", enumClass = WhetherEnum.class) private Integer selected; } From 3554cfeac9f69a84daf94a6b29722129ac385417 Mon Sep 17 00:00:00 2001 From: luluyuyu <3305167204@qq.com> Date: Fri, 6 Dec 2024 16:26:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=84=E4=BB=B7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/skyeye/order/enums/ShopOrderState.java | 3 ++- .../com/skyeye/order/service/OrderService.java | 2 ++ .../service/impl/OrderCommentServiceImpl.java | 11 ++++++++--- .../order/service/impl/OrderServiceImpl.java | 16 ++++++++++++---- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/enums/ShopOrderState.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/enums/ShopOrderState.java index 5382a36f..03c74a80 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/enums/ShopOrderState.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/enums/ShopOrderState.java @@ -40,7 +40,8 @@ public enum ShopOrderState implements SkyeyeEnumClass { SALESRETURNED(15, "已退货", true, false), EXCHANGEING(16, "换货中", true, false), EXCHANGED(17, "已换货", true, false), - PARTIALLYDONE(18,"部分完成",true,false); + PARTIALLYDONE(18,"部分完成",true,false), + PARTIALEVALUATION(19,"部分评价",true,false); private Integer key; diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/OrderService.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/OrderService.java index 8be9e4fe..bc788b07 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/OrderService.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/OrderService.java @@ -39,4 +39,6 @@ public interface OrderService extends SkyeyeBusinessService { void setOrderCancle(String orderId); void updateOrderItemState(InputObject inputObject, OutputObject outputObject); + + void updateOrderState(String orderId, Integer partiallydoneKey); } diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java index c121032d..2d2ddcab 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java @@ -28,6 +28,7 @@ import com.skyeye.order.entity.OrderComment; import com.skyeye.order.entity.OrderItem; import com.skyeye.order.enums.OrderCommentType; import com.skyeye.order.enums.ShopOrderCommentState; +import com.skyeye.order.enums.ShopOrderState; import com.skyeye.order.service.OrderCommentService; import com.skyeye.order.service.OrderItemService; import com.skyeye.order.service.OrderService; @@ -144,10 +145,14 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl orderItemList = orderItemService.queryListByStateAndOrderId(orderComment.getOrderId(), WhetherEnum.DISABLE_USING.getKey()); - if (CollectionUtil.isNotEmpty(orderItemList)) {// 总订单的评价状态修改 - orderService.updateCommonState(orderComment.getOrderId(), ShopOrderCommentState.PORTION.getKey()); - } else { + boolean allMatch = orderItemList.stream() + .allMatch(Orderitem -> Orderitem.getCommentState() == WhetherEnum.ENABLE_USING.getKey()); + if (allMatch){ orderService.updateCommonState(orderComment.getOrderId(), ShopOrderCommentState.FINISHED.getKey()); + orderService.updateOrderState(orderComment.getOrderId(), ShopOrderState.EVALUATED.getKey()); + }else { + orderService.updateCommonState(orderComment.getOrderId(), ShopOrderCommentState.PORTION.getKey()); + orderService.updateOrderState(orderComment.getOrderId(), ShopOrderState.PARTIALEVALUATION.getKey()); } } } diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java index 5f49a835..b92ba34d 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java @@ -285,7 +285,9 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl ShopOrderState.SIGN.getKey(), // 已签收 ShopOrderState.COMPLETED.getKey(), // 已完成 ShopOrderState.UNEVALUATE.getKey(), // 待评价 - ShopOrderState.EVALUATED.getKey()});// 已评价 + ShopOrderState.EVALUATED.getKey(),// 已评价 + ShopOrderState.PARTIALLYDONE.getKey(),//部分完成 + ShopOrderState.PARTIALEVALUATION.getKey()});//部分评价 break; case "4":// 已取消 stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()}); @@ -348,8 +350,9 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl ShopOrderState.SIGN.getKey(), // 已签收 ShopOrderState.COMPLETED.getKey(), // 已完成 ShopOrderState.UNEVALUATE.getKey(), // 待评价 - ShopOrderState.EVALUATED.getKey()});// 已评价 - ShopOrderState.PARTIALLYDONE.getKey();//部分完成 + ShopOrderState.EVALUATED.getKey(),// 已评价 + ShopOrderState.PARTIALLYDONE.getKey(),//部分完成 + ShopOrderState.PARTIALEVALUATION.getKey()});//部分评价 break; case "4":// 已取消 stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()}); @@ -372,6 +375,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl } String userId = InputObject.getLogParamsStatic().get("id").toString(); wrapper.eq(MybatisPlusUtil.toColumns(Order::getCreateId), userId);// 查询自己的订单 + wrapper.eq(MybatisPlusUtil.toColumns(Order::getType),commonPageInfo.getType()); wrapper.orderByDesc(MybatisPlusUtil.toColumns(Order::getCreateTime)); List list = list(wrapper); if (CollectionUtil.isEmpty(list)) { @@ -390,6 +394,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl shopAddressService.setDataMation(list, Order::getAddressId); outputObject.setBeans(JSONUtil.toList(JSONUtil.toJsonStr(list), null)); outputObject.settotal(pages.getTotal()); + refreshCache(idList); } @Override @@ -434,6 +439,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl iAreaService.setDataMation(order, Order::getTownshipId); shopAddressService.setDataMation(order, Order::getAddressId); pennyToYuan(order);// 分 -> 元 + refreshCache(id); return order; } @@ -610,7 +616,9 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl } } - private void updateOrderState(String orderId, Integer partiallydoneKey) { + + @Override + public void updateOrderState(String orderId, Integer partiallydoneKey) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq(CommonConstants.ID, orderId); updateWrapper.set(MybatisPlusUtil.toColumns(Order::getState), partiallydoneKey); From 113ce4fd7f9de3e26c254dfa70d7041411a25468 Mon Sep 17 00:00:00 2001 From: luluyuyu <3305167204@qq.com> Date: Fri, 6 Dec 2024 16:32:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skyeye/order/service/impl/OrderCommentServiceImpl.java | 1 + .../java/com/skyeye/order/service/impl/OrderServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java index 6184c2a2..fcb58363 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java @@ -167,6 +167,7 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl iAreaService.setDataMation(order, Order::getTownshipId); shopAddressService.setDataMation(order, Order::getAddressId); pennyToYuan(order);// 分 -> 元 + refreshCache(id); return order; } @@ -617,7 +618,8 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl } } - private void updateOrderState(String orderId, Integer partiallydoneKey) { + @Override + public void updateOrderState(String orderId, Integer partiallydoneKey) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq(CommonConstants.ID, orderId); updateWrapper.set(MybatisPlusUtil.toColumns(Order::getState), partiallydoneKey); From 2ebba174f3157f08c9eb6ebe95a57d7a0650c0fd Mon Sep 17 00:00:00 2001 From: wst <2450473462@qq.com> Date: Fri, 6 Dec 2024 16:38:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=94=B9=E4=B8=BA0=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=95=B0?= =?UTF-8?q?=E9=87=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/skyeye/order/conroller/OrderCommentController.java | 2 +- .../com/skyeye/store/service/impl/ShopTradeCartServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/conroller/OrderCommentController.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/conroller/OrderCommentController.java index 248f88aa..4b17e5bc 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/conroller/OrderCommentController.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/conroller/OrderCommentController.java @@ -78,7 +78,7 @@ public class OrderCommentController { * @param inputObject 入参以及用户信息等获取对象 * @param outputObject 出参以及提示信息的返回值对象 */ - @ApiOperation(id = "queryOrderCommentPageList", value = "分页查询商品订单评价信息", method = "POST", allUse = "2") + @ApiOperation(id = "queryOrderCommentPageList", value = "分页查询商品订单评价信息", method = "POST", allUse = "0") @ApiImplicitParams(classBean = CommonPageInfo.class) @RequestMapping("/post/OrderCommentController/queryOrderCommentPageList") public void queryOrderCommentPageList(InputObject inputObject, OutputObject outputObject) { diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopTradeCartServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopTradeCartServiceImpl.java index 7200f731..b4a703ff 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopTradeCartServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/store/service/impl/ShopTradeCartServiceImpl.java @@ -118,6 +118,7 @@ public class ShopTradeCartServiceImpl extends SkyeyeBusinessServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq(MybatisPlusUtil.toColumns(ShopTradeCart::getMaterialId), shopTradeCart.getMaterialId()); queryWrapper.eq(MybatisPlusUtil.toColumns(ShopTradeCart::getNormsId), shopTradeCart.getNormsId()); + queryWrapper.eq(CommonConstants.ID,userId); ShopTradeCart one = getOne(queryWrapper); if (ObjectUtil.isNotEmpty(one)) { shopTradeCart.setId(one.getId()); From 12ad90cbe812d7542e6529b29a2e6f906f074df0 Mon Sep 17 00:00:00 2001 From: luluyuyu <3305167204@qq.com> Date: Fri, 6 Dec 2024 19:37:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderServiceImpl.java | 75 ++++++++++--------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java index cbf57c56..269d0d04 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java @@ -140,7 +140,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl List normsIdList = orderItemList.stream().map(OrderItem::getNormsId).collect(Collectors.toList()); List> normsListMap = iShopMaterialNormsService.queryShopMaterialByNormsIdList(Joiner.on(CommonCharConstants.COMMA_MARK).join(normsIdList)); Map normsPriceMap = normsListMap.stream() - .collect(Collectors.toMap(map -> map.get("normsId").toString(), map -> map.get("salePrice").toString())); + .collect(Collectors.toMap(map -> map.get("normsId").toString(), map -> map.get("salePrice").toString())); for (OrderItem orderItem : orderItemList) {// 计算每一个子单的总价 if (!normsPriceMap.containsKey(orderItem.getNormsId())) { throw new CustomException("商城不存在normsId: " + orderItem.getNormsId()); @@ -192,7 +192,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl setOrderAndOrderItem(couponUse, order, orderItem);// 操作订单和子单的优惠券 } else if (Objects.equals(couponUse.getProductScope(), PromotionMaterialScope.SPU.getKey())) {// 指定商品 List couponUseMaterialIds = couponUseMaterialService.queryListByCouponIds(Collections.singletonList(couponUseId)) - .stream().map(CouponUseMaterial::getMaterialId).collect(Collectors.toList());// 收集子单商品id + .stream().map(CouponUseMaterial::getMaterialId).collect(Collectors.toList());// 收集子单商品id List newOrderItemList = new ArrayList<>(); for (OrderItem item : orderItemList) {// 筛选出优惠券可用的商品 if (couponUseMaterialIds.contains(item.getMaterialId())) { @@ -283,33 +283,35 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl break; case "2": // 待收货 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.UNDELIVERED.getKey(),// 待发货 - ShopOrderState.DELIVERED.getKey(), // 已发货 - ShopOrderState.TRANSPORTING.getKey()});//运输中 + ShopOrderState.UNDELIVERED.getKey(),// 待发货 + ShopOrderState.DELIVERED.getKey(), // 已发货 + ShopOrderState.TRANSPORTING.getKey()});//运输中 break; case "3":// 已完成 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.SIGN.getKey(), // 已签收 - ShopOrderState.COMPLETED.getKey(), // 已完成 - ShopOrderState.UNEVALUATE.getKey(), // 待评价 - ShopOrderState.EVALUATED.getKey()});// 已评价 + ShopOrderState.SIGN.getKey(), // 已签收 + ShopOrderState.COMPLETED.getKey(), // 已完成 + ShopOrderState.UNEVALUATE.getKey(), // 待评价 + ShopOrderState.EVALUATED.getKey(),// 已评价 + ShopOrderState.PARTIALLYDONE.getKey(),//部分完成 + ShopOrderState.PARTIALEVALUATION.getKey()});//部分评价 break; case "4":// 已取消 stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()}); break; case "5":// 处理中 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.REFUNDING.getKey(), // 退款中 + ShopOrderState.REFUNDING.getKey(), // 退款中 - ShopOrderState.SALESRETURNING.getKey(),//退货中 + ShopOrderState.SALESRETURNING.getKey(),//退货中 - ShopOrderState.EXCHANGEING.getKey()});//换货中 + ShopOrderState.EXCHANGEING.getKey()});//换货中 break; case "6": // 申请记录 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.REFUND.getKey(), // 已退款 - ShopOrderState.SALESRETURNED.getKey(),//已退货 - ShopOrderState.EXCHANGED.getKey()});//已换货 + ShopOrderState.REFUND.getKey(), // 已退款 + ShopOrderState.SALESRETURNED.getKey(),//已退货 + ShopOrderState.EXCHANGED.getKey()});//已换货 } QueryWrapper wrapper = super.getQueryWrapper(commonPageInfo); if (CollectionUtil.isNotEmpty(stateList)) { // 状态列表为空时，则查询全部订单 @@ -346,32 +348,33 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl break; case "2": // 待收货 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.UNDELIVERED.getKey(),// 待发货 - ShopOrderState.DELIVERED.getKey(), // 已发货 - ShopOrderState.TRANSPORTING.getKey()});//运输中 + ShopOrderState.UNDELIVERED.getKey(),// 待发货 + ShopOrderState.DELIVERED.getKey(), // 已发货 + ShopOrderState.TRANSPORTING.getKey()});//运输中 break; case "3":// 已完成 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.SIGN.getKey(), // 已签收 - ShopOrderState.COMPLETED.getKey(), // 已完成 - ShopOrderState.UNEVALUATE.getKey(), // 待评价 - ShopOrderState.EVALUATED.getKey()});// 已评价 - ShopOrderState.PARTIALLYDONE.getKey();//部分完成 + ShopOrderState.SIGN.getKey(), // 已签收 + ShopOrderState.COMPLETED.getKey(), // 已完成 + ShopOrderState.UNEVALUATE.getKey(), // 待评价 + ShopOrderState.EVALUATED.getKey(),// 已评价 + ShopOrderState.PARTIALLYDONE.getKey(),//部分完成 + ShopOrderState.PARTIALEVALUATION.getKey()});//部分评价 break; case "4":// 已取消 stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()}); break; case "5":// 处理中 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.REFUNDING.getKey(), // 退款中 - ShopOrderState.SALESRETURNING.getKey(),//退货中 - ShopOrderState.EXCHANGEING.getKey()});//换货中 + ShopOrderState.REFUNDING.getKey(), // 退款中 + ShopOrderState.SALESRETURNING.getKey(),//退货中 + ShopOrderState.EXCHANGEING.getKey()});//换货中 break; case "6": // 申请记录 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.REFUND.getKey(), // 已退款 - ShopOrderState.SALESRETURNED.getKey(),//已退货 - ShopOrderState.EXCHANGED.getKey()});//已换货 + ShopOrderState.REFUND.getKey(), // 已退款 + ShopOrderState.SALESRETURNED.getKey(),//已退货 + ShopOrderState.EXCHANGED.getKey()});//已换货 } QueryWrapper wrapper = new QueryWrapper<>(); if (CollectionUtil.isNotEmpty(stateList)) { // 状态列表为空时，则查询全部订单 @@ -480,9 +483,9 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl } // 可取消的订单状态：未提交(0)、已提交(1)、待支付(2)、待发货(5) if (Objects.equals(one.getState(), ShopOrderState.UNSUBMIT.getKey()) || - Objects.equals(one.getState(), ShopOrderState.SUBMIT.getKey()) || - Objects.equals(one.getState(), ShopOrderState.UNPAID.getKey()) || - Objects.equals(one.getState(), ShopOrderState.UNDELIVERED.getKey())) { + Objects.equals(one.getState(), ShopOrderState.SUBMIT.getKey()) || + Objects.equals(one.getState(), ShopOrderState.UNPAID.getKey()) || + Objects.equals(one.getState(), ShopOrderState.UNDELIVERED.getKey())) { updateWrapper.set(MybatisPlusUtil.toColumns(Order::getState), ShopOrderState.CANCELED.getKey()); updateWrapper.set(MybatisPlusUtil.toColumns(Order::getCancelType), params.get("cancelType")); updateWrapper.set(MybatisPlusUtil.toColumns(Order::getCancelTime), DateUtil.getTimeAndToString()); @@ -537,7 +540,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl updateWrapper.set(MybatisPlusUtil.toColumns(Order::getPayTime), payOrderRespDTO.get("successTime").toString()); updateWrapper.set(MybatisPlusUtil.toColumns(Order::getChannelFeeRate), payChannel.get("feeRate").toString()); updateWrapper.set(MybatisPlusUtil.toColumns(Order::getChannelFeePrice), CalculationUtil.multiply( - one.getPayPrice(), payChannel.get("feeRate").toString())); + one.getPayPrice(), payChannel.get("feeRate").toString())); updateWrapper.set(MybatisPlusUtil.toColumns(Order::getExtensionId), payOrderRespDTO.get("id").toString()); updateWrapper.set(MybatisPlusUtil.toColumns(Order::getExtensionNo), payOrderRespDTO.get("no").toString()); update(updateWrapper); @@ -594,8 +597,8 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq(CommonConstants.ID, orderId); updateWrapper.set(MybatisPlusUtil.toColumns(Order::getState), ShopOrderState.CANCELED.getKey()) - .set(MybatisPlusUtil.toColumns(Order::getCancelType), ShopOrderCancelType.PAY_TIMEOUT.getKey()) - .set(MybatisPlusUtil.toColumns(Order::getCancelTime), DateUtil.getTimeAndToString()); + .set(MybatisPlusUtil.toColumns(Order::getCancelType), ShopOrderCancelType.PAY_TIMEOUT.getKey()) + .set(MybatisPlusUtil.toColumns(Order::getCancelTime), DateUtil.getTimeAndToString()); update(updateWrapper); refreshCache(orderId); } @@ -608,7 +611,7 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl orderItemService.UpdateOrderItemState(orderItemId); List orderItemList = orderItemService.queryOrderItemByParentId(orderId); boolean allTwo = orderItemList.stream().map(OrderItem::getOrderItemState) - .allMatch(orderItemState -> orderItemState == CommonNumConstants.NUM_TWO); + .allMatch(orderItemState -> orderItemState == CommonNumConstants.NUM_TWO); if (allTwo) { Integer partiallydoneKey = ShopOrderState.COMPLETED.getKey(); updateOrderState(orderId, partiallydoneKey); From 424fdb7636a2391b7b3f9d1d5fdb9631685c4ebc Mon Sep 17 00:00:00 2001 From: wst <2450473462@qq.com> Date: Fri, 6 Dec 2024 20:00:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=84=E4=BB=B7=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=90=E8=AE=A2=E5=8D=95=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=88=A4=E6=96=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderCommentServiceImpl.java | 17 ++++++---- .../order/service/impl/OrderServiceImpl.java | 32 ++++++++++--------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java index fcb58363..0e5e378e 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderCommentServiceImpl.java @@ -95,6 +95,9 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl orderItemList = orderItemService.queryListByStateAndOrderId(orderComment.getOrderId(), WhetherEnum.DISABLE_USING.getKey()); boolean allMatch = orderItemList.stream() - .allMatch(Orderitem -> Orderitem.getCommentState() == WhetherEnum.ENABLE_USING.getKey()); - if (allMatch){ + .allMatch(Orderitem -> Orderitem.getCommentState() == WhetherEnum.ENABLE_USING.getKey()); + if (allMatch) { orderService.updateCommonState(orderComment.getOrderId(), ShopOrderCommentState.FINISHED.getKey()); orderService.updateOrderState(orderComment.getOrderId(), ShopOrderState.EVALUATED.getKey()); - }else { + } else { orderService.updateCommonState(orderComment.getOrderId(), ShopOrderCommentState.PORTION.getKey()); orderService.updateOrderState(orderComment.getOrderId(), ShopOrderState.PARTIALEVALUATION.getKey()); } @@ -194,7 +197,7 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl getOrderCommentListByType(String typeId, Integer type,String objectId) { + private List getOrderCommentListByType(String typeId, Integer type, String objectId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(MybatisPlusUtil.toColumns(OrderComment::getType), type) .and(wrap -> { @@ -220,9 +223,9 @@ public class OrderCommentServiceImpl extends SkyeyeBusinessServiceImpl customerFirst = getOrderCommentListByType(typeId, OrderCommentType.CUSTOMERFiRST.getKey(),objectId); - List customerLater = getOrderCommentListByType(typeId, OrderCommentType.CUSTOMERLATER.getKey(),objectId); - List merchantReply = getOrderCommentListByType(typeId, OrderCommentType.MERCHANT.getKey(),objectId); + List customerFirst = getOrderCommentListByType(typeId, OrderCommentType.CUSTOMERFiRST.getKey(), objectId); + List customerLater = getOrderCommentListByType(typeId, OrderCommentType.CUSTOMERLATER.getKey(), objectId); + List merchantReply = getOrderCommentListByType(typeId, OrderCommentType.MERCHANT.getKey(), objectId); if (CollectionUtil.isEmpty(customerFirst)) { return; } diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java index cbf57c56..186c8797 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java @@ -340,38 +340,40 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl CommonPageInfo commonPageInfo = inputObject.getParams(CommonPageInfo.class); Page pages = PageHelper.startPage(commonPageInfo.getPage(), commonPageInfo.getLimit()); List stateList = new ArrayList<>(); - switch (commonPageInfo.getType()) { + switch (StrUtil.isEmpty(commonPageInfo.getType()) ? "0" : commonPageInfo.getType()) { + // todo 未提交、已提交和支付失败三个枚举未现 case "1": // 未支付 stateList = Arrays.asList(new Integer[]{ShopOrderState.UNPAID.getKey()}); break; case "2": // 待收货 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.UNDELIVERED.getKey(),// 待发货 - ShopOrderState.DELIVERED.getKey(), // 已发货 - ShopOrderState.TRANSPORTING.getKey()});//运输中 + ShopOrderState.UNDELIVERED.getKey(), // 待发货 + ShopOrderState.DELIVERED.getKey(), // 已发货 + ShopOrderState.TRANSPORTING.getKey()}); // 运输中 break; case "3":// 已完成 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.SIGN.getKey(), // 已签收 - ShopOrderState.COMPLETED.getKey(), // 已完成 - ShopOrderState.UNEVALUATE.getKey(), // 待评价 - ShopOrderState.EVALUATED.getKey()});// 已评价 - ShopOrderState.PARTIALLYDONE.getKey();//部分完成 + ShopOrderState.SIGN.getKey(), // 已签收 + ShopOrderState.COMPLETED.getKey(), // 已完成 + ShopOrderState.UNEVALUATE.getKey(), // 待评价 + ShopOrderState.EVALUATED.getKey(), // 已评价 + ShopOrderState.PARTIALLYDONE.getKey(), // 部分完成 + ShopOrderState.PARTIALEVALUATION.getKey()});// 部分评价 break; case "4":// 已取消 stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()}); break; case "5":// 处理中 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.REFUNDING.getKey(), // 退款中 - ShopOrderState.SALESRETURNING.getKey(),//退货中 - ShopOrderState.EXCHANGEING.getKey()});//换货中 + ShopOrderState.REFUNDING.getKey(), // 退款中 + ShopOrderState.SALESRETURNING.getKey(), // 退货中 + ShopOrderState.EXCHANGEING.getKey()}); // 换货中 break; case "6": // 申请记录 stateList = Arrays.asList(new Integer[]{ - ShopOrderState.REFUND.getKey(), // 已退款 - ShopOrderState.SALESRETURNED.getKey(),//已退货 - ShopOrderState.EXCHANGED.getKey()});//已换货 + ShopOrderState.REFUND.getKey(), // 已退款 + ShopOrderState.SALESRETURNED.getKey(), // 已退货 + ShopOrderState.EXCHANGED.getKey()}); // 已换货 } QueryWrapper wrapper = new QueryWrapper<>(); if (CollectionUtil.isNotEmpty(stateList)) { // 状态列表为空时，则查询全部订单