修改问题

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<OmsOrder>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time").select(ConstansValue.sampleOrderList)));
+            QueryWrapper<OmsOrder> 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<OmsOrder>(pageNum, pageSize), qw.orderByDesc("create_time").select(ConstansValue.sampleOrderList)));
+
         } catch (Exception e) {
             log.error("根据条件查询所有订单表列表：%s", e.getMessage(), e);
         }

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<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time")));
+            }*/
+            if(StringUtils.isNotBlank(entity.getKeyword())){
+                return new CommonResult().success(IUmsMemberService.page(new Page<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).like("nickname", entity.getKeyword()).orderByDesc("create_time")));
+            }else{
                 return new CommonResult().success(IUmsMemberService.page(new Page<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).orderByDesc("create_time")));
             }
-            return new CommonResult().success(IUmsMemberService.page(new Page<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).ge("buy_count", entity.getBuyCountss()).orderByDesc("create_time")));
+//            return new CommonResult().success(IUmsMemberService.page(new Page<UmsMember>(pageNum, pageSize), new QueryWrapper<>(entity).ge("buy_count", entity.getBuyCountss()).orderByDesc("create_time")));
 
         } catch (Exception e) {
             log.error("根据条件查询所有会员表列表：%s", e.getMessage(), e);

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;
+}

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;
+
 }

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<SmsCouponMapper, SmsCoupon
             return new ArrayList<>();
         }
         if (ValidatorUtils.empty(useStatus)) {
-            return couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().eq("member_id", currentMember.getId()));
+            return couponHistoryMapper.selectList(new QueryWrapper<SmsCouponHistory>().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<SmsCouponHistory>().eq("member_id", currentMember.getId()).eq("use_status", useStatus));
     }