From f08e21b0735ea435d14df59fd74d4dabbb6ad40b Mon Sep 17 00:00:00 2001 From: Houpn Date: Tue, 12 Sep 2023 11:07:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=80=80=E8=B4=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .../mall/controller/OrderController.java | 17 +- .../mall/controller/ReturnSaleController.java | 145 ++ .../mall/dao/mapper/ReturnDetailMapper.java | 35 + .../mall/dao/mapper/ReturnSaleMapper.java | 34 + .../cc/hiver/mall/entity/ReturnDetail.java | 267 +++ .../mall/entity/ReturnDetailExample.java | 1501 ++++++++++++++ .../java/cc/hiver/mall/entity/ReturnSale.java | 295 +++ .../hiver/mall/entity/ReturnSaleExample.java | 1721 +++++++++++++++++ .../mall/pojo/dto/ReturnSaleDetailDTO.java | 66 + .../cc/hiver/mall/pojo/dto/SaleReturnDTO.java | 30 + .../hiver/mall/service/RushOrderService.java | 3 + .../mall/service/SalesAndDetailsService.java | 4 +- .../mall/service/StockAndLogService.java | 5 + .../service/mybatis/ReturnDetailService.java | 10 + .../service/mybatis/ReturnSaleService.java | 11 + .../serviceimpl/RushOrderServiceImpl.java | 25 + .../SalesAndDetailsServiceImpl.java | 64 +- .../serviceimpl/StockAndLogServiceImpl.java | 79 +- .../mybatis/ReturnDetailServiceImpl.java | 17 + .../mybatis/ReturnSaleServiceImpl.java | 16 + .../resources/mapper/ReturnDetailMapper.xml | 448 +++++ .../resources/mapper/ReturnSaleMapper.xml | 495 +++++ hiver-modules/pom.xml | 1 + 24 files changed, 5275 insertions(+), 17 deletions(-) create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnDetailMapper.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnSaleMapper.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetail.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetailExample.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSale.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSaleExample.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/ReturnSaleDetailDTO.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/SaleReturnDTO.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ReturnDetailService.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ReturnSaleService.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnDetailServiceImpl.java create mode 100644 hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnSaleServiceImpl.java create mode 100644 hiver-modules/hiver-mall/src/main/resources/mapper/ReturnDetailMapper.xml create mode 100644 hiver-modules/hiver-mall/src/main/resources/mapper/ReturnSaleMapper.xml diff --git a/.gitignore b/.gitignore index 7dcfad05..0499be50 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ build .idea .gradle hiver-logs -hiver-admin/test-output/spark/ \ No newline at end of file +hiver-admin/test-output/spark/ +hiver-modules/mall-mbg/* \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java index 0ac6e8f4..b38c211c 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java @@ -12,10 +12,12 @@ import cc.hiver.core.common.vo.SearchVo; import cc.hiver.core.entity.Worker; import cc.hiver.core.service.WorkerService; import cc.hiver.mall.entity.OrderXd; +import cc.hiver.mall.entity.ReturnSale; import cc.hiver.mall.entity.Sale; import cc.hiver.mall.pojo.vo.OrderQueryVO; import cc.hiver.mall.pojo.vo.OrderVO; import cc.hiver.mall.service.OrderService; +import cc.hiver.mall.service.mybatis.ReturnSaleService; import cc.hiver.mall.service.mybatis.SaleService; import cn.hutool.core.date.DateTime; import io.swagger.annotations.Api; @@ -58,6 +60,9 @@ public class OrderController { @Autowired private SaleService saleService; + @Autowired + private ReturnSaleService returnSaleService; + @Autowired private RedisTemplateHelper redisTemplate; @@ -246,9 +251,17 @@ public class OrderController { OrderXd orderXd = orderService.findByOrderId(orderQueryVO.getOrderId()); orderXd.setOrderStatus(orderStatus); orderService.update(orderXd); + //更新下单表或者是退货单表 Sale sale = saleService.getById(orderQueryVO.getOrderId()); - sale.setStatus(String.valueOf(orderStatus)); - saleService.saveOrUpdate(sale); + if(sale != null){ + sale.setStatus(String.valueOf(orderStatus)); + saleService.saveOrUpdate(sale); + } + ReturnSale returnSale = returnSaleService.getById(orderQueryVO.getOrderId()); + if(returnSale != null){ + returnSale.setStatus(String.valueOf(orderStatus)); + returnSaleService.saveOrUpdate(returnSale); + } Worker worker = workerService.findById(orderQueryVO.getOrderByWorker()); BigDecimal fixedAmount = worker.getFixedAmount(); BigDecimal depoBal = worker.getDepoBal(); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java new file mode 100644 index 00000000..164124f8 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java @@ -0,0 +1,145 @@ +package cc.hiver.mall.controller; + +import cc.hiver.core.common.utils.BeanUtils; +import cc.hiver.core.common.utils.ResultUtil; +import cc.hiver.core.common.utils.SecurityUtil; +import cc.hiver.core.common.utils.StringUtils; +import cc.hiver.core.common.vo.Result; +import cc.hiver.mall.entity.*; +import cc.hiver.mall.pojo.dto.ReturnSaleDetailDTO; +import cc.hiver.mall.pojo.dto.SaleDTO; +import cc.hiver.mall.pojo.dto.SaleQueryDTO; +import cc.hiver.mall.pojo.dto.SaleReturnDTO; +import cc.hiver.mall.pojo.vo.SaleQueryVO; +import cc.hiver.mall.pojo.vo.SaleVO; +import cc.hiver.mall.service.*; +import cc.hiver.mall.service.mybatis.ReturnDetailService; +import cc.hiver.mall.service.mybatis.ReturnSaleService; +import cc.hiver.mall.service.mybatis.SaleDetailService; +import cc.hiver.mall.service.mybatis.SaleService; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@RestController +@Api(tags = "销售订单接口") +@RequestMapping(value = "/hiver/app/return/") +@Transactional +public class ReturnSaleController { + @Autowired + private SalesAndDetailsService salesAndDetailsService; + + @Autowired + private StockAndLogService stockAndLogService; + + @Autowired + private RushOrderService rushOrderService; + + @Autowired + private SendMessageService sendMessageService; + + @Autowired + private SaleService saleService; + + @Autowired + private SaleDetailService saleDetailService; + + @Autowired + private ReturnSaleService returnSaleService; + + @Autowired + private OrderService orderService; + + @Autowired + private ReturnDetailService returnDetailService; + + @Autowired + private SecurityUtil securityUtil; + + + @RequestMapping(value = "/get/{id}", method = RequestMethod.GET) + @ApiOperation(value = "获得订单详情") + public Result get(@PathVariable String id) { + SaleQueryVO saleQueryVO = new SaleQueryVO(); + Sale sale = saleService.getById(id); + saleQueryVO.setSale(sale); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sale_id",id); + List saleDetailList = saleDetailService.list(queryWrapper); + saleQueryVO.setSaleDetailList(saleDetailList); + return new ResultUtil().setData(saleQueryVO); + } + + @RequestMapping(value = "/rtg", method = RequestMethod.POST) + @ApiOperation(value = "申请退货") + @Transactional + public Result returnGoods(@RequestBody SaleReturnDTO saleReturnDTO) { + + /** + * 1.当前订单未完成不允许退 + * */ + String id = saleReturnDTO.getReturnSale().getSaleId(); + Sale sale = saleService.getById(id); + if(!"5".equals(sale.getStatus())){ + return ResultUtil.error("当前订单未送达，不允许退款！"); + } + /** + * 2.如果存在在途的退货单，不允许再次退货 + * */ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sale_id",sale.getId()); + queryWrapper.ne("status","5"); + List returnSaleList = returnSaleService.list(queryWrapper); + if(returnSaleList.size()>0){ + return ResultUtil.error("当前有未完成的退货单，不允许退款"); + } + //1.登记退款表及退款明细表 + ReturnSale returnSale = salesAndDetailsService.handleBackSalesDetails(saleReturnDTO); + saleReturnDTO.setReturnSale(returnSale); + //2.如果不选择物流公司--默认为自取运送，否则进入处理退款抢单模块 + if(StrUtil.isNotEmpty(saleReturnDTO.getTransCompany())){ + rushOrderService.handleReturnRushOrder(saleReturnDTO); + } + //3.消息推送模块--退货抢单（目前只给已选择抢单的人员推送通知） + if(StrUtil.isNotEmpty(saleReturnDTO.getOrderByWorker())) + sendMessageService.handleSendAppMessage(saleReturnDTO.getOrderByWorker()); + + return ResultUtil.success("申请退货成功！"); + } + + @RequestMapping(value = "/ConfirmRtg/{id}", method = RequestMethod.GET) + @ApiOperation(value = "确认退货") + @Transactional + public Result ConfirmRtq(@ApiParam("退货单Id") @PathVariable String id) { + + /** + * 1.确认退货的前提是如果存在拉包工，那么拉包工必须已完成送达才可以退，否则可以直接退货 + * 2.确认退货后根据库存直接扣减入库明细 + * */ + OrderXd orderXd = orderService.findById(id); + if(orderXd != null && !"5".equals(orderXd.getOrderStatus())){ + return ResultUtil.error("当前退货订单还未送达，不能点击确认退货！"); + }else { + //处理库存模块 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("return_sale_id",id); + List returnDetails = returnDetailService.list(queryWrapper); + List returnSaleDetailDTO = new ArrayList<>(); + BeanUtils.copyBeanProp(returnSaleDetailDTO,returnDetails); + stockAndLogService.handleRetIncStockLog(returnSaleDetailDTO); + return ResultUtil.error("确认收货成功！"); + } + } + +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnDetailMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnDetailMapper.java new file mode 100644 index 00000000..c55a6e21 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnDetailMapper.java @@ -0,0 +1,35 @@ +package cc.hiver.mall.dao.mapper; + +import cc.hiver.mall.entity.ReturnDetail; +import cc.hiver.mall.entity.ReturnDetailExample; +import cc.hiver.mall.entity.Sale; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ReturnDetailMapper extends BaseMapper { + long countByExample(ReturnDetailExample example); + + int deleteByExample(ReturnDetailExample example); + + int deleteByPrimaryKey(String id); + + int insert(ReturnDetail record); + + int insertSelective(ReturnDetail record); + + List selectByExample(ReturnDetailExample example); + + ReturnDetail selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") ReturnDetail record, @Param("example") ReturnDetailExample example); + + int updateByExample(@Param("record") ReturnDetail record, @Param("example") ReturnDetailExample example); + + int updateByPrimaryKeySelective(ReturnDetail record); + + int updateByPrimaryKey(ReturnDetail record); +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnSaleMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnSaleMapper.java new file mode 100644 index 00000000..7ba1fcc5 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ReturnSaleMapper.java @@ -0,0 +1,34 @@ +package cc.hiver.mall.dao.mapper; + +import cc.hiver.mall.entity.ReturnDetail; +import cc.hiver.mall.entity.ReturnSale; +import cc.hiver.mall.entity.ReturnSaleExample; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +@Repository +public interface ReturnSaleMapper extends BaseMapper { + long countByExample(ReturnSaleExample example); + + int deleteByExample(ReturnSaleExample example); + + int deleteByPrimaryKey(String id); + + int insert(ReturnSale record); + + int insertSelective(ReturnSale record); + + List selectByExample(ReturnSaleExample example); + + ReturnSale selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") ReturnSale record, @Param("example") ReturnSaleExample example); + + int updateByExample(@Param("record") ReturnSale record, @Param("example") ReturnSaleExample example); + + int updateByPrimaryKeySelective(ReturnSale record); + + int updateByPrimaryKey(ReturnSale record); +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetail.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetail.java new file mode 100644 index 00000000..48f37163 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetail.java @@ -0,0 +1,267 @@ +package cc.hiver.mall.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@ApiModel(value = "退货单明细表") +@TableName(value = "t_return_detail", autoResultMap = true) +public class ReturnDetail implements Serializable { + private String id; + + private String createBy; + + private Date createTime; + + private Integer delFlag; + + private String updateBy; + + private Date updateTime; + + @ApiModelProperty(value = "销售单ID") + private String saleId; + + @ApiModelProperty(value = "退货单ID") + private String ReturnSaleId; + + @ApiModelProperty(value = "商品ID") + private String productId; + + @ApiModelProperty(value = "商品名称") + private String productName; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "店铺ID") + private String shopId; + + @ApiModelProperty(value = "商品分类") + private String categoryId; + + @ApiModelProperty(value = "商品属性列表") + private String attributeList; + + @ApiModelProperty(value = "市场价") + private BigDecimal price; + + @ApiModelProperty(value = "采购价") + private BigDecimal purchasePrice; + + @ApiModelProperty(value = "批发价") + private BigDecimal wholesalePrice; + + @ApiModelProperty(value = "销售数量") + private Integer productCount; + + @ApiModelProperty(value = "折扣") + private BigDecimal discount; + + @ApiModelProperty(value = "优惠金额") + private BigDecimal discountAmount; + + @ApiModelProperty(value = "实际价格") + private BigDecimal realPrice; + + private static final long serialVersionUID = 1L; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Integer getDelFlag() { + return delFlag; + } + + public void setDelFlag(Integer delFlag) { + this.delFlag = delFlag; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getSaleId() { + return saleId; + } + + public void setSaleId(String saleId) { + this.saleId = saleId; + } + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } + + public String getAttributeList() { + return attributeList; + } + + public void setAttributeList(String attributeList) { + this.attributeList = attributeList; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } + + public BigDecimal getPurchasePrice() { + return purchasePrice; + } + + public void setPurchasePrice(BigDecimal purchasePrice) { + this.purchasePrice = purchasePrice; + } + + public BigDecimal getWholesalePrice() { + return wholesalePrice; + } + + public void setWholesalePrice(BigDecimal wholesalePrice) { + this.wholesalePrice = wholesalePrice; + } + + public Integer getProductCount() { + return productCount; + } + + public void setProductCount(Integer productCount) { + this.productCount = productCount; + } + + public BigDecimal getDiscount() { + return discount; + } + + public void setDiscount(BigDecimal discount) { + this.discount = discount; + } + + public BigDecimal getDiscountAmount() { + return discountAmount; + } + + public void setDiscountAmount(BigDecimal discountAmount) { + this.discountAmount = discountAmount; + } + + public BigDecimal getRealPrice() { + return realPrice; + } + + public void setRealPrice(BigDecimal realPrice) { + this.realPrice = realPrice; + } + + public String getReturnSaleId() { + return ReturnSaleId; + } + + public void setReturnSaleId(String returnSaleId) { + ReturnSaleId = returnSaleId; + } + + @Override + public String toString() { + return "ReturnDetail{" + + "id='" + id + '\'' + + ", createBy='" + createBy + '\'' + + ", createTime=" + createTime + + ", delFlag=" + delFlag + + ", updateBy='" + updateBy + '\'' + + ", updateTime=" + updateTime + + ", saleId='" + saleId + '\'' + + ", ReturnSaleId='" + ReturnSaleId + '\'' + + ", productId='" + productId + '\'' + + ", productName='" + productName + '\'' + + ", unit='" + unit + '\'' + + ", shopId='" + shopId + '\'' + + ", categoryId='" + categoryId + '\'' + + ", attributeList='" + attributeList + '\'' + + ", price=" + price + + ", purchasePrice=" + purchasePrice + + ", wholesalePrice=" + wholesalePrice + + ", productCount=" + productCount + + ", discount=" + discount + + ", discountAmount=" + discountAmount + + ", realPrice=" + realPrice + + '}'; + } +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetailExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetailExample.java new file mode 100644 index 00000000..b26469c7 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetailExample.java @@ -0,0 +1,1501 @@ +package cc.hiver.mall.entity; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ReturnDetailExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ReturnDetailExample() { + oredCriteria = new ArrayList<>(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList<>(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(Integer value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(Integer value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(Integer value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(Integer value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(Integer value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(Integer value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(Integer value1, Integer value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(Integer value1, Integer value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andSaleIdIsNull() { + addCriterion("sale_id is null"); + return (Criteria) this; + } + + public Criteria andSaleIdIsNotNull() { + addCriterion("sale_id is not null"); + return (Criteria) this; + } + + public Criteria andSaleIdEqualTo(String value) { + addCriterion("sale_id =", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdNotEqualTo(String value) { + addCriterion("sale_id <>", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdGreaterThan(String value) { + addCriterion("sale_id >", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdGreaterThanOrEqualTo(String value) { + addCriterion("sale_id >=", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdLessThan(String value) { + addCriterion("sale_id <", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdLessThanOrEqualTo(String value) { + addCriterion("sale_id <=", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdLike(String value) { + addCriterion("sale_id like", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdNotLike(String value) { + addCriterion("sale_id not like", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdIn(List values) { + addCriterion("sale_id in", values, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdNotIn(List values) { + addCriterion("sale_id not in", values, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdBetween(String value1, String value2) { + addCriterion("sale_id between", value1, value2, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdNotBetween(String value1, String value2) { + addCriterion("sale_id not between", value1, value2, "saleId"); + return (Criteria) this; + } + + public Criteria andProductIdIsNull() { + addCriterion("product_id is null"); + return (Criteria) this; + } + + public Criteria andProductIdIsNotNull() { + addCriterion("product_id is not null"); + return (Criteria) this; + } + + public Criteria andProductIdEqualTo(String value) { + addCriterion("product_id =", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdNotEqualTo(String value) { + addCriterion("product_id <>", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdGreaterThan(String value) { + addCriterion("product_id >", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdGreaterThanOrEqualTo(String value) { + addCriterion("product_id >=", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdLessThan(String value) { + addCriterion("product_id <", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdLessThanOrEqualTo(String value) { + addCriterion("product_id <=", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdLike(String value) { + addCriterion("product_id like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdNotLike(String value) { + addCriterion("product_id not like", value, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdIn(List values) { + addCriterion("product_id in", values, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdNotIn(List values) { + addCriterion("product_id not in", values, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdBetween(String value1, String value2) { + addCriterion("product_id between", value1, value2, "productId"); + return (Criteria) this; + } + + public Criteria andProductIdNotBetween(String value1, String value2) { + addCriterion("product_id not between", value1, value2, "productId"); + return (Criteria) this; + } + + public Criteria andProductNameIsNull() { + addCriterion("product_name is null"); + return (Criteria) this; + } + + public Criteria andProductNameIsNotNull() { + addCriterion("product_name is not null"); + return (Criteria) this; + } + + public Criteria andProductNameEqualTo(String value) { + addCriterion("product_name =", value, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameNotEqualTo(String value) { + addCriterion("product_name <>", value, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameGreaterThan(String value) { + addCriterion("product_name >", value, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameGreaterThanOrEqualTo(String value) { + addCriterion("product_name >=", value, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameLessThan(String value) { + addCriterion("product_name <", value, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameLessThanOrEqualTo(String value) { + addCriterion("product_name <=", value, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameLike(String value) { + addCriterion("product_name like", value, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameNotLike(String value) { + addCriterion("product_name not like", value, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameIn(List values) { + addCriterion("product_name in", values, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameNotIn(List values) { + addCriterion("product_name not in", values, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameBetween(String value1, String value2) { + addCriterion("product_name between", value1, value2, "productName"); + return (Criteria) this; + } + + public Criteria andProductNameNotBetween(String value1, String value2) { + addCriterion("product_name not between", value1, value2, "productName"); + return (Criteria) this; + } + + public Criteria andUnitIsNull() { + addCriterion("unit is null"); + return (Criteria) this; + } + + public Criteria andUnitIsNotNull() { + addCriterion("unit is not null"); + return (Criteria) this; + } + + public Criteria andUnitEqualTo(String value) { + addCriterion("unit =", value, "unit"); + return (Criteria) this; + } + + public Criteria andUnitNotEqualTo(String value) { + addCriterion("unit <>", value, "unit"); + return (Criteria) this; + } + + public Criteria andUnitGreaterThan(String value) { + addCriterion("unit >", value, "unit"); + return (Criteria) this; + } + + public Criteria andUnitGreaterThanOrEqualTo(String value) { + addCriterion("unit >=", value, "unit"); + return (Criteria) this; + } + + public Criteria andUnitLessThan(String value) { + addCriterion("unit <", value, "unit"); + return (Criteria) this; + } + + public Criteria andUnitLessThanOrEqualTo(String value) { + addCriterion("unit <=", value, "unit"); + return (Criteria) this; + } + + public Criteria andUnitLike(String value) { + addCriterion("unit like", value, "unit"); + return (Criteria) this; + } + + public Criteria andUnitNotLike(String value) { + addCriterion("unit not like", value, "unit"); + return (Criteria) this; + } + + public Criteria andUnitIn(List values) { + addCriterion("unit in", values, "unit"); + return (Criteria) this; + } + + public Criteria andUnitNotIn(List values) { + addCriterion("unit not in", values, "unit"); + return (Criteria) this; + } + + public Criteria andUnitBetween(String value1, String value2) { + addCriterion("unit between", value1, value2, "unit"); + return (Criteria) this; + } + + public Criteria andUnitNotBetween(String value1, String value2) { + addCriterion("unit not between", value1, value2, "unit"); + return (Criteria) this; + } + + public Criteria andShopIdIsNull() { + addCriterion("shop_id is null"); + return (Criteria) this; + } + + public Criteria andShopIdIsNotNull() { + addCriterion("shop_id is not null"); + return (Criteria) this; + } + + public Criteria andShopIdEqualTo(String value) { + addCriterion("shop_id =", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdNotEqualTo(String value) { + addCriterion("shop_id <>", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdGreaterThan(String value) { + addCriterion("shop_id >", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdGreaterThanOrEqualTo(String value) { + addCriterion("shop_id >=", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdLessThan(String value) { + addCriterion("shop_id <", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdLessThanOrEqualTo(String value) { + addCriterion("shop_id <=", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdLike(String value) { + addCriterion("shop_id like", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdNotLike(String value) { + addCriterion("shop_id not like", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdIn(List values) { + addCriterion("shop_id in", values, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdNotIn(List values) { + addCriterion("shop_id not in", values, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdBetween(String value1, String value2) { + addCriterion("shop_id between", value1, value2, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdNotBetween(String value1, String value2) { + addCriterion("shop_id not between", value1, value2, "shopId"); + return (Criteria) this; + } + + public Criteria andCategoryIdIsNull() { + addCriterion("category_id is null"); + return (Criteria) this; + } + + public Criteria andCategoryIdIsNotNull() { + addCriterion("category_id is not null"); + return (Criteria) this; + } + + public Criteria andCategoryIdEqualTo(String value) { + addCriterion("category_id =", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdNotEqualTo(String value) { + addCriterion("category_id <>", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdGreaterThan(String value) { + addCriterion("category_id >", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdGreaterThanOrEqualTo(String value) { + addCriterion("category_id >=", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdLessThan(String value) { + addCriterion("category_id <", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdLessThanOrEqualTo(String value) { + addCriterion("category_id <=", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdLike(String value) { + addCriterion("category_id like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdNotLike(String value) { + addCriterion("category_id not like", value, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdIn(List values) { + addCriterion("category_id in", values, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdNotIn(List values) { + addCriterion("category_id not in", values, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdBetween(String value1, String value2) { + addCriterion("category_id between", value1, value2, "categoryId"); + return (Criteria) this; + } + + public Criteria andCategoryIdNotBetween(String value1, String value2) { + addCriterion("category_id not between", value1, value2, "categoryId"); + return (Criteria) this; + } + + public Criteria andAttributeListIsNull() { + addCriterion("attribute_list is null"); + return (Criteria) this; + } + + public Criteria andAttributeListIsNotNull() { + addCriterion("attribute_list is not null"); + return (Criteria) this; + } + + public Criteria andAttributeListEqualTo(String value) { + addCriterion("attribute_list =", value, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListNotEqualTo(String value) { + addCriterion("attribute_list <>", value, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListGreaterThan(String value) { + addCriterion("attribute_list >", value, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListGreaterThanOrEqualTo(String value) { + addCriterion("attribute_list >=", value, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListLessThan(String value) { + addCriterion("attribute_list <", value, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListLessThanOrEqualTo(String value) { + addCriterion("attribute_list <=", value, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListLike(String value) { + addCriterion("attribute_list like", value, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListNotLike(String value) { + addCriterion("attribute_list not like", value, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListIn(List values) { + addCriterion("attribute_list in", values, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListNotIn(List values) { + addCriterion("attribute_list not in", values, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListBetween(String value1, String value2) { + addCriterion("attribute_list between", value1, value2, "attributeList"); + return (Criteria) this; + } + + public Criteria andAttributeListNotBetween(String value1, String value2) { + addCriterion("attribute_list not between", value1, value2, "attributeList"); + return (Criteria) this; + } + + public Criteria andPriceIsNull() { + addCriterion("price is null"); + return (Criteria) this; + } + + public Criteria andPriceIsNotNull() { + addCriterion("price is not null"); + return (Criteria) this; + } + + public Criteria andPriceEqualTo(BigDecimal value) { + addCriterion("price =", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceNotEqualTo(BigDecimal value) { + addCriterion("price <>", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceGreaterThan(BigDecimal value) { + addCriterion("price >", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price >=", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceLessThan(BigDecimal value) { + addCriterion("price <", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("price <=", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceIn(List values) { + addCriterion("price in", values, "price"); + return (Criteria) this; + } + + public Criteria andPriceNotIn(List values) { + addCriterion("price not in", values, "price"); + return (Criteria) this; + } + + public Criteria andPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price between", value1, value2, "price"); + return (Criteria) this; + } + + public Criteria andPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price not between", value1, value2, "price"); + return (Criteria) this; + } + + public Criteria andPurchasePriceIsNull() { + addCriterion("purchase_price is null"); + return (Criteria) this; + } + + public Criteria andPurchasePriceIsNotNull() { + addCriterion("purchase_price is not null"); + return (Criteria) this; + } + + public Criteria andPurchasePriceEqualTo(BigDecimal value) { + addCriterion("purchase_price =", value, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andPurchasePriceNotEqualTo(BigDecimal value) { + addCriterion("purchase_price <>", value, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andPurchasePriceGreaterThan(BigDecimal value) { + addCriterion("purchase_price >", value, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andPurchasePriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("purchase_price >=", value, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andPurchasePriceLessThan(BigDecimal value) { + addCriterion("purchase_price <", value, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andPurchasePriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("purchase_price <=", value, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andPurchasePriceIn(List values) { + addCriterion("purchase_price in", values, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andPurchasePriceNotIn(List values) { + addCriterion("purchase_price not in", values, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andPurchasePriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("purchase_price between", value1, value2, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andPurchasePriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("purchase_price not between", value1, value2, "purchasePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceIsNull() { + addCriterion("wholesale_price is null"); + return (Criteria) this; + } + + public Criteria andWholesalePriceIsNotNull() { + addCriterion("wholesale_price is not null"); + return (Criteria) this; + } + + public Criteria andWholesalePriceEqualTo(BigDecimal value) { + addCriterion("wholesale_price =", value, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceNotEqualTo(BigDecimal value) { + addCriterion("wholesale_price <>", value, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceGreaterThan(BigDecimal value) { + addCriterion("wholesale_price >", value, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("wholesale_price >=", value, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceLessThan(BigDecimal value) { + addCriterion("wholesale_price <", value, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("wholesale_price <=", value, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceIn(List values) { + addCriterion("wholesale_price in", values, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceNotIn(List values) { + addCriterion("wholesale_price not in", values, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("wholesale_price between", value1, value2, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andWholesalePriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("wholesale_price not between", value1, value2, "wholesalePrice"); + return (Criteria) this; + } + + public Criteria andProductCountIsNull() { + addCriterion("product_count is null"); + return (Criteria) this; + } + + public Criteria andProductCountIsNotNull() { + addCriterion("product_count is not null"); + return (Criteria) this; + } + + public Criteria andProductCountEqualTo(Integer value) { + addCriterion("product_count =", value, "productCount"); + return (Criteria) this; + } + + public Criteria andProductCountNotEqualTo(Integer value) { + addCriterion("product_count <>", value, "productCount"); + return (Criteria) this; + } + + public Criteria andProductCountGreaterThan(Integer value) { + addCriterion("product_count >", value, "productCount"); + return (Criteria) this; + } + + public Criteria andProductCountGreaterThanOrEqualTo(Integer value) { + addCriterion("product_count >=", value, "productCount"); + return (Criteria) this; + } + + public Criteria andProductCountLessThan(Integer value) { + addCriterion("product_count <", value, "productCount"); + return (Criteria) this; + } + + public Criteria andProductCountLessThanOrEqualTo(Integer value) { + addCriterion("product_count <=", value, "productCount"); + return (Criteria) this; + } + + public Criteria andProductCountIn(List values) { + addCriterion("product_count in", values, "productCount"); + return (Criteria) this; + } + + public Criteria andProductCountNotIn(List values) { + addCriterion("product_count not in", values, "productCount"); + return (Criteria) this; + } + + public Criteria andProductCountBetween(Integer value1, Integer value2) { + addCriterion("product_count between", value1, value2, "productCount"); + return (Criteria) this; + } + + public Criteria andProductCountNotBetween(Integer value1, Integer value2) { + addCriterion("product_count not between", value1, value2, "productCount"); + return (Criteria) this; + } + + public Criteria andDiscountIsNull() { + addCriterion("discount is null"); + return (Criteria) this; + } + + public Criteria andDiscountIsNotNull() { + addCriterion("discount is not null"); + return (Criteria) this; + } + + public Criteria andDiscountEqualTo(BigDecimal value) { + addCriterion("discount =", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountNotEqualTo(BigDecimal value) { + addCriterion("discount <>", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountGreaterThan(BigDecimal value) { + addCriterion("discount >", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("discount >=", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountLessThan(BigDecimal value) { + addCriterion("discount <", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountLessThanOrEqualTo(BigDecimal value) { + addCriterion("discount <=", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountIn(List values) { + addCriterion("discount in", values, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountNotIn(List values) { + addCriterion("discount not in", values, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount between", value1, value2, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount not between", value1, value2, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountIsNull() { + addCriterion("discount_amount is null"); + return (Criteria) this; + } + + public Criteria andDiscountAmountIsNotNull() { + addCriterion("discount_amount is not null"); + return (Criteria) this; + } + + public Criteria andDiscountAmountEqualTo(BigDecimal value) { + addCriterion("discount_amount =", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountNotEqualTo(BigDecimal value) { + addCriterion("discount_amount <>", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountGreaterThan(BigDecimal value) { + addCriterion("discount_amount >", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("discount_amount >=", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountLessThan(BigDecimal value) { + addCriterion("discount_amount <", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("discount_amount <=", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountIn(List values) { + addCriterion("discount_amount in", values, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountNotIn(List values) { + addCriterion("discount_amount not in", values, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_amount between", value1, value2, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_amount not between", value1, value2, "discountAmount"); + return (Criteria) this; + } + + public Criteria andRealPriceIsNull() { + addCriterion("real_price is null"); + return (Criteria) this; + } + + public Criteria andRealPriceIsNotNull() { + addCriterion("real_price is not null"); + return (Criteria) this; + } + + public Criteria andRealPriceEqualTo(BigDecimal value) { + addCriterion("real_price =", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceNotEqualTo(BigDecimal value) { + addCriterion("real_price <>", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceGreaterThan(BigDecimal value) { + addCriterion("real_price >", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("real_price >=", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceLessThan(BigDecimal value) { + addCriterion("real_price <", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("real_price <=", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceIn(List values) { + addCriterion("real_price in", values, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceNotIn(List values) { + addCriterion("real_price not in", values, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("real_price between", value1, value2, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("real_price not between", value1, value2, "realPrice"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSale.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSale.java new file mode 100644 index 00000000..c9914f24 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSale.java @@ -0,0 +1,295 @@ +package cc.hiver.mall.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@ApiModel(value = "退货单主表") +@TableName(value = "t_return_sale", autoResultMap = true) +public class ReturnSale implements Serializable { + private String id; + + private String saleId; + + private String createBy; + + private Date createTime; + + private Integer delFlag; + + private String updateBy; + + private Date updateTime; + + @ApiModelProperty(value = "客户ID") + private String userId; + + @ApiModelProperty(value = "店铺ID") + private String shopId; + + @ApiModelProperty(value = "订单金额") + private BigDecimal totalAmount; + + @ApiModelProperty(value = "折扣") + private BigDecimal discount; + + @ApiModelProperty(value = "优惠金额") + private BigDecimal discountAmount; + + @ApiModelProperty(value = "实收金额") + private BigDecimal realAmount; + + @ApiModelProperty(value = "已收") + private BigDecimal alreadyEarn; + + @ApiModelProperty(value = "未收") + private BigDecimal noEarn; + + @ApiModelProperty(value = "收款状态 0-未收款 1-已收款") + private String payStatus; + + @ApiModelProperty(value = "订单状态 0-拣货中 1-已提交抢单 2-已取货 3-已送达") + private String status; + + @ApiModelProperty(value = "物流类别 0-物流 1-快递 2-自提 3-拼单") + private String transportType; + + @ApiModelProperty(value = "拼单店铺地址 为拼单类别时手动输入") + private String shareAddress; + + @ApiModelProperty(value = "收货地址") + private String receiveAddress; + + @ApiModelProperty(value = "省") + private String province; + + @ApiModelProperty(value = "市") + private String city; + + @ApiModelProperty(value = "区县") + private String area; + + private static final long serialVersionUID = 1L; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSaleId() { + return saleId; + } + + public void setSaleId(String saleId) { + this.saleId = saleId; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Integer getDelFlag() { + return delFlag; + } + + public void setDelFlag(Integer delFlag) { + this.delFlag = delFlag; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public BigDecimal getTotalAmount() { + return totalAmount; + } + + public void setTotalAmount(BigDecimal totalAmount) { + this.totalAmount = totalAmount; + } + + public BigDecimal getDiscount() { + return discount; + } + + public void setDiscount(BigDecimal discount) { + this.discount = discount; + } + + public BigDecimal getDiscountAmount() { + return discountAmount; + } + + public void setDiscountAmount(BigDecimal discountAmount) { + this.discountAmount = discountAmount; + } + + public BigDecimal getRealAmount() { + return realAmount; + } + + public void setRealAmount(BigDecimal realAmount) { + this.realAmount = realAmount; + } + + public BigDecimal getAlreadyEarn() { + return alreadyEarn; + } + + public void setAlreadyEarn(BigDecimal alreadyEarn) { + this.alreadyEarn = alreadyEarn; + } + + public BigDecimal getNoEarn() { + return noEarn; + } + + public void setNoEarn(BigDecimal noEarn) { + this.noEarn = noEarn; + } + + public String getPayStatus() { + return payStatus; + } + + public void setPayStatus(String payStatus) { + this.payStatus = payStatus; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getTransportType() { + return transportType; + } + + public void setTransportType(String transportType) { + this.transportType = transportType; + } + + public String getShareAddress() { + return shareAddress; + } + + public void setShareAddress(String shareAddress) { + this.shareAddress = shareAddress; + } + + public String getReceiveAddress() { + return receiveAddress; + } + + public void setReceiveAddress(String receiveAddress) { + this.receiveAddress = receiveAddress; + } + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + @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(", saleId=").append(saleId); + 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(); + } +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSaleExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSaleExample.java new file mode 100644 index 00000000..f0f58cdc --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSaleExample.java @@ -0,0 +1,1721 @@ +package cc.hiver.mall.entity; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ReturnSaleExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ReturnSaleExample() { + oredCriteria = new ArrayList<>(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList<>(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andSaleIdIsNull() { + addCriterion("sale_id is null"); + return (Criteria) this; + } + + public Criteria andSaleIdIsNotNull() { + addCriterion("sale_id is not null"); + return (Criteria) this; + } + + public Criteria andSaleIdEqualTo(String value) { + addCriterion("sale_id =", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdNotEqualTo(String value) { + addCriterion("sale_id <>", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdGreaterThan(String value) { + addCriterion("sale_id >", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdGreaterThanOrEqualTo(String value) { + addCriterion("sale_id >=", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdLessThan(String value) { + addCriterion("sale_id <", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdLessThanOrEqualTo(String value) { + addCriterion("sale_id <=", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdLike(String value) { + addCriterion("sale_id like", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdNotLike(String value) { + addCriterion("sale_id not like", value, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdIn(List values) { + addCriterion("sale_id in", values, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdNotIn(List values) { + addCriterion("sale_id not in", values, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdBetween(String value1, String value2) { + addCriterion("sale_id between", value1, value2, "saleId"); + return (Criteria) this; + } + + public Criteria andSaleIdNotBetween(String value1, String value2) { + addCriterion("sale_id not between", value1, value2, "saleId"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(Integer value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(Integer value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(Integer value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(Integer value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(Integer value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(Integer value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(Integer value1, Integer value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(Integer value1, Integer value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(String value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(String value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(String value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(String value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(String value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(String value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLike(String value) { + addCriterion("user_id like", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotLike(String value) { + addCriterion("user_id not like", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(String value1, String value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(String value1, String value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andShopIdIsNull() { + addCriterion("shop_id is null"); + return (Criteria) this; + } + + public Criteria andShopIdIsNotNull() { + addCriterion("shop_id is not null"); + return (Criteria) this; + } + + public Criteria andShopIdEqualTo(String value) { + addCriterion("shop_id =", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdNotEqualTo(String value) { + addCriterion("shop_id <>", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdGreaterThan(String value) { + addCriterion("shop_id >", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdGreaterThanOrEqualTo(String value) { + addCriterion("shop_id >=", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdLessThan(String value) { + addCriterion("shop_id <", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdLessThanOrEqualTo(String value) { + addCriterion("shop_id <=", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdLike(String value) { + addCriterion("shop_id like", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdNotLike(String value) { + addCriterion("shop_id not like", value, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdIn(List values) { + addCriterion("shop_id in", values, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdNotIn(List values) { + addCriterion("shop_id not in", values, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdBetween(String value1, String value2) { + addCriterion("shop_id between", value1, value2, "shopId"); + return (Criteria) this; + } + + public Criteria andShopIdNotBetween(String value1, String value2) { + addCriterion("shop_id not between", value1, value2, "shopId"); + return (Criteria) this; + } + + public Criteria andTotalAmountIsNull() { + addCriterion("total_amount is null"); + return (Criteria) this; + } + + public Criteria andTotalAmountIsNotNull() { + addCriterion("total_amount is not null"); + return (Criteria) this; + } + + public Criteria andTotalAmountEqualTo(BigDecimal value) { + addCriterion("total_amount =", value, "totalAmount"); + return (Criteria) this; + } + + public Criteria andTotalAmountNotEqualTo(BigDecimal value) { + addCriterion("total_amount <>", value, "totalAmount"); + return (Criteria) this; + } + + public Criteria andTotalAmountGreaterThan(BigDecimal value) { + addCriterion("total_amount >", value, "totalAmount"); + return (Criteria) this; + } + + public Criteria andTotalAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("total_amount >=", value, "totalAmount"); + return (Criteria) this; + } + + public Criteria andTotalAmountLessThan(BigDecimal value) { + addCriterion("total_amount <", value, "totalAmount"); + return (Criteria) this; + } + + public Criteria andTotalAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("total_amount <=", value, "totalAmount"); + return (Criteria) this; + } + + public Criteria andTotalAmountIn(List values) { + addCriterion("total_amount in", values, "totalAmount"); + return (Criteria) this; + } + + public Criteria andTotalAmountNotIn(List values) { + addCriterion("total_amount not in", values, "totalAmount"); + return (Criteria) this; + } + + public Criteria andTotalAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_amount between", value1, value2, "totalAmount"); + return (Criteria) this; + } + + public Criteria andTotalAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("total_amount not between", value1, value2, "totalAmount"); + return (Criteria) this; + } + + public Criteria andDiscountIsNull() { + addCriterion("discount is null"); + return (Criteria) this; + } + + public Criteria andDiscountIsNotNull() { + addCriterion("discount is not null"); + return (Criteria) this; + } + + public Criteria andDiscountEqualTo(BigDecimal value) { + addCriterion("discount =", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountNotEqualTo(BigDecimal value) { + addCriterion("discount <>", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountGreaterThan(BigDecimal value) { + addCriterion("discount >", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("discount >=", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountLessThan(BigDecimal value) { + addCriterion("discount <", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountLessThanOrEqualTo(BigDecimal value) { + addCriterion("discount <=", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountIn(List values) { + addCriterion("discount in", values, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountNotIn(List values) { + addCriterion("discount not in", values, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount between", value1, value2, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount not between", value1, value2, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountIsNull() { + addCriterion("discount_amount is null"); + return (Criteria) this; + } + + public Criteria andDiscountAmountIsNotNull() { + addCriterion("discount_amount is not null"); + return (Criteria) this; + } + + public Criteria andDiscountAmountEqualTo(BigDecimal value) { + addCriterion("discount_amount =", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountNotEqualTo(BigDecimal value) { + addCriterion("discount_amount <>", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountGreaterThan(BigDecimal value) { + addCriterion("discount_amount >", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("discount_amount >=", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountLessThan(BigDecimal value) { + addCriterion("discount_amount <", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("discount_amount <=", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountIn(List values) { + addCriterion("discount_amount in", values, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountNotIn(List values) { + addCriterion("discount_amount not in", values, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_amount between", value1, value2, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_amount not between", value1, value2, "discountAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountIsNull() { + addCriterion("real_amount is null"); + return (Criteria) this; + } + + public Criteria andRealAmountIsNotNull() { + addCriterion("real_amount is not null"); + return (Criteria) this; + } + + public Criteria andRealAmountEqualTo(BigDecimal value) { + addCriterion("real_amount =", value, "realAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountNotEqualTo(BigDecimal value) { + addCriterion("real_amount <>", value, "realAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountGreaterThan(BigDecimal value) { + addCriterion("real_amount >", value, "realAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("real_amount >=", value, "realAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountLessThan(BigDecimal value) { + addCriterion("real_amount <", value, "realAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("real_amount <=", value, "realAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountIn(List values) { + addCriterion("real_amount in", values, "realAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountNotIn(List values) { + addCriterion("real_amount not in", values, "realAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("real_amount between", value1, value2, "realAmount"); + return (Criteria) this; + } + + public Criteria andRealAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("real_amount not between", value1, value2, "realAmount"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnIsNull() { + addCriterion("already_earn is null"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnIsNotNull() { + addCriterion("already_earn is not null"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnEqualTo(BigDecimal value) { + addCriterion("already_earn =", value, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnNotEqualTo(BigDecimal value) { + addCriterion("already_earn <>", value, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnGreaterThan(BigDecimal value) { + addCriterion("already_earn >", value, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("already_earn >=", value, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnLessThan(BigDecimal value) { + addCriterion("already_earn <", value, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnLessThanOrEqualTo(BigDecimal value) { + addCriterion("already_earn <=", value, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnIn(List values) { + addCriterion("already_earn in", values, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnNotIn(List values) { + addCriterion("already_earn not in", values, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("already_earn between", value1, value2, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andAlreadyEarnNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("already_earn not between", value1, value2, "alreadyEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnIsNull() { + addCriterion("no_earn is null"); + return (Criteria) this; + } + + public Criteria andNoEarnIsNotNull() { + addCriterion("no_earn is not null"); + return (Criteria) this; + } + + public Criteria andNoEarnEqualTo(BigDecimal value) { + addCriterion("no_earn =", value, "noEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnNotEqualTo(BigDecimal value) { + addCriterion("no_earn <>", value, "noEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnGreaterThan(BigDecimal value) { + addCriterion("no_earn >", value, "noEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("no_earn >=", value, "noEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnLessThan(BigDecimal value) { + addCriterion("no_earn <", value, "noEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnLessThanOrEqualTo(BigDecimal value) { + addCriterion("no_earn <=", value, "noEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnIn(List values) { + addCriterion("no_earn in", values, "noEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnNotIn(List values) { + addCriterion("no_earn not in", values, "noEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("no_earn between", value1, value2, "noEarn"); + return (Criteria) this; + } + + public Criteria andNoEarnNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("no_earn not between", value1, value2, "noEarn"); + return (Criteria) this; + } + + public Criteria andPayStatusIsNull() { + addCriterion("pay_status is null"); + return (Criteria) this; + } + + public Criteria andPayStatusIsNotNull() { + addCriterion("pay_status is not null"); + return (Criteria) this; + } + + public Criteria andPayStatusEqualTo(String value) { + addCriterion("pay_status =", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusNotEqualTo(String value) { + addCriterion("pay_status <>", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusGreaterThan(String value) { + addCriterion("pay_status >", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusGreaterThanOrEqualTo(String value) { + addCriterion("pay_status >=", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusLessThan(String value) { + addCriterion("pay_status <", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusLessThanOrEqualTo(String value) { + addCriterion("pay_status <=", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusLike(String value) { + addCriterion("pay_status like", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusNotLike(String value) { + addCriterion("pay_status not like", value, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusIn(List values) { + addCriterion("pay_status in", values, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusNotIn(List values) { + addCriterion("pay_status not in", values, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusBetween(String value1, String value2) { + addCriterion("pay_status between", value1, value2, "payStatus"); + return (Criteria) this; + } + + public Criteria andPayStatusNotBetween(String value1, String value2) { + addCriterion("pay_status not between", value1, value2, "payStatus"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(String value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(String value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(String value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(String value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(String value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(String value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLike(String value) { + addCriterion("status like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotLike(String value) { + addCriterion("status not like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(String value1, String value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(String value1, String value2) { + addCriterion("status not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andTransportTypeIsNull() { + addCriterion("transport_type is null"); + return (Criteria) this; + } + + public Criteria andTransportTypeIsNotNull() { + addCriterion("transport_type is not null"); + return (Criteria) this; + } + + public Criteria andTransportTypeEqualTo(String value) { + addCriterion("transport_type =", value, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeNotEqualTo(String value) { + addCriterion("transport_type <>", value, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeGreaterThan(String value) { + addCriterion("transport_type >", value, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeGreaterThanOrEqualTo(String value) { + addCriterion("transport_type >=", value, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeLessThan(String value) { + addCriterion("transport_type <", value, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeLessThanOrEqualTo(String value) { + addCriterion("transport_type <=", value, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeLike(String value) { + addCriterion("transport_type like", value, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeNotLike(String value) { + addCriterion("transport_type not like", value, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeIn(List values) { + addCriterion("transport_type in", values, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeNotIn(List values) { + addCriterion("transport_type not in", values, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeBetween(String value1, String value2) { + addCriterion("transport_type between", value1, value2, "transportType"); + return (Criteria) this; + } + + public Criteria andTransportTypeNotBetween(String value1, String value2) { + addCriterion("transport_type not between", value1, value2, "transportType"); + return (Criteria) this; + } + + public Criteria andShareAddressIsNull() { + addCriterion("share_address is null"); + return (Criteria) this; + } + + public Criteria andShareAddressIsNotNull() { + addCriterion("share_address is not null"); + return (Criteria) this; + } + + public Criteria andShareAddressEqualTo(String value) { + addCriterion("share_address =", value, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressNotEqualTo(String value) { + addCriterion("share_address <>", value, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressGreaterThan(String value) { + addCriterion("share_address >", value, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressGreaterThanOrEqualTo(String value) { + addCriterion("share_address >=", value, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressLessThan(String value) { + addCriterion("share_address <", value, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressLessThanOrEqualTo(String value) { + addCriterion("share_address <=", value, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressLike(String value) { + addCriterion("share_address like", value, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressNotLike(String value) { + addCriterion("share_address not like", value, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressIn(List values) { + addCriterion("share_address in", values, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressNotIn(List values) { + addCriterion("share_address not in", values, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressBetween(String value1, String value2) { + addCriterion("share_address between", value1, value2, "shareAddress"); + return (Criteria) this; + } + + public Criteria andShareAddressNotBetween(String value1, String value2) { + addCriterion("share_address not between", value1, value2, "shareAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressIsNull() { + addCriterion("receive_address is null"); + return (Criteria) this; + } + + public Criteria andReceiveAddressIsNotNull() { + addCriterion("receive_address is not null"); + return (Criteria) this; + } + + public Criteria andReceiveAddressEqualTo(String value) { + addCriterion("receive_address =", value, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressNotEqualTo(String value) { + addCriterion("receive_address <>", value, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressGreaterThan(String value) { + addCriterion("receive_address >", value, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressGreaterThanOrEqualTo(String value) { + addCriterion("receive_address >=", value, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressLessThan(String value) { + addCriterion("receive_address <", value, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressLessThanOrEqualTo(String value) { + addCriterion("receive_address <=", value, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressLike(String value) { + addCriterion("receive_address like", value, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressNotLike(String value) { + addCriterion("receive_address not like", value, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressIn(List values) { + addCriterion("receive_address in", values, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressNotIn(List values) { + addCriterion("receive_address not in", values, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressBetween(String value1, String value2) { + addCriterion("receive_address between", value1, value2, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andReceiveAddressNotBetween(String value1, String value2) { + addCriterion("receive_address not between", value1, value2, "receiveAddress"); + return (Criteria) this; + } + + public Criteria andProvinceIsNull() { + addCriterion("province is null"); + return (Criteria) this; + } + + public Criteria andProvinceIsNotNull() { + addCriterion("province is not null"); + return (Criteria) this; + } + + public Criteria andProvinceEqualTo(String value) { + addCriterion("province =", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotEqualTo(String value) { + addCriterion("province <>", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceGreaterThan(String value) { + addCriterion("province >", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceGreaterThanOrEqualTo(String value) { + addCriterion("province >=", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceLessThan(String value) { + addCriterion("province <", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceLessThanOrEqualTo(String value) { + addCriterion("province <=", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceLike(String value) { + addCriterion("province like", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotLike(String value) { + addCriterion("province not like", value, "province"); + return (Criteria) this; + } + + public Criteria andProvinceIn(List values) { + addCriterion("province in", values, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotIn(List values) { + addCriterion("province not in", values, "province"); + return (Criteria) this; + } + + public Criteria andProvinceBetween(String value1, String value2) { + addCriterion("province between", value1, value2, "province"); + return (Criteria) this; + } + + public Criteria andProvinceNotBetween(String value1, String value2) { + addCriterion("province not between", value1, value2, "province"); + return (Criteria) this; + } + + public Criteria andCityIsNull() { + addCriterion("city is null"); + return (Criteria) this; + } + + public Criteria andCityIsNotNull() { + addCriterion("city is not null"); + return (Criteria) this; + } + + public Criteria andCityEqualTo(String value) { + addCriterion("city =", value, "city"); + return (Criteria) this; + } + + public Criteria andCityNotEqualTo(String value) { + addCriterion("city <>", value, "city"); + return (Criteria) this; + } + + public Criteria andCityGreaterThan(String value) { + addCriterion("city >", value, "city"); + return (Criteria) this; + } + + public Criteria andCityGreaterThanOrEqualTo(String value) { + addCriterion("city >=", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLessThan(String value) { + addCriterion("city <", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLessThanOrEqualTo(String value) { + addCriterion("city <=", value, "city"); + return (Criteria) this; + } + + public Criteria andCityLike(String value) { + addCriterion("city like", value, "city"); + return (Criteria) this; + } + + public Criteria andCityNotLike(String value) { + addCriterion("city not like", value, "city"); + return (Criteria) this; + } + + public Criteria andCityIn(List values) { + addCriterion("city in", values, "city"); + return (Criteria) this; + } + + public Criteria andCityNotIn(List values) { + addCriterion("city not in", values, "city"); + return (Criteria) this; + } + + public Criteria andCityBetween(String value1, String value2) { + addCriterion("city between", value1, value2, "city"); + return (Criteria) this; + } + + public Criteria andCityNotBetween(String value1, String value2) { + addCriterion("city not between", value1, value2, "city"); + return (Criteria) this; + } + + public Criteria andAreaIsNull() { + addCriterion("area is null"); + return (Criteria) this; + } + + public Criteria andAreaIsNotNull() { + addCriterion("area is not null"); + return (Criteria) this; + } + + public Criteria andAreaEqualTo(String value) { + addCriterion("area =", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotEqualTo(String value) { + addCriterion("area <>", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaGreaterThan(String value) { + addCriterion("area >", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaGreaterThanOrEqualTo(String value) { + addCriterion("area >=", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLessThan(String value) { + addCriterion("area <", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLessThanOrEqualTo(String value) { + addCriterion("area <=", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLike(String value) { + addCriterion("area like", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotLike(String value) { + addCriterion("area not like", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaIn(List values) { + addCriterion("area in", values, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotIn(List values) { + addCriterion("area not in", values, "area"); + return (Criteria) this; + } + + public Criteria andAreaBetween(String value1, String value2) { + addCriterion("area between", value1, value2, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotBetween(String value1, String value2) { + addCriterion("area not between", value1, value2, "area"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/ReturnSaleDetailDTO.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/ReturnSaleDetailDTO.java new file mode 100644 index 00000000..6a2c2585 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/ReturnSaleDetailDTO.java @@ -0,0 +1,66 @@ +package cc.hiver.mall.pojo.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +@ApiModel(value = "退货单明细表") +@Data +public class ReturnSaleDetailDTO implements Serializable { + + @ApiModelProperty(value = "原销售单ID") + private String saleId; + + @ApiModelProperty(value = "退货单ID") + private String returnSaleId; + + @ApiModelProperty(value = "商品ID") + private String productId; + + @ApiModelProperty(value = "商品名称") + private String productName; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "店铺ID") + private String shopId; + + @ApiModelProperty(value = "商品分类") + private String categoryId; + + @ApiModelProperty(value = "同一件商品购买属性列表") + private List saleDetailQueryDTO; + + @ApiModelProperty(value = "属性列表") + private String attributeList; + + @ApiModelProperty(value = "市场价") + private BigDecimal price; + + @ApiModelProperty(value = "采购价") + private BigDecimal purchasePrice; + + @ApiModelProperty(value = "批发价") + private BigDecimal wholesalePrice; + + @ApiModelProperty(value = "销售数量") + private Integer productCount; + + @ApiModelProperty(value = "折扣") + private BigDecimal discount; + + @ApiModelProperty(value = "优惠金额") + private BigDecimal discountAmount; + + @ApiModelProperty(value = "实际价格") + private BigDecimal realPrice; + + private static final long serialVersionUID = 1L; + + +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/SaleReturnDTO.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/SaleReturnDTO.java new file mode 100644 index 00000000..04380c7d --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/dto/SaleReturnDTO.java @@ -0,0 +1,30 @@ +package cc.hiver.mall.pojo.dto; + +import cc.hiver.mall.entity.ReturnSale; +import cc.hiver.mall.entity.Sale; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@ApiModel(value = "退款订单") +@Data +public class SaleReturnDTO implements Serializable { + + @ApiModelProperty(value = "退货单主表") + private ReturnSale returnSale; + + @ApiModelProperty(value = "退款订单明细") + private List returnSaleDetailList; + + + @ApiModelProperty(value = "扛包工编号") + private String orderByWorker; + + @ApiModelProperty(value = "物流公司编号") + private String transCompany; + + +} \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/RushOrderService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/RushOrderService.java index 85e22c9f..4b37b9a1 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/RushOrderService.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/RushOrderService.java @@ -2,6 +2,7 @@ package cc.hiver.mall.service; import cc.hiver.mall.pojo.dto.SaleDTO; import cc.hiver.mall.pojo.dto.SaleQueryDTO; +import cc.hiver.mall.pojo.dto.SaleReturnDTO; public interface RushOrderService { @@ -9,4 +10,6 @@ public interface RushOrderService { void handleNewRushOrder(SaleQueryDTO saleQueryDTO); + void handleReturnRushOrder(SaleReturnDTO saleReturnDTO); + } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/SalesAndDetailsService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/SalesAndDetailsService.java index 6756dcb7..cf8d316e 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/SalesAndDetailsService.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/SalesAndDetailsService.java @@ -1,8 +1,10 @@ package cc.hiver.mall.service; +import cc.hiver.mall.entity.ReturnSale; import cc.hiver.mall.entity.Sale; import cc.hiver.mall.pojo.dto.SaleDTO; import cc.hiver.mall.pojo.dto.SaleQueryDTO; +import cc.hiver.mall.pojo.dto.SaleReturnDTO; import cc.hiver.mall.pojo.vo.SaleVO; public interface SalesAndDetailsService { @@ -13,6 +15,6 @@ public interface SalesAndDetailsService { public Sale handleSalesDetails(SaleQueryDTO saleDTO); - public Sale handleBackSalesDetails(SaleQueryDTO saleDTO); + public ReturnSale handleBackSalesDetails(SaleReturnDTO saleDTO); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/StockAndLogService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/StockAndLogService.java index a4cedd58..7810bd9f 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/StockAndLogService.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/StockAndLogService.java @@ -1,6 +1,9 @@ package cc.hiver.mall.service; +import cc.hiver.mall.entity.ReturnDetail; +import cc.hiver.mall.entity.ReturnDetailExample; import cc.hiver.mall.entity.SaleDetail; +import cc.hiver.mall.pojo.dto.ReturnSaleDetailDTO; import cc.hiver.mall.pojo.dto.SaleDetailDTO; import java.util.List; @@ -19,4 +22,6 @@ public interface StockAndLogService { //入 void handleIncStockLog(List saleDetailList); + void handleRetIncStockLog(List returnDetails); + } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ReturnDetailService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ReturnDetailService.java new file mode 100644 index 00000000..03ffc589 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ReturnDetailService.java @@ -0,0 +1,10 @@ +package cc.hiver.mall.service.mybatis; + +import cc.hiver.mall.entity.ReturnDetail; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface ReturnDetailService extends IService { + + + +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ReturnSaleService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ReturnSaleService.java new file mode 100644 index 00000000..bf1d3aaa --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ReturnSaleService.java @@ -0,0 +1,11 @@ +package cc.hiver.mall.service.mybatis; + +import cc.hiver.mall.entity.ReturnSale; +import cc.hiver.mall.entity.Sale; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface ReturnSaleService extends IService { + + + +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/RushOrderServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/RushOrderServiceImpl.java index 35d0f374..7ec1aa69 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/RushOrderServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/RushOrderServiceImpl.java @@ -1,9 +1,11 @@ package cc.hiver.mall.serviceimpl; import cc.hiver.mall.entity.OrderXd; +import cc.hiver.mall.entity.ReturnSale; import cc.hiver.mall.entity.Sale; import cc.hiver.mall.pojo.dto.SaleDTO; import cc.hiver.mall.pojo.dto.SaleQueryDTO; +import cc.hiver.mall.pojo.dto.SaleReturnDTO; import cc.hiver.mall.service.OrderService; import cc.hiver.mall.service.RushOrderService; import cn.hutool.core.util.StrUtil; @@ -62,4 +64,27 @@ public class RushOrderServiceImpl implements RushOrderService { orderService.save(orderXd); } + + @Override + public void handleReturnRushOrder(SaleReturnDTO saleReturnDTO) { + /** + * 如果退款的时候物流公司编号也不选，那就证明自己往回带 + * */ + ReturnSale sale = saleReturnDTO.getReturnSale(); + OrderXd orderXd = new OrderXd(); + orderXd.setOrderId(sale.getId()); + orderXd.setOrderLogistics(sale.getTransportType()); + orderXd.setOrderAddress(sale.getProvince()+","+sale.getCity()+","+sale.getArea()); + if("4".equals(sale.getTransportType())) + orderXd.setOrderStreet(sale.getShareAddress()); + else + orderXd.setOrderStreet(sale.getReceiveAddress()); + orderXd.setOrderStatus(Integer.valueOf(sale.getStatus())); + orderXd.setOrderByWorker(StrUtil.isNotEmpty(saleReturnDTO.getOrderByWorker())? saleReturnDTO.getOrderByWorker() : null); + orderXd.setTransCompany(saleReturnDTO.getTransCompany()); + orderXd.setOrderByWorkertime(sale.getCreateTime()); + orderXd.setTimeout(2); + + orderService.save(orderXd); + } } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java index 7bceb467..e12697b4 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java @@ -2,14 +2,9 @@ package cc.hiver.mall.serviceimpl; import cc.hiver.core.common.utils.BeanUtils; import cc.hiver.mall.entity.*; -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.dto.*; import cc.hiver.mall.service.SalesAndDetailsService; -import cc.hiver.mall.service.mybatis.ProductService; -import cc.hiver.mall.service.mybatis.SaleDetailService; -import cc.hiver.mall.service.mybatis.SaleService; +import cc.hiver.mall.service.mybatis.*; import cn.hutool.core.util.StrUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,6 +26,12 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService { @Autowired ProductService productService; + @Autowired + ReturnSaleService returnSaleService; + + @Autowired + ReturnDetailService returnDetailService; + @Override public Sale handleSalesAndDetails(SaleDTO saleDTO) { @@ -193,7 +194,52 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService { } @Override - public Sale handleBackSalesDetails(SaleQueryDTO saleDTO) { - return null; + public ReturnSale handleBackSalesDetails(SaleReturnDTO saleDTO) { + /** + * 1.处理Sale总订单 + * */ + String id = saleDTO.getReturnSale().getSaleId(); + Sale sale = saleService.getById(id); + ReturnSale returnSale = new ReturnSale(); + BeanUtils.copyBeanProp(returnSale,sale); + returnSaleService.save(returnSale); + + + String returnSaleId = returnSale.getId(); + /** + * 2.处理SaleDetail明细单 + * */ + + Product product; + + List saleDetailList = saleDTO.getReturnSaleDetailList(); + List saleDetailList2 = new ArrayList(); + + for(ReturnSaleDetailDTO returnSaleDetailDTO : saleDetailList){ + List attributeList = new ArrayList<>(); + int count = 0; + ReturnDetail returnDetail = new ReturnDetail(); + String productId = returnSaleDetailDTO.getProductId(); + product =productService.getById(productId); + returnSaleDetailDTO.setProductName(product.getProductName()); + returnSaleDetailDTO.setUnit(product.getUnit()); + returnSaleDetailDTO.setShopId(sale.getShopId()); + returnSaleDetailDTO.setCategoryId(product.getCategoryId()); + returnSaleDetailDTO.setSaleId(id); + returnSaleDetailDTO.setPrice(product.getPrice()); + returnSaleDetailDTO.setWholesalePrice(product.getWholesalePrice()); + returnSaleDetailDTO.setPurchasePrice(product.getPurchasePrice()); + returnSaleDetailDTO.setReturnSaleId(returnSaleId); + for(SaleDetailQueryDTO saleDetailQueryDTO : returnSaleDetailDTO.getSaleDetailQueryDTO()){ + attributeList.add(saleDetailQueryDTO.getAttributeList()); + count += saleDetailQueryDTO.getProductCount(); + } + returnSaleDetailDTO.setAttributeList(attributeList.toString()); + returnSaleDetailDTO.setProductCount(count); + BeanUtils.copyBeanProp(returnDetail,returnSaleDetailDTO); + saleDetailList2.add(returnDetail); + } + returnDetailService.saveBatch(saleDetailList2); + return returnSale; } } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/StockAndLogServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/StockAndLogServiceImpl.java index a922f282..6a258d10 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/StockAndLogServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/StockAndLogServiceImpl.java @@ -1,10 +1,8 @@ package cc.hiver.mall.serviceimpl; import cc.hiver.core.common.utils.BeanUtils; -import cc.hiver.mall.entity.Product; -import cc.hiver.mall.entity.SaleDetail; -import cc.hiver.mall.entity.Stock; -import cc.hiver.mall.entity.StockLog; +import cc.hiver.mall.entity.*; +import cc.hiver.mall.pojo.dto.ReturnSaleDetailDTO; import cc.hiver.mall.pojo.dto.SaleDetailDTO; import cc.hiver.mall.pojo.dto.SaleDetailQueryDTO; import cc.hiver.mall.service.StockAndLogService; @@ -179,4 +177,77 @@ public class StockAndLogServiceImpl implements StockAndLogService { public void handleIncStockLog(List saleDetailList) { } + + @Override + public void handleRetIncStockLog(List returnDetails) { + //根据销售单明细进行库存消减 + for(ReturnSaleDetailDTO saleDetailDTO : returnDetails){ + String productId = saleDetailDTO.getProductId(); + String shopId = saleDetailDTO.getShopId(); + Product product = productService.getById(productId); + List saleDetailQueryDTOS = saleDetailDTO.getSaleDetailQueryDTO(); + QueryWrapper stockQueryWrapper = new QueryWrapper<>(); + for(SaleDetailQueryDTO saleDetailQueryDTO : saleDetailQueryDTOS){ + stockQueryWrapper.eq("product_id",productId); + stockQueryWrapper.eq("attribute_list",saleDetailQueryDTO.getAttributeList()); + //存在库存则修改库存数量 + Stock origin = stockService.getOne(stockQueryWrapper); + if(origin == null){ + //没有就创建入库正记录 + Stock stockNew = new Stock(); + stockNew.setProductName(product.getProductName()); + stockNew.setUnit(product.getUnit()); + stockNew.setShopId(saleDetailDTO.getShopId()); + stockNew.setCategoryId(product.getCategoryId()); + stockNew.setSupplierId(product.getSupplierId()); + stockNew.setProductSn(product.getProductSn()); + stockNew.setBarcode(product.getBarcode()); + stockNew.setProductVideo(product.getProductVideo()); + stockNew.setProductIntro(product.getProductIntro()); + stockNew.setSalesWeek(product.getSalesWeek()); + stockNew.setProductId(productId); + stockNew.setPrintBarcode(product.getPrintBarcode()); + stockNew.setStockCount(saleDetailQueryDTO.getProductCount()); + stockNew.setAttributeList(saleDetailQueryDTO.getAttributeList()); + stockNew.setPrice(saleDetailDTO.getPrice()); + stockNew.setPurchasePrice(saleDetailDTO.getPurchasePrice()); + stockNew.setWholesalePrice(saleDetailDTO.getWholesalePrice()); + stockService.save(stockNew); + + + //2.记录库存履历 + StockLog stockLog = new StockLog(); + stockLog.setChangeType("0");//以商品维度，如果没有库存反向插入一条正库存入库 + stockLog.setProductId(productId); + stockLog.setProductSpecs(saleDetailQueryDTO.getAttributeList()); + stockLog.setStock(0);//入库前数量 + stockLog.setChangeStock(saleDetailQueryDTO.getProductCount());//入库数量 + stockLog.setPrice(saleDetailDTO.getPrice()); + stockLog.setPurchasePrice(saleDetailDTO.getPurchasePrice()); + stockLog.setWholesalePrice(saleDetailDTO.getWholesalePrice()); + stockLog.setShopId(shopId); + stockLogService.save(stockLog); + }else { + Integer stockCount = origin.getStockCount(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", origin.getId()); + updateWrapper.set("stock_count", stockCount + saleDetailQueryDTO.getProductCount()); + stockService.update(updateWrapper); + + //2.记录库存履历 + StockLog stockLog = new StockLog(); + stockLog.setChangeType("0");//出库 + stockLog.setProductId(productId); + stockLog.setProductSpecs(saleDetailQueryDTO.getAttributeList()); + stockLog.setStock(stockCount);//入库前数量 + stockLog.setChangeStock(saleDetailQueryDTO.getProductCount());//入库数量 + stockLog.setPrice(saleDetailDTO.getPrice()); + stockLog.setPurchasePrice(saleDetailDTO.getPurchasePrice()); + stockLog.setWholesalePrice(saleDetailDTO.getWholesalePrice()); + stockLog.setShopId(shopId); + stockLogService.save(stockLog); + } + } + } + } } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnDetailServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnDetailServiceImpl.java new file mode 100644 index 00000000..b66d5981 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnDetailServiceImpl.java @@ -0,0 +1,17 @@ +package cc.hiver.mall.serviceimpl.mybatis; + +import cc.hiver.mall.dao.mapper.ReturnDetailMapper; +import cc.hiver.mall.dao.mapper.SaleDetailMapper; +import cc.hiver.mall.entity.ReturnDetail; +import cc.hiver.mall.entity.SaleDetail; +import cc.hiver.mall.service.mybatis.ReturnDetailService; +import cc.hiver.mall.service.mybatis.SaleDetailService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class ReturnDetailServiceImpl extends ServiceImpl implements ReturnDetailService { + + + +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnSaleServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnSaleServiceImpl.java new file mode 100644 index 00000000..18179c16 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ReturnSaleServiceImpl.java @@ -0,0 +1,16 @@ +package cc.hiver.mall.serviceimpl.mybatis; + +import cc.hiver.mall.dao.mapper.ReturnSaleMapper; +import cc.hiver.mall.dao.mapper.SaleMapper; +import cc.hiver.mall.entity.ReturnSale; +import cc.hiver.mall.entity.Sale; +import cc.hiver.mall.service.mybatis.ReturnSaleService; +import cc.hiver.mall.service.mybatis.SaleService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class ReturnSaleServiceImpl extends ServiceImpl implements ReturnSaleService { + + +} diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnDetailMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnDetailMapper.xml new file mode 100644 index 00000000..4e05a444 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnDetailMapper.xml @@ -0,0 +1,448 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, create_by, create_time, del_flag, update_by, update_time, sale_id, product_id, + product_name, unit, shop_id, category_id, attribute_list, price, purchase_price, + wholesale_price, product_count, discount, discount_amount, real_price + + + + + delete from t_return_detail + where id = #{id,jdbcType=VARCHAR} + + + delete from t_return_detail + + + + + + insert into t_return_detail (id, create_by, create_time, + del_flag, update_by, update_time, + sale_id, product_id, product_name, + unit, shop_id, category_id, + attribute_list, price, purchase_price, + wholesale_price, product_count, discount, + discount_amount, real_price) + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, + #{saleId,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, + #{unit,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, + #{attributeList,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{purchasePrice,jdbcType=DECIMAL}, + #{wholesalePrice,jdbcType=DECIMAL}, #{productCount,jdbcType=INTEGER}, #{discount,jdbcType=DECIMAL}, + #{discountAmount,jdbcType=DECIMAL}, #{realPrice,jdbcType=DECIMAL}) + + + insert into t_return_detail + + + id, + + + create_by, + + + create_time, + + + del_flag, + + + update_by, + + + update_time, + + + sale_id, + + + product_id, + + + product_name, + + + unit, + + + shop_id, + + + category_id, + + + attribute_list, + + + price, + + + purchase_price, + + + wholesale_price, + + + product_count, + + + discount, + + + discount_amount, + + + real_price, + + + + + #{id,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{delFlag,jdbcType=INTEGER}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{saleId,jdbcType=VARCHAR}, + + + #{productId,jdbcType=VARCHAR}, + + + #{productName,jdbcType=VARCHAR}, + + + #{unit,jdbcType=VARCHAR}, + + + #{shopId,jdbcType=VARCHAR}, + + + #{categoryId,jdbcType=VARCHAR}, + + + #{attributeList,jdbcType=VARCHAR}, + + + #{price,jdbcType=DECIMAL}, + + + #{purchasePrice,jdbcType=DECIMAL}, + + + #{wholesalePrice,jdbcType=DECIMAL}, + + + #{productCount,jdbcType=INTEGER}, + + + #{discount,jdbcType=DECIMAL}, + + + #{discountAmount,jdbcType=DECIMAL}, + + + #{realPrice,jdbcType=DECIMAL}, + + + + + + update t_return_detail + + + id = #{record.id,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + del_flag = #{record.delFlag,jdbcType=INTEGER}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + sale_id = #{record.saleId,jdbcType=VARCHAR}, + + + product_id = #{record.productId,jdbcType=VARCHAR}, + + + product_name = #{record.productName,jdbcType=VARCHAR}, + + + unit = #{record.unit,jdbcType=VARCHAR}, + + + shop_id = #{record.shopId,jdbcType=VARCHAR}, + + + category_id = #{record.categoryId,jdbcType=VARCHAR}, + + + attribute_list = #{record.attributeList,jdbcType=VARCHAR}, + + + price = #{record.price,jdbcType=DECIMAL}, + + + purchase_price = #{record.purchasePrice,jdbcType=DECIMAL}, + + + wholesale_price = #{record.wholesalePrice,jdbcType=DECIMAL}, + + + product_count = #{record.productCount,jdbcType=INTEGER}, + + + discount = #{record.discount,jdbcType=DECIMAL}, + + + discount_amount = #{record.discountAmount,jdbcType=DECIMAL}, + + + real_price = #{record.realPrice,jdbcType=DECIMAL}, + + + + + + + + update t_return_detail + set id = #{record.id,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + del_flag = #{record.delFlag,jdbcType=INTEGER}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + sale_id = #{record.saleId,jdbcType=VARCHAR}, + product_id = #{record.productId,jdbcType=VARCHAR}, + product_name = #{record.productName,jdbcType=VARCHAR}, + unit = #{record.unit,jdbcType=VARCHAR}, + shop_id = #{record.shopId,jdbcType=VARCHAR}, + category_id = #{record.categoryId,jdbcType=VARCHAR}, + attribute_list = #{record.attributeList,jdbcType=VARCHAR}, + price = #{record.price,jdbcType=DECIMAL}, + purchase_price = #{record.purchasePrice,jdbcType=DECIMAL}, + wholesale_price = #{record.wholesalePrice,jdbcType=DECIMAL}, + product_count = #{record.productCount,jdbcType=INTEGER}, + discount = #{record.discount,jdbcType=DECIMAL}, + discount_amount = #{record.discountAmount,jdbcType=DECIMAL}, + real_price = #{record.realPrice,jdbcType=DECIMAL} + + + + + + update t_return_detail + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=INTEGER}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + sale_id = #{saleId,jdbcType=VARCHAR}, + + + product_id = #{productId,jdbcType=VARCHAR}, + + + product_name = #{productName,jdbcType=VARCHAR}, + + + unit = #{unit,jdbcType=VARCHAR}, + + + shop_id = #{shopId,jdbcType=VARCHAR}, + + + category_id = #{categoryId,jdbcType=VARCHAR}, + + + attribute_list = #{attributeList,jdbcType=VARCHAR}, + + + price = #{price,jdbcType=DECIMAL}, + + + purchase_price = #{purchasePrice,jdbcType=DECIMAL}, + + + wholesale_price = #{wholesalePrice,jdbcType=DECIMAL}, + + + product_count = #{productCount,jdbcType=INTEGER}, + + + discount = #{discount,jdbcType=DECIMAL}, + + + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + + + real_price = #{realPrice,jdbcType=DECIMAL}, + + + where id = #{id,jdbcType=VARCHAR} + + + update t_return_detail + set create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + del_flag = #{delFlag,jdbcType=INTEGER}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + sale_id = #{saleId,jdbcType=VARCHAR}, + product_id = #{productId,jdbcType=VARCHAR}, + product_name = #{productName,jdbcType=VARCHAR}, + unit = #{unit,jdbcType=VARCHAR}, + shop_id = #{shopId,jdbcType=VARCHAR}, + category_id = #{categoryId,jdbcType=VARCHAR}, + attribute_list = #{attributeList,jdbcType=VARCHAR}, + price = #{price,jdbcType=DECIMAL}, + purchase_price = #{purchasePrice,jdbcType=DECIMAL}, + wholesale_price = #{wholesalePrice,jdbcType=DECIMAL}, + product_count = #{productCount,jdbcType=INTEGER}, + discount = #{discount,jdbcType=DECIMAL}, + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + real_price = #{realPrice,jdbcType=DECIMAL} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnSaleMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnSaleMapper.xml new file mode 100644 index 00000000..f0cec7b5 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ReturnSaleMapper.xml @@ -0,0 +1,495 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, sale_id, create_by, create_time, del_flag, update_by, update_time, user_id, shop_id, + total_amount, discount, discount_amount, real_amount, already_earn, no_earn, pay_status, + status, transport_type, share_address, receive_address, province, city, area + + + + + delete from t_return_sale + where id = #{id,jdbcType=VARCHAR} + + + delete from t_return_sale + + + + + + insert into t_return_sale (id, sale_id, create_by, + create_time, del_flag, update_by, + update_time, user_id, shop_id, + total_amount, discount, discount_amount, + real_amount, already_earn, no_earn, + pay_status, status, transport_type, + share_address, receive_address, province, + city, area) + values (#{id,jdbcType=VARCHAR}, #{saleId,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, #{userId,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, + #{totalAmount,jdbcType=DECIMAL}, #{discount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, + #{realAmount,jdbcType=DECIMAL}, #{alreadyEarn,jdbcType=DECIMAL}, #{noEarn,jdbcType=DECIMAL}, + #{payStatus,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{transportType,jdbcType=VARCHAR}, + #{shareAddress,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, + #{city,jdbcType=VARCHAR}, #{area,jdbcType=VARCHAR}) + + + insert into t_return_sale + + + id, + + + sale_id, + + + create_by, + + + create_time, + + + del_flag, + + + update_by, + + + update_time, + + + user_id, + + + shop_id, + + + total_amount, + + + discount, + + + discount_amount, + + + real_amount, + + + already_earn, + + + no_earn, + + + pay_status, + + + status, + + + transport_type, + + + share_address, + + + receive_address, + + + province, + + + city, + + + area, + + + + + #{id,jdbcType=VARCHAR}, + + + #{saleId,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{delFlag,jdbcType=INTEGER}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{userId,jdbcType=VARCHAR}, + + + #{shopId,jdbcType=VARCHAR}, + + + #{totalAmount,jdbcType=DECIMAL}, + + + #{discount,jdbcType=DECIMAL}, + + + #{discountAmount,jdbcType=DECIMAL}, + + + #{realAmount,jdbcType=DECIMAL}, + + + #{alreadyEarn,jdbcType=DECIMAL}, + + + #{noEarn,jdbcType=DECIMAL}, + + + #{payStatus,jdbcType=VARCHAR}, + + + #{status,jdbcType=VARCHAR}, + + + #{transportType,jdbcType=VARCHAR}, + + + #{shareAddress,jdbcType=VARCHAR}, + + + #{receiveAddress,jdbcType=VARCHAR}, + + + #{province,jdbcType=VARCHAR}, + + + #{city,jdbcType=VARCHAR}, + + + #{area,jdbcType=VARCHAR}, + + + + + + update t_return_sale + + + id = #{record.id,jdbcType=VARCHAR}, + + + sale_id = #{record.saleId,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + del_flag = #{record.delFlag,jdbcType=INTEGER}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + user_id = #{record.userId,jdbcType=VARCHAR}, + + + shop_id = #{record.shopId,jdbcType=VARCHAR}, + + + total_amount = #{record.totalAmount,jdbcType=DECIMAL}, + + + discount = #{record.discount,jdbcType=DECIMAL}, + + + discount_amount = #{record.discountAmount,jdbcType=DECIMAL}, + + + real_amount = #{record.realAmount,jdbcType=DECIMAL}, + + + already_earn = #{record.alreadyEarn,jdbcType=DECIMAL}, + + + no_earn = #{record.noEarn,jdbcType=DECIMAL}, + + + pay_status = #{record.payStatus,jdbcType=VARCHAR}, + + + status = #{record.status,jdbcType=VARCHAR}, + + + transport_type = #{record.transportType,jdbcType=VARCHAR}, + + + share_address = #{record.shareAddress,jdbcType=VARCHAR}, + + + receive_address = #{record.receiveAddress,jdbcType=VARCHAR}, + + + province = #{record.province,jdbcType=VARCHAR}, + + + city = #{record.city,jdbcType=VARCHAR}, + + + area = #{record.area,jdbcType=VARCHAR}, + + + + + + + + update t_return_sale + set id = #{record.id,jdbcType=VARCHAR}, + sale_id = #{record.saleId,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + del_flag = #{record.delFlag,jdbcType=INTEGER}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + user_id = #{record.userId,jdbcType=VARCHAR}, + shop_id = #{record.shopId,jdbcType=VARCHAR}, + total_amount = #{record.totalAmount,jdbcType=DECIMAL}, + discount = #{record.discount,jdbcType=DECIMAL}, + discount_amount = #{record.discountAmount,jdbcType=DECIMAL}, + real_amount = #{record.realAmount,jdbcType=DECIMAL}, + already_earn = #{record.alreadyEarn,jdbcType=DECIMAL}, + no_earn = #{record.noEarn,jdbcType=DECIMAL}, + pay_status = #{record.payStatus,jdbcType=VARCHAR}, + status = #{record.status,jdbcType=VARCHAR}, + transport_type = #{record.transportType,jdbcType=VARCHAR}, + share_address = #{record.shareAddress,jdbcType=VARCHAR}, + receive_address = #{record.receiveAddress,jdbcType=VARCHAR}, + province = #{record.province,jdbcType=VARCHAR}, + city = #{record.city,jdbcType=VARCHAR}, + area = #{record.area,jdbcType=VARCHAR} + + + + + + update t_return_sale + + + sale_id = #{saleId,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=INTEGER}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + user_id = #{userId,jdbcType=VARCHAR}, + + + shop_id = #{shopId,jdbcType=VARCHAR}, + + + total_amount = #{totalAmount,jdbcType=DECIMAL}, + + + discount = #{discount,jdbcType=DECIMAL}, + + + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + + + real_amount = #{realAmount,jdbcType=DECIMAL}, + + + already_earn = #{alreadyEarn,jdbcType=DECIMAL}, + + + no_earn = #{noEarn,jdbcType=DECIMAL}, + + + pay_status = #{payStatus,jdbcType=VARCHAR}, + + + status = #{status,jdbcType=VARCHAR}, + + + transport_type = #{transportType,jdbcType=VARCHAR}, + + + share_address = #{shareAddress,jdbcType=VARCHAR}, + + + receive_address = #{receiveAddress,jdbcType=VARCHAR}, + + + province = #{province,jdbcType=VARCHAR}, + + + city = #{city,jdbcType=VARCHAR}, + + + area = #{area,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=VARCHAR} + + + update t_return_sale + set sale_id = #{saleId,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + del_flag = #{delFlag,jdbcType=INTEGER}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + user_id = #{userId,jdbcType=VARCHAR}, + shop_id = #{shopId,jdbcType=VARCHAR}, + total_amount = #{totalAmount,jdbcType=DECIMAL}, + discount = #{discount,jdbcType=DECIMAL}, + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + real_amount = #{realAmount,jdbcType=DECIMAL}, + already_earn = #{alreadyEarn,jdbcType=DECIMAL}, + no_earn = #{noEarn,jdbcType=DECIMAL}, + pay_status = #{payStatus,jdbcType=VARCHAR}, + status = #{status,jdbcType=VARCHAR}, + transport_type = #{transportType,jdbcType=VARCHAR}, + share_address = #{shareAddress,jdbcType=VARCHAR}, + receive_address = #{receiveAddress,jdbcType=VARCHAR}, + province = #{province,jdbcType=VARCHAR}, + city = #{city,jdbcType=VARCHAR}, + area = #{area,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/hiver-modules/pom.xml b/hiver-modules/pom.xml index b3289ed6..90187be1 100644 --- a/hiver-modules/pom.xml +++ b/hiver-modules/pom.xml @@ -20,6 +20,7 @@ hiver-app hiver-open hiver-mall + mall-mbg