提交按照物流公司属性查询项下订单信息

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java

@@ -11,10 +11,7 @@ import cc.hiver.mall.pojo.dto.SaleDTO;
 import cc.hiver.mall.pojo.dto.SaleDetailDTO;
 import cc.hiver.mall.pojo.dto.SaleDetailQueryDTO;
 import cc.hiver.mall.pojo.dto.SaleQueryDTO;
-import cc.hiver.mall.pojo.vo.SaleNewVO;
-import cc.hiver.mall.pojo.vo.SaleQueryVO;
-import cc.hiver.mall.pojo.vo.SaleReturnVO;
-import cc.hiver.mall.pojo.vo.SaleVO;
+import cc.hiver.mall.pojo.vo.*;
 import cc.hiver.mall.service.*;
 import cc.hiver.mall.service.mybatis.CustomerService;
 import cc.hiver.mall.service.mybatis.SaleDetailService;
@@ -155,6 +152,20 @@ public class SaleController {
             if (!StringUtils.isEmpty(saleVO.getTransportType())) queryWrapper.eq("transport_type",saleVO.getTransportType());
             if (!StringUtils.isEmpty(saleVO.getUserId())) queryWrapper.eq("user_id",saleVO.getUserId());
             if (!StringUtils.isEmpty(saleVO.getShopId())) queryWrapper.eq("shop_id",saleVO.getShopId());
+            SearchDateVo searchDateVo = saleVO.getSearchDateVo();
+            if (!ObjectUtils.isEmpty(searchDateVo) && !searchDateVo.isAnyFieldEmpty()){
+                Date endDate = searchDateVo.getEndDate();
+                Date startDate = searchDateVo.getStartDate();
+                if(!ObjectUtils.isEmpty(startDate) && !ObjectUtils.isEmpty(endDate)){
+                    queryWrapper.between("create_time",startDate,endDate);
+                }else if(!ObjectUtils.isEmpty(startDate)){
+                    queryWrapper.ge("create_time",startDate);
+                }else if(!ObjectUtils.isEmpty(endDate)){
+                    queryWrapper.le("create_time",endDate);
+                }
+            }
+            //默认加一个时间排序
+            queryWrapper.orderByDesc("create_time");
         }
         List<Sale> saleList = saleService.list(queryWrapper);
         return new ResultUtil<List<Sale>>().setData(saleList);
@@ -244,4 +255,30 @@ public class SaleController {
         return new ResultUtil<SaleNewVO>().setData(saleNewVO);
     }
 
+
+    @RequestMapping(value = "/listCompany", method = RequestMethod.POST)
+    @ApiOperation(value = "根据物流公司属性获得列表")
+    public Result<List<Sale>> listCompany(@RequestBody SaleListVO saleVO) {
+        QueryWrapper<Sale> queryWrapper = new QueryWrapper<>();
+        if (!ObjectUtils.isEmpty(saleVO)){
+            if (!StringUtils.isEmpty(saleVO.getTransCompany())) queryWrapper.eq("trans_company",saleVO.getTransCompany());
+            SearchDateVo searchDateVo = saleVO.getSearchDateVo();
+            if (!ObjectUtils.isEmpty(searchDateVo) && !searchDateVo.isAnyFieldEmpty()){
+                Date endDate = searchDateVo.getEndDate();
+                Date startDate = searchDateVo.getStartDate();
+                if(!ObjectUtils.isEmpty(startDate) && !ObjectUtils.isEmpty(endDate)){
+                    queryWrapper.between("create_time",startDate,endDate);
+                }else if(!ObjectUtils.isEmpty(startDate)){
+                    queryWrapper.ge("create_time",startDate);
+                }else if(!ObjectUtils.isEmpty(endDate)){
+                    queryWrapper.le("create_time",endDate);
+                }
+            }
+            //默认加一个时间排序
+            queryWrapper.orderByDesc("create_time");
+        }
+        List<Sale> saleList = saleService.list(queryWrapper);
+        return new ResultUtil<List<Sale>>().setData(saleList);
+    }
+
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Sale.java

@@ -78,6 +78,10 @@ public class Sale implements Serializable {
     @ApiModelProperty(value = "区县")
     private String area;
 
+    @ApiModelProperty(value = "物流公司")
+    private String transCompany;
+
+
     private static final long serialVersionUID = 1L;
 
     public String getId() {
@@ -256,36 +260,40 @@ public class Sale implements Serializable {
         this.area = area;
     }
 
+    public String getTransCompany() {
+        return transCompany;
+    }
+
+    public void setTransCompany(String transCompany) {
+        this.transCompany = transCompany;
+    }
+
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", createBy=").append(createBy);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", delFlag=").append(delFlag);
-        sb.append(", updateBy=").append(updateBy);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", userId=").append(userId);
-        sb.append(", shopId=").append(shopId);
-        sb.append(", totalAmount=").append(totalAmount);
-        sb.append(", discount=").append(discount);
-        sb.append(", discountAmount=").append(discountAmount);
-        sb.append(", realAmount=").append(realAmount);
-        sb.append(", alreadyEarn=").append(alreadyEarn);
-        sb.append(", noEarn=").append(noEarn);
-        sb.append(", payStatus=").append(payStatus);
-        sb.append(", status=").append(status);
-        sb.append(", transportType=").append(transportType);
-        sb.append(", shareAddress=").append(shareAddress);
-        sb.append(", receiveAddress=").append(receiveAddress);
-        sb.append(", province=").append(province);
-        sb.append(", city=").append(city);
-        sb.append(", area=").append(area);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+        return "Sale{" +
+                "id='" + id + '\'' +
+                ", createBy='" + createBy + '\'' +
+                ", createTime=" + createTime +
+                ", delFlag=" + delFlag +
+                ", updateBy='" + updateBy + '\'' +
+                ", updateTime=" + updateTime +
+                ", userId='" + userId + '\'' +
+                ", shopId='" + shopId + '\'' +
+                ", totalAmount=" + totalAmount +
+                ", discount=" + discount +
+                ", discountAmount=" + discountAmount +
+                ", realAmount=" + realAmount +
+                ", alreadyEarn=" + alreadyEarn +
+                ", noEarn=" + noEarn +
+                ", payStatus='" + payStatus + '\'' +
+                ", status='" + status + '\'' +
+                ", transportType='" + transportType + '\'' +
+                ", shareAddress='" + shareAddress + '\'' +
+                ", receiveAddress='" + receiveAddress + '\'' +
+                ", province='" + province + '\'' +
+                ", city='" + city + '\'' +
+                ", area='" + area + '\'' +
+                ", transCompany='" + transCompany + '\'' +
+                '}';
     }
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/SaleListVO.java

@@ -0,0 +1,22 @@
+package cc.hiver.mall.pojo.vo;
+
+import cc.hiver.core.common.vo.PageVo;
+import cc.hiver.core.common.vo.SearchDateVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "销售单主表")
+public class SaleListVO implements Serializable {
+
+    @ApiModelProperty(value = "物流公司编号")
+    private String transCompany;
+
+    @ApiModelProperty(value = "日期查询参数")
+    private SearchDateVo searchDateVo;
+
+
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java

@@ -157,6 +157,7 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService {
             sale.setStatus("1");
         }
         sale.setCreateTime(new Date());
+        sale.setTransCompany(StrUtil.isNotEmpty(saleDTO.getTransCompany())?saleDTO.getTransCompany():null);
         saleService.save(sale);
 
         String saleId = sale.getId();