diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java index 0bae39353..01da5f2e2 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java @@ -63,9 +63,6 @@ public class OrderSearchParams extends PageVO { @ApiModelProperty(value = "关键字 商品名称/买家名称/店铺名称") private String keywords; - @ApiModelProperty(value = "付款方式") - private String paymentType; - /** * @see OrderTypeEnum * @see cn.lili.modules.order.order.entity.enums.OrderPromotionTypeEnum @@ -121,7 +118,11 @@ public class OrderSearchParams extends PageVO { //关键字查询 if (CharSequenceUtil.isNotEmpty(keywords)) { - wrapper.and(keyWrapper -> keyWrapper.like("o.sn", keywords).or().like("oi.goods_name", keywords)); + wrapper.and(keyWrapper -> keyWrapper.like("o.sn", keywords).or() + .like("oi.goods_name", keywords).or() + .like("o.consignee_name", keywords).or() + .like("o.consignee_mobile", keywords).or() + .like("o.store_name", keywords)); } if (currentUser != null) { //按卖家查询 @@ -157,9 +158,6 @@ public class OrderSearchParams extends PageVO { //按商品名称查询 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); diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java index affd62408..b81ecb446 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java @@ -56,6 +56,9 @@ public class OrderSimpleVO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date paymentTime; + @ApiModelProperty(value = "用户ID") + private String memberId; + @ApiModelProperty(value = "用户名") @Sensitive(strategy = SensitiveStrategy.PHONE) private String memberName; diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java index 1b19087ed..f26d0fc0d 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java @@ -80,7 +80,7 @@ public interface OrderMapper extends BaseMapper { * @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 " + + @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.member_id,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," +