From 0b49a1bc6330ab68d501d59e852b8aa39b70b331 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Tue, 14 Mar 2023 16:59:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?2023-3-14=20=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=20=E4=BC=9A=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/oms/order/index1.vue | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/mallplusui-web-admin/src/views/oms/order/index1.vue b/mallplusui-web-admin/src/views/oms/order/index1.vue index 6c34617..9655d28 100644 --- a/mallplusui-web-admin/src/views/oms/order/index1.vue +++ b/mallplusui-web-admin/src/views/oms/order/index1.vue @@ -70,7 +70,7 @@
- + - - + + - + + @@ -239,7 +242,8 @@ status: 0, orderSn: null, receiverPhone: null, - createTime: null + createTimeStart: null, + createTimeEnd: null }; export default { From 0988d2d1398e947423867730f9f6169bc41f9a5c Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 14 Mar 2023 17:09:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/controller/OmsOrderController.java | 17 ++++++++++++-- .../ums/controller/UmsMemberController.java | 10 +++++++-- .../mallplus/oms/query/OmsOrderQuery.java | 22 +++++++++++++++++++ .../zscat/mallplus/ums/entity/UmsMember.java | 3 +++ .../service/impl/SmsCouponServiceImpl.java | 4 +++- 5 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java index a62bd82..a5b0305 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java @@ -10,12 +10,14 @@ import com.zscat.mallplus.oms.entity.OmsOrder; import com.zscat.mallplus.oms.entity.OmsOrderItem; import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory; import com.zscat.mallplus.oms.mapper.OmsOrderOperateHistoryMapper; +import com.zscat.mallplus.oms.query.OmsOrderQuery; import com.zscat.mallplus.oms.service.IOmsOrderItemService; import com.zscat.mallplus.oms.service.IOmsOrderService; import com.zscat.mallplus.oms.vo.OmsMoneyInfoParam; import com.zscat.mallplus.oms.vo.OmsOrderDeliveryParam; import com.zscat.mallplus.oms.vo.OmsReceiverInfoParam; import com.zscat.mallplus.oms.vo.OrderCountDto; +import com.zscat.mallplus.util.StringUtils; import com.zscat.mallplus.utils.CommonResult; import com.zscat.mallplus.utils.ValidatorUtils; import io.swagger.annotations.Api; @@ -55,12 +57,23 @@ public class OmsOrderController { @ApiOperation("根据条件查询所有订单表列表") @GetMapping(value = "/list") @PreAuthorize("hasAuthority('oms:OmsOrder:read')") - public Object getOmsOrderByPage(OmsOrder entity, + public Object getOmsOrderByPage(OmsOrderQuery omsOrderQuery, @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize ) { try { - return new CommonResult().success(IOmsOrderService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time").select(ConstansValue.sampleOrderList))); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(omsOrderQuery.getOrderSn())){ + qw.like("order_sn",omsOrderQuery.getOrderSn()); + } + if(StringUtils.isNotBlank(omsOrderQuery.getReceiverPhone())){ + qw.like("receiver_phone",omsOrderQuery.getReceiverPhone()); + } + qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')" + ); + return new CommonResult().success(IOmsOrderService.page(new Page(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList))); + } catch (Exception e) { log.error("根据条件查询所有订单表列表：%s", e.getMessage(), e); } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java index 7841161..4f1601d 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/UmsMemberController.java @@ -12,6 +12,7 @@ import com.zscat.mallplus.ums.mapper.UmsIntegrationChangeHistoryMapper; import com.zscat.mallplus.ums.service.IUmsMemberBlanceLogService; import com.zscat.mallplus.ums.service.IUmsMemberLevelService; import com.zscat.mallplus.ums.service.IUmsMemberService; +import com.zscat.mallplus.util.StringUtils; import com.zscat.mallplus.util.UserUtils; import com.zscat.mallplus.utils.CommonResult; import com.zscat.mallplus.utils.ValidatorUtils; @@ -60,10 +61,15 @@ public class UmsMemberController { @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize ) { try { - if (ValidatorUtils.empty(entity.getBuyCountss())) { + /*if (ValidatorUtils.empty(entity.getBuyCountss())) { + return new CommonResult().success(IUmsMemberService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time"))); + }*/ + if(StringUtils.isNotBlank(entity.getKeyword())){ + return new CommonResult().success(IUmsMemberService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity).like("nickname", entity.getKeyword()).orderByDesc("create_time"))); + }else{ return new CommonResult().success(IUmsMemberService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time"))); } - return new CommonResult().success(IUmsMemberService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity).ge("buy_count", entity.getBuyCountss()).orderByDesc("create_time"))); +// return new CommonResult().success(IUmsMemberService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity).ge("buy_count", entity.getBuyCountss()).orderByDesc("create_time"))); } catch (Exception e) { log.error("根据条件查询所有会员表列表：%s", e.getMessage(), e); diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java new file mode 100644 index 0000000..cd335ca --- /dev/null +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/query/OmsOrderQuery.java @@ -0,0 +1,22 @@ +package com.zscat.mallplus.oms.query; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/3/14 16:49 + * @Description + */ +@Data +public class OmsOrderQuery { + @ApiModelProperty(value = "订单编号",required = false) + private String orderSn; + @ApiModelProperty(value = "收货人手机号",required = false) + private String receiverPhone; + @ApiModelProperty(value = "提交开始时间",required = false) + private String createTimeStart; + + @ApiModelProperty(value = "提交结束时间",required = false) + private String createTimeEnd; +} diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMember.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMember.java index aa21ac9..51f52d3 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMember.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/ums/entity/UmsMember.java @@ -163,4 +163,7 @@ public class UmsMember implements Serializable { private Integer buyCountss; @TableField("isAlphaUser") private Integer isAlphaUser;//是否内测 + @TableField(exist = false) + private String keyword; + } diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java index a9e3fd5..bed89e9 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java @@ -11,6 +11,7 @@ import com.zscat.mallplus.ums.entity.UmsMember; import com.zscat.mallplus.ums.service.IUmsMemberService; import com.zscat.mallplus.utils.CommonResult; import com.zscat.mallplus.utils.ValidatorUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -109,7 +110,8 @@ public class SmsCouponServiceImpl extends ServiceImpl(); } if (ValidatorUtils.empty(useStatus)) { - return couponHistoryMapper.selectList(new QueryWrapper().eq("member_id", currentMember.getId())); + return couponHistoryMapper.selectList(new QueryWrapper().eq("member_id", currentMember.getId()).apply("date_format (end_time,'%Y-%m-%d') <= date_format('" + new Date() + "','%Y-%m-%d')" + )); } return couponHistoryMapper.selectList(new QueryWrapper().eq("member_id", currentMember.getId()).eq("use_status", useStatus)); } From 863c4bd139e2437ae256dfbc4dea536caf5f9d8f Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 14 Mar 2023 17:44:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java index 8c38dc3..e6d0a61 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/ums/service/impl/UmsMemberServiceImpl.java @@ -576,7 +576,7 @@ public class UmsMemberServiceImpl extends ServiceImpl Date: Tue, 14 Mar 2023 17:46:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java index bed89e9..a9e3fd5 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponServiceImpl.java @@ -11,7 +11,6 @@ import com.zscat.mallplus.ums.entity.UmsMember; import com.zscat.mallplus.ums.service.IUmsMemberService; import com.zscat.mallplus.utils.CommonResult; import com.zscat.mallplus.utils.ValidatorUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -110,8 +109,7 @@ public class SmsCouponServiceImpl extends ServiceImpl(); } if (ValidatorUtils.empty(useStatus)) { - return couponHistoryMapper.selectList(new QueryWrapper().eq("member_id", currentMember.getId()).apply("date_format (end_time,'%Y-%m-%d') <= date_format('" + new Date() + "','%Y-%m-%d')" - )); + return couponHistoryMapper.selectList(new QueryWrapper().eq("member_id", currentMember.getId())); } return couponHistoryMapper.selectList(new QueryWrapper().eq("member_id", currentMember.getId()).eq("use_status", useStatus)); }