buyer-api/src/main/java/cn/lili/controller/lmk/SupplierController.java
@@ -1,6 +1,7 @@ package cn.lili.controller.lmk; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.OperationalJudgment; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; @@ -8,16 +9,26 @@ import cn.lili.modules.goods.service.CategoryService; import cn.lili.modules.member.entity.dos.Clerk; import cn.lili.modules.member.service.ClerkService; import cn.lili.modules.member.service.StoreLogisticsService; import cn.lili.modules.order.order.entity.dto.PartDeliveryParamsDTO; import cn.lili.modules.order.order.entity.dto.SupplierOrderSearchParams; import cn.lili.modules.order.order.entity.vo.OrderDetailVO; import cn.lili.modules.order.order.entity.vo.OrderSimpleXcxVO; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.store.service.StoreDetailService; import cn.lili.modules.system.entity.vo.StoreLogisticsVO; import cn.lili.utils.COSUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotNull; import java.util.List; import java.util.Objects; @@ -37,8 +48,22 @@ */ @Autowired private StoreDetailService storeDetailService; /** * 物流公司 */ @Autowired private StoreLogisticsService storeLogisticsService; /** * 订单 */ @Autowired private OrderService orderService; @Autowired private COSUtil cosUtil; @Autowired private ClerkService clerkService; @ApiOperation(value = "获取店铺经营的分类") @GetMapping(value = "/allCategery") public ResultMessage<List<CategoryVO>> getListAll() { @@ -53,4 +78,53 @@ String goodsManagementCategory = storeDetailService.getStoreDetail(storeId).getGoodsManagementCategory(); return ResultUtil.data(this.categoryService.getStoreCategory(goodsManagementCategory.split(","))); } @ApiOperation(value = "查询会员订单列表") @GetMapping("/orderList") public ResultMessage<IPage<OrderSimpleXcxVO>> orderList(SupplierOrderSearchParams orderSearchParams) { String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId(); if (StringUtils.isEmpty(storeId)) { Clerk clerk = clerkService.getClerkByMemberId(UserContext.getCurrentUserId()); orderSearchParams.setStoreId(clerk.getStoreId()); } else { orderSearchParams.setStoreId(storeId); } return ResultUtil.data(orderService.querySupplierOrderParams(orderSearchParams)); } @ApiOperation(value = "订单明细") @ApiImplicitParams({ @ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, dataType = "String", paramType = "path") }) @GetMapping(value = "/orderDetail/{orderSn}") public ResultMessage<OrderDetailVO> detail(@NotNull @PathVariable String orderSn) { OperationalJudgment.judgment(orderService.getBySn(orderSn)); OrderDetailVO orderDetailVO = orderService.queryDetail(orderSn); orderDetailVO.getOrderItems().forEach(orderItem -> { String image = orderItem.getImage(); if (StringUtils.isNotBlank(image) && !image.contains("http")) { orderItem.setImage(cosUtil.getPreviewUrl(image)); } }); return ResultUtil.data(orderDetailVO); } @ApiOperation(value = "获取商家已选择物流公司列表") @GetMapping("/getChecked") public ResultMessage<List<StoreLogisticsVO>> getChecked() { String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId(); return ResultUtil.data(storeLogisticsService.getStoreSelectedLogistics(storeId)); } @ApiOperation(value = "订单包裹发货") @ApiImplicitParams({ @ApiImplicitParam(name = "orderSn", value = "订单sn", required = true, dataType = "String", paramType = "path"), @ApiImplicitParam(name = "logisticsNo", value = "发货单号", required = true, dataType = "String", paramType = "query"), @ApiImplicitParam(name = "logisticsId", value = "物流公司", required = true, dataType = "String", paramType = "query") }) @PostMapping(value = "/{orderSn}/partDelivery") public ResultMessage<Object> delivery(@RequestBody PartDeliveryParamsDTO partDeliveryParamsDTO) { return ResultUtil.data(orderService.partDelivery(partDeliveryParamsDTO)); } } consumer/src/main/resources/application.yml
@@ -38,7 +38,7 @@ redis: host: 127.0.0.1 port: 6379 # password: lilishop # password: lilishop lettuce: pool: # 连接池最大连接数（使用负值表示没有限制） 默认 8 @@ -247,8 +247,8 @@ # account: # username: elastic # password: LiLiShopES # logstash: # server: 127.0.0.1:4560 # logstash: # server: 127.0.0.1:4560 rocketmq: promotion-topic: lili_promotion_topic promotion-group: lili_promotion_group framework/src/main/java/cn/lili/modules/order/order/entity/dto/SupplierOrderSearchParams.java
New file @@ -0,0 +1,227 @@ package cn.lili.modules.order.order.entity.dto; import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.DateUtil; import cn.lili.common.vo.PageVO; import cn.lili.modules.order.order.entity.enums.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** * 订单查询参数 * * @author Chopper * @since 2020/11/17 4:33 下午 */ @EqualsAndHashCode(callSuper = true) @Data public class SupplierOrderSearchParams extends PageVO { private static final long serialVersionUID = -6380573339089959194L; @ApiModelProperty(value = "商品名称") private String goodsName; @ApiModelProperty(value = "订单编号") private String orderSn; @ApiModelProperty(value = "页面标签", example = "ALL:全部," + "WAIT_PAY:待付款," + "WAIT_ROG:待收货," + "CANCELLED:已取消," + "COMPLETE:已完成") private String tag; @ApiModelProperty(value = "商家ID") private String storeId; @ApiModelProperty(value = "会员ID") private String memberId; @ApiModelProperty(value = "收货人") private String shipName; @ApiModelProperty(value = "买家昵称") private String buyerName; @ApiModelProperty(value = "订单状态") private String orderStatus; @ApiModelProperty(value = "付款状态") private String payStatus; @ApiModelProperty(value = "关键字 商品名称/买家名称/店铺名称") private String keywords; @ApiModelProperty(value = "付款方式") private String paymentType; /** * @see OrderTypeEnum * @see OrderPromotionTypeEnum */ @ApiModelProperty(value = "订单类型", allowableValues = "NORMAL,VIRTUAL,GIFT,PINTUAN,POINT") private String orderType; @ApiModelProperty(value = "支付方式") private String paymentMethod; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "支付时间") private Date paymentTime; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "下单开始时间") private Date startDate; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "下单结束时间") private Date endDate; @ApiModelProperty(value = "订单来源") private String clientType; /** * @see CommentStatusEnum */ @ApiModelProperty(value = "评论状态:未评论(UNFINISHED),待追评(WAIT_CHASE),评论完成(FINISHED)，") private String commentStatus; @ApiModelProperty(value = "是否为其他订单下的订单，如果是则为依赖订单的sn，否则为空") private String parentOrderSn; @ApiModelProperty(value = "是否为某订单类型的订单，如果是则为订单类型的id，否则为空") private String promotionId; @ApiModelProperty(value = "总价格,可以为范围，如10_1000") private String flowPrice; /** * @see OrderPromotionTypeEnum */ @ApiModelProperty(value = "订单促销类型") private String orderPromotionType; public <T> QueryWrapper<T> queryWrapper() { AuthUser currentUser = UserContext.getCurrentUser(); QueryWrapper<T> wrapper = new QueryWrapper<>(); //关键字查询 if (CharSequenceUtil.isNotEmpty(keywords)) { wrapper.and(keyWrapper -> keyWrapper.like("o.sn", keywords).or().like("oi.goods_name", keywords)); } // if (currentUser != null) { // //按卖家查询 // wrapper.eq(CharSequenceUtil.equals(currentUser.getRole().name(), UserEnums.STORE.name()), "o.store_id", currentUser.getStoreId()); // // //店铺查询 // wrapper.eq(CharSequenceUtil.equals(currentUser.getRole().name(), UserEnums.MANAGER.name()) // && CharSequenceUtil.isNotEmpty(storeId), "o.store_id", storeId); // // //按买家查询 // wrapper.eq(CharSequenceUtil.equals(currentUser.getRole().name(), UserEnums.MEMBER.name()) && memberId == null, "o.member_id", currentUser.getId()); // // } wrapper.eq( CharSequenceUtil.isNotEmpty(storeId), "o.store_id", storeId); //按照买家查询 wrapper.like(CharSequenceUtil.isNotEmpty(memberId), "o.member_id", memberId); //按订单编号查询 wrapper.like(CharSequenceUtil.isNotEmpty(orderSn), "o.sn", orderSn); //按时间查询 wrapper.ge(startDate != null, "o.create_time", startDate); wrapper.le(endDate != null, "o.create_time", DateUtil.endOfDate(endDate)); //按购买人用户名 wrapper.like(CharSequenceUtil.isNotEmpty(buyerName), "o.member_name", buyerName); //按订单类型 wrapper.eq(CharSequenceUtil.isNotEmpty(orderType), "o.order_type", orderType); //物流查询 wrapper.like(CharSequenceUtil.isNotEmpty(shipName), "o.consignee_name", shipName); //按商品名称查询 wrapper.like(CharSequenceUtil.isNotEmpty(goodsName), "oi.goods_name", goodsName); //付款方式 wrapper.like(CharSequenceUtil.isNotEmpty(paymentType), "o.payment_type", paymentType); //按支付方式 wrapper.eq(CharSequenceUtil.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod); //订单状态 wrapper.eq(CharSequenceUtil.isNotEmpty(orderStatus), "o.order_status", orderStatus); //付款状态 wrapper.eq(CharSequenceUtil.isNotEmpty(payStatus), "o.pay_status", payStatus); //订单来源 wrapper.like(CharSequenceUtil.isNotEmpty(clientType), "o.client_type", clientType); //按评价状态 wrapper.eq(CharSequenceUtil.isNotEmpty(commentStatus), "oi.comment_status", commentStatus); //按标签查询 if (CharSequenceUtil.isNotEmpty(tag)) { String orderStatusColumn = "o.order_status"; OrderTagEnum tagEnum = OrderTagEnum.valueOf(tag); switch (tagEnum) { //待付款 case WAIT_PAY: wrapper.eq(orderStatusColumn, OrderStatusEnum.UNPAID.name()); break; //待发货 case WAIT_SHIP: wrapper.eq(orderStatusColumn, OrderStatusEnum.UNDELIVERED.name()); break; //待收货 case WAIT_ROG: wrapper.eq(orderStatusColumn, OrderStatusEnum.DELIVERED.name()); break; //已取消 case CANCELLED: wrapper.eq(orderStatusColumn, OrderStatusEnum.CANCELLED.name()); break; //已完成 case COMPLETE: wrapper.eq(orderStatusColumn, OrderStatusEnum.COMPLETED.name()); break; default: break; } } // 依赖订单 wrapper.eq(parentOrderSn != null, "o.parent_order_sn", parentOrderSn); // 促销活动id wrapper.eq(CharSequenceUtil.isNotEmpty(promotionId), "o.promotion_id", promotionId); wrapper.eq(CharSequenceUtil.isNotEmpty(orderPromotionType), "o.order_promotion_type", orderPromotionType); if (CharSequenceUtil.isNotEmpty(flowPrice)) { String[] s = flowPrice.split("_"); if (s.length > 1) { wrapper.between("o.flow_price", s[0], s[1]); } else { wrapper.ge("o.flow_price", s[0]); } } wrapper.eq("o.delete_flag", false); return wrapper; } } framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -120,6 +120,29 @@ ",GROUP_CONCAT(oi.refund_price) as group_refund_price " + " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn ${ew.customSqlSegment} ") IPage<OrderSimpleXcxVO> queryByXcxParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper); /** * 商户端查询 * * @param page 分页 * @param queryWrapper 查询条件 * @return 简短订单分页 */ @Select("select o.sn,o.flow_price,o.create_time,o.order_status,o.pay_status,o.payment_method,o.payment_time,o.member_name,o.store_name as " + "store_name,o.store_id as store_id,o.client_type,o.order_type,o.deliver_status,o.order_promotion_type,o.seller_remark " + ",GROUP_CONCAT(oi.goods_id) as group_goods_id," + " GROUP_CONCAT(oi.sku_id) as group_sku_id," + " GROUP_CONCAT(oi.num) as group_num" + ",GROUP_CONCAT(oi.image) as group_images" + ",GROUP_CONCAT(oi.goods_name) as group_name " + ",GROUP_CONCAT(oi.after_sale_status) as group_after_sale_status" + ",GROUP_CONCAT(oi.complain_status) as group_complain_status" + ",GROUP_CONCAT(oi.comment_status) as group_comment_status" + ",GROUP_CONCAT(oi.sn) as group_order_items_sn " + ",GROUP_CONCAT(oi.goods_price) as group_goods_price " + ",GROUP_CONCAT(oi.is_refund) as group_is_refund " + ",GROUP_CONCAT(oi.refund_price) as group_refund_price " + " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn ${ew.customSqlSegment} ") IPage<OrderSimpleXcxVO> querySupplierOrderParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper); /** * 查询订单信息 framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
@@ -6,6 +6,7 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage; import cn.lili.modules.order.order.entity.dto.OrderSearchParams; import cn.lili.modules.order.order.entity.dto.PartDeliveryParamsDTO; import cn.lili.modules.order.order.entity.dto.SupplierOrderSearchParams; import cn.lili.modules.order.order.entity.vo.OrderDetailVO; import cn.lili.modules.order.order.entity.vo.OrderSimpleVO; import cn.lili.modules.order.order.entity.vo.OrderSimpleXcxVO; @@ -61,6 +62,8 @@ */ IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchParams orderSearchParams); IPage<OrderSimpleXcxVO> querySupplierOrderParams(SupplierOrderSearchParams orderSearchParams); /** * 订单信息 * framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -272,6 +272,42 @@ return iPage; } @Override public IPage<OrderSimpleXcxVO> querySupplierOrderParams(SupplierOrderSearchParams orderSearchParams) { QueryWrapper queryWrapper = orderSearchParams.queryWrapper(); queryWrapper.groupBy("o.id"); queryWrapper.orderByDesc("o.id"); IPage<OrderSimpleXcxVO> iPage = this.baseMapper.querySupplierOrderParams(PageUtil.initPage(orderSearchParams), queryWrapper); Set<String> goodsIds = new HashSet<>(); for (OrderSimpleXcxVO orderSimpleVO : iPage.getRecords()) { orderSimpleVO.setOrderItems(orderSimpleVO.initOrderItems()); String groupGoodsId = orderSimpleVO.getGroupGoodsId(); if (StringUtils.isNotBlank(groupGoodsId)) { goodsIds.addAll(Arrays.asList(groupGoodsId.split(","))); } } if (CollectionUtil.isNotEmpty(goodsIds)) { List<Goods> list = goodsService.list(Wrappers.<Goods>lambdaQuery().in(Goods::getId, goodsIds)); Map<String, String> goodsVideos = list .stream().collect(Collectors.toMap(Goods::getId, g-> StringUtils.isNotBlank(g.getGoodsVideo())?g.getGoodsVideo():"" )); iPage.getRecords().forEach(orderSimpleVO -> { orderSimpleVO.getOrderItems().forEach(orderItem -> { String videoUrl = goodsVideos.get(orderItem.getGoodsId()); if (StringUtils.isNotBlank(videoUrl)&&!videoUrl.contains("http")) { orderItem.setVideo(cosUtil.getPreviewUrl(videoUrl)); } String image = orderItem.getImage(); if (StringUtils.isNotBlank(image)&&!image.contains("http")) { orderItem.setImage(cosUtil.getPreviewUrl(image)); } }); }); } return iPage; } /** * 订单信息 * lmk-job/src/main/java/cn/lili/handler/impl/coupon/CouponExecute.java
@@ -1,5 +1,6 @@ package cn.lili.handler.impl.coupon; import cn.lili.handler.EveryDayExecute; import cn.lili.modules.promotion.entity.dos.MemberCoupon; import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum; import cn.lili.modules.promotion.service.MemberCouponService;
