BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：档口销售出库功能调整；

pull/1121/head
liujiang 2025-03-31 00:24:50 +08:00
parent 19ac11d9e2
commit f6418632f1
17 changed files with 605 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java
View File

@ -33,6 +33,13 @@ public class StoreProductStockController extends XktBaseController {
// TODO 商品销售/出库 时读货号，然后查询当前货号颜色的库存
// TODO 销售出库时扣件库存
// TODO 销售出库时扣件库存
// TODO 销售出库时扣件库存
// TODO 销售出库时扣件库存
// TODO 销售出库时扣件库存
/**
* 查询档口商品库存列表
*/

114
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleController.java
View File

@ -9,10 +9,12 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusGeneralSaleVO;
import com.ruoyi.web.controller.xkt.vo.storeSale.StoreSalePageVO;
import com.ruoyi.web.controller.xkt.vo.storeSale.StoreSalePayStatusVO;
import com.ruoyi.web.controller.xkt.vo.storeSale.StoreSaleVO;
import com.ruoyi.xkt.domain.StoreSale;
import com.ruoyi.xkt.dto.storeSale.StoreSaleDTO;
import com.ruoyi.xkt.dto.storeSale.StoreSalePageDTO;
import com.ruoyi.xkt.dto.storeSale.StoreSalePayStatusDTO;
import com.ruoyi.xkt.service.IStoreSaleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -43,7 +45,7 @@ public class StoreSaleController extends XktBaseController {
*/
@PreAuthorize("@ss.hasPermi('system:sale:list')")
@ApiOperation(value = "根据当前客户查询最近的销售业绩，以及欠款金额", httpMethod = "GET", response = R.class)
@GetMapping("/sixty-general")
@GetMapping("/cus-overall")
public R getCusGeneralSale(@RequestParam("days") Integer days, @RequestParam("storeId") Long storeId,
@RequestParam("storeCusId") Long storeCusId) {
return success(BeanUtil.toBean(storeSaleService.getCusGeneralSale(days, storeId, storeCusId), StoreCusGeneralSaleVO.class));
@ -59,7 +61,6 @@ public class StoreSaleController extends XktBaseController {
return storeSaleService.page(BeanUtil.toBean(salePageVO, StoreSalePageDTO.class));
}
/**
* 新增档口销售出库
*/
@ -68,6 +69,23 @@ public class StoreSaleController extends XktBaseController {
@Log(title = "档口销售出库", businessType = BusinessType.INSERT)
@PostMapping
public R add(@Validated @RequestBody StoreSaleVO storeSaleVO) {
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
return success(storeSaleService.insertStoreSale(BeanUtil.toBean(storeSaleVO, StoreSaleDTO.class)));
}
@ -79,25 +97,70 @@ public class StoreSaleController extends XktBaseController {
@ApiOperation(value = "修改档口销售出库", httpMethod = "PUT", response = R.class)
@PutMapping
public R edit(@Validated @RequestBody StoreSaleVO storeSaleVO) {
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
return success(storeSaleService.updateStoreSale(BeanUtil.toBean(storeSaleVO, StoreSaleDTO.class)));
}
/**
* 查询档口销售出库详情
*/
@PreAuthorize("@ss.hasPermi('system:sale:query')")
@ApiOperation(value = "查询档口销售出库详情", httpMethod = "GET", response = R.class)
@GetMapping(value = "/{storeSaleId}")
public R getInfo(@PathVariable("storeSaleId") Long storeSaleId) {
return success(storeSaleService.selectStoreSaleByStoreSaleId(storeSaleId));
}
/**
* 客户欠款结算
*/
@PreAuthorize("@ss.hasPermi('system:sale:edit')")
@Log(title = "客户欠款结算", businessType = BusinessType.UPDATE)
@ApiOperation(value = "客户欠款结算", httpMethod = "PUT", response = R.class)
@PutMapping("/clear-debt")
public R clearStoreCusDebt(@Validated @RequestBody StoreSalePayStatusVO payStatusVO) {
storeSaleService.clearStoreCusDebt(BeanUtil.toBean(payStatusVO, StoreSalePayStatusDTO.class));
return success();
}
/**
* 删除档口销售出库
*/
@PreAuthorize("@ss.hasPermi('system:sale:remove')")
@Log(title = "档口销售出库", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeSaleId}")
public R remove(@PathVariable Long storeSaleId) {
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
return success(storeSaleService.deleteStoreSaleByStoreSaleId(storeSaleId));
}
/**
@ -112,23 +175,8 @@ public class StoreSaleController extends XktBaseController {
util.exportExcel(response, list, "档口销售出库数据");
}
/**
* 获取档口销售出库详细信息
*/
@PreAuthorize("@ss.hasPermi('system:sale:query')")
@GetMapping(value = "/{storeSaleId}")
public R getInfo(@PathVariable("storeSaleId") Long storeSaleId) {
return success(storeSaleService.selectStoreSaleByStoreSaleId(storeSaleId));
}
/**
* 删除档口销售出库
*/
@PreAuthorize("@ss.hasPermi('system:sale:remove')")
@Log(title = "档口销售出库", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeSaleIds}")
public R remove(@PathVariable Long[] storeSaleIds) {
return success(storeSaleService.deleteStoreSaleByStoreSaleIds(storeSaleIds));
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusGeneralSaleVO.java
View File

@ -22,7 +22,7 @@ public class StoreCusGeneralSaleVO {
@ApiModelProperty(name = "档口客户ID")
private Long storeCusId;
@ApiModelProperty(name = "档口客户名称")
private String cusName;
private String storeCusName;
@ApiModelProperty(name = "销售多少双")
private Long saleCount;
@ApiModelProperty(name = "销售金额")

25
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSalePayStatusVO.java 100644
View File

@ -0,0 +1,25 @@
package com.ruoyi.web.controller.xkt.vo.storeSale;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品销售客户欠款结算")
@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
public class StoreSalePayStatusVO {
@ApiModelProperty(name = "结算的storeSaleId列表")
@NotNull(message = "结算的storeSaleId列表不能为空!")
private List<Long> storeSaleIdList;
}

15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleVO.java
View File

@ -32,18 +32,17 @@ public class StoreSaleVO {
@ApiModelProperty(name = "档口客户ID")
@NotNull(message = "档口客户ID不能为空!")
private Long storeCusId;
@ApiModelProperty(name = "档口客户名称")
@NotBlank(message = "档口客户名称不能为空!")
private String storeCusName;
@ApiModelProperty(name = "销售类型（普通销售 GENERAL_SALE、销售退货 SALE_REFUND、普通销售/销售退货 SALE_AND_REFUND）")
@NotBlank(message = "销售类型不能为空!")
private String saleType;
@ApiModelProperty(name = "数量")
@NotNull(message = "数量不能为空!")
private Integer quantity;
@ApiModelProperty(name = "总金额")
@NotNull(message = "总金额不能为空!")
private BigDecimal amount;
@NotBlank(message = "支付方式不能为空!")
@ApiModelProperty(name = "支付方式（支付宝、微信、现金、欠款）ALIPAY WECHAT_PAY CASH DEBT")
private String payWay;
@ApiModelProperty(name = "结款状态（已结清、欠款） SETTLED、DEBT")
private String paymentStatus;
@NotNull(message = "销售详情列表不能为空!")
@Valid
@ApiModelProperty(name = "销售详情列表")
@ -58,6 +57,10 @@ public class StoreSaleVO {
@NotNull(message = "档口商品颜色尺码ID不能为空!")
@ApiModelProperty(name = "档口商品颜色尺码ID")
private Long storeProdColorSizeId;
@ApiModelProperty(name = "颜色")
private String colorName;
@ApiModelProperty(name = "尺码")
private Integer size;
@ApiModelProperty(name = "商品货号")
@NotBlank(message = "商品货号不能为空!")
private String prodArtNum;

15
ruoyi-common/src/main/java/com/ruoyi/common/utils/bigDecimal/BigDecimalFunction.java 100644
View File

@ -0,0 +1,15 @@
package com.ruoyi.common.utils.bigDecimal;
import java.math.BigDecimal;
/**
* @author liujiang
* @version v1.0
* @date 2023/11/11 9:08
*/
@FunctionalInterface
public interface BigDecimalFunction<T> {
BigDecimal applyAsBigDecimal(T value);
}

120
ruoyi-common/src/main/java/com/ruoyi/common/utils/bigDecimal/CollectorsUtil.java 100644
View File

@ -0,0 +1,120 @@
package com.ruoyi.common.utils.bigDecimal;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.function.BinaryOperator;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collector;
/**
* @author liujiang
* @version v1.0
* @description BigDecimal转Double 会存在精度丢失问题。封装工具类，解决 lamda 表达式没有 BigDecimal相关API问题
* @date 2023/11/11 9:09
*/
public class CollectorsUtil {
static final Set<Collector.Characteristics> CH_NOID = Collections.emptySet();
private CollectorsUtil() {
}
@SuppressWarnings("unchecked")
private static <I, R> Function<I, R> castingIdentity() {
return i -> (R) i;
}
static class CollectorImpl<T, A, R> implements Collector<T, A, R> {
private final Supplier<A> supplier;
private final BiConsumer<A, T> accumulator;
private final BinaryOperator<A> combiner;
private final Function<A, R> finisher;
private final Set<Characteristics> characteristics;
CollectorImpl(Supplier<A> supplier, BiConsumer<A, T> accumulator, BinaryOperator<A> combiner,
Function<A, R> finisher, Set<Characteristics> characteristics) {
this.supplier = supplier;
this.accumulator = accumulator;
this.combiner = combiner;
this.finisher = finisher;
this.characteristics = characteristics;
}
CollectorImpl(Supplier<A> supplier, BiConsumer<A, T> accumulator, BinaryOperator<A> combiner,
Set<Characteristics> characteristics) {
this(supplier, accumulator, combiner, castingIdentity(), characteristics);
}
@Override
public BiConsumer<A, T> accumulator() {
return accumulator;
}
@Override
public Supplier<A> supplier() {
return supplier;
}
@Override
public BinaryOperator<A> combiner() {
return combiner;
}
@Override
public Function<A, R> finisher() {
return finisher;
}
@Override
public Set<Characteristics> characteristics() {
return characteristics;
}
}
//求和方法
public static <T> Collector<T, ?, BigDecimal> summingBigDecimal(BigDecimalFunction<? super T> mapper) {
return new CollectorImpl<>(
() -> new BigDecimal[]{BigDecimal.ZERO},
(a, t) -> {
a[0] = a[0].add(mapper.applyAsBigDecimal(t));
},
(a, b) -> {
a[0] = a[0].add(b[0]);
return a;
},
a -> a[0], CH_NOID);
}
//求最大值
public static <T> Collector<T, ?, BigDecimal> maxBy(BigDecimalFunction<? super T> mapper) {
return new CollectorImpl<>(
() -> new BigDecimal[]{new BigDecimal(Long.MIN_VALUE)},
(a, t) -> {
a[0] = a[0].max(mapper.applyAsBigDecimal(t));
},
(a, b) -> {
a[0] = a[0].max(b[0]);
return a;
},
a -> a[0], CH_NOID);
}
//求最小值
public static <T> Collector<T, ?, BigDecimal> minBy(BigDecimalFunction<? super T> mapper) {
return new CollectorImpl<>(
() -> new BigDecimal[]{new BigDecimal(Long.MAX_VALUE)},
(a, t) -> {
a[0] = a[0].min(mapper.applyAsBigDecimal(t));
},
(a, b) -> {
a[0] = a[0].min(b[0]);
return a;
},
a -> a[0], CH_NOID);
}
}

7
xkt/pom.xml
View File

@ -22,6 +22,13 @@
<artifactId>ruoyi-framework</artifactId>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
<!-- Swagger3依赖 -->
<dependency>
<groupId>io.springfox</groupId>

22
xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleDetail.java
View File

@ -21,81 +21,77 @@ import java.math.BigDecimal;
@Data
@Accessors(chain = true)
public class StoreSaleDetail extends XktBaseEntity {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
/**
* 档口商品销售出库明细ID
*/
@TableId
private Long id;
/**
* 档口商品销售ID
*/
@Excel(name = "档口商品销售ID")
private Long storeSaleId;
/**
* 档口商品ID
*/
@Excel(name = "档口商品ID")
private Long storeProdId;
/**
* 档口商品颜色尺码ID
*/
@Excel(name = "档口商品颜色尺码ID")
private Long storeProdColorSizeId;
/**
* 颜色
*/
private String colorName;
/**
* 尺码
*/
private Integer size;
/**
* 销售类型（普通销售、销售退货）
*/
@Excel(name = "销售类型", readConverterExp = "普=通销售、销售退货")
private String saleType;
/**
* 商品货号
*/
@Excel(name = "商品货号")
private String prodArtNum;
/**
* 销售单价
*/
@Excel(name = "销售单价")
private BigDecimal price;
/**
* 给客户优惠后单价
*/
@Excel(name = "给客户优惠后单价")
private BigDecimal discountedPrice;
/**
* 数量
*/
@Excel(name = "数量")
private Integer quantity;
/**
* 总金额
*/
@Excel(name = "总金额")
private BigDecimal amount;
/**
* 其它优惠
*/
@Excel(name = "其它优惠")
private BigDecimal otherDiscount;
/**
* 条码
*/
@Excel(name = "条码")
private String sns;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

2
xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecord.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.XktBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -20,6 +21,7 @@ import java.util.Date;
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
public class StoreSaleRefundRecord extends XktBaseEntity {
private static final long serialVersionUID = 1L;

120
xkt/src/main/java/com/ruoyi/xkt/domain/StoreSaleRefundRecordDetail.java 100644
View File

@ -0,0 +1,120 @@
package com.ruoyi.xkt.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.XktBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
/**
* 档口销售返单明细对象 store_sale_refund_record_detail
*
* @author ruoyi
* @date 2025-03-26
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
public class StoreSaleRefundRecordDetail extends XktBaseEntity {
private static final long serialVersionUID = 1L;
/**
* 档口商品销售返单出库明细ID
*/
@TableId
private Long id;
/**
* 档口商品销售返单ID
*/
@Excel(name = "档口商品销售ID")
private Long storeSaleRefundRecordId;
/**
* 档口商品ID
*/
@Excel(name = "档口商品ID")
private Long storeProdId;
/**
* 档口商品颜色尺码ID
*/
@Excel(name = "档口商品颜色尺码ID")
private Long storeProdColorSizeId;
/**
* 颜色
*/
private String colorName;
/**
* 尺码
*/
private Integer size;
/**
* 销售类型（普通销售、销售退货）
*/
@Excel(name = "销售类型", readConverterExp = "普=通销售、销售退货")
private String saleType;
/**
* 商品货号
*/
@Excel(name = "商品货号")
private String prodArtNum;
/**
* 销售单价
*/
@Excel(name = "销售单价")
private BigDecimal price;
/**
* 给客户优惠后单价
*/
@Excel(name = "给客户优惠后单价")
private BigDecimal discountedPrice;
/**
* 数量
*/
@Excel(name = "数量")
private Integer quantity;
/**
* 总金额
*/
@Excel(name = "总金额")
private BigDecimal amount;
/**
* 其它优惠
*/
@Excel(name = "其它优惠")
private BigDecimal otherDiscount;
/**
* 条码
*/
@Excel(name = "条码")
private String sns;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("storeSaleRefundRecordId", getStoreSaleRefundRecordId())
.append("storeProdId", getStoreProdId())
.append("storeProdColorSizeId", getStoreProdColorSizeId())
.append("saleType", getSaleType())
.append("price", getPrice())
.append("discountedPrice", getDiscountedPrice())
.append("quantity", getQuantity())
.append("amount", getAmount())
.append("otherDiscount", getOtherDiscount())
.append("version", getVersion())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusGeneralSaleDTO.java
View File

@ -26,7 +26,7 @@ public class StoreCusGeneralSaleDTO {
@ApiModelProperty(name = "档口客户ID")
private Long storeCusId;
@ApiModelProperty(name = "档口客户名称")
private String cusName;
private String storeCusName;
@ApiModelProperty(name = "销售多少双")
private Long saleCount;
@ApiModelProperty(name = "销售金额")

11
xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDTO.java
View File

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.List;
@ -26,12 +27,10 @@ public class StoreSaleDTO {
private Long storeId;
@ApiModelProperty(name = "档口客户ID")
private Long storeCusId;
@ApiModelProperty(name = "档口客户名称")
private String storeCusName;
@ApiModelProperty(name = "销售类型（普通销售 GENERAL_SALE、销售退货 SALE_REFUND、普通销售/销售退货 SALE_AND_REFUND）")
private String saleType;
@ApiModelProperty(name = "数量")
private Integer quantity;
@ApiModelProperty(name = "总金额")
private BigDecimal amount;
@ApiModelProperty(name = "支付方式（支付宝、微信、现金、欠款）ALIPAY WECHAT_PAY CASH DEBT")
private String payWay;
@ApiModelProperty(name = "结款状态（已结清、欠款） SETTLED、DEBT")
@ -45,6 +44,10 @@ public class StoreSaleDTO {
private Long storeProdId;
@ApiModelProperty(name = "档口商品颜色尺码ID")
private Long storeProdColorSizeId;
@ApiModelProperty(name = "颜色")
private String colorName;
@ApiModelProperty(name = "尺码")
private Integer size;
@ApiModelProperty(name = "商品货号")
private String prodArtNum;
@ApiModelProperty(name = "销售条码")

24
xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSalePayStatusDTO.java 100644
View File

@ -0,0 +1,24 @@
package com.ruoyi.xkt.dto.storeSale;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@ApiModel("档口商品销售客户欠款结算")
@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
public class StoreSalePayStatusDTO {
@ApiModelProperty(name = "结算的storeSaleId列表")
private List<Long> storeSaleIdList;
}

14
xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleRefundRecordDetailMapper.java 100644
View File

@ -0,0 +1,14 @@
package com.ruoyi.xkt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.xkt.domain.StoreSaleRefundRecordDetail;
/**
* 档口销售返单Mapper接口
*
* @author ruoyi
* @date 2025-03-26
*/
public interface StoreSaleRefundRecordDetailMapper extends BaseMapper<StoreSaleRefundRecordDetail> {
}

10
xkt/src/main/java/com/ruoyi/xkt/service/IStoreSaleService.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.xkt.dto.storeCustomer.StoreCusGeneralSaleDTO;
import com.ruoyi.xkt.dto.storeSale.StoreSaleDTO;
import com.ruoyi.xkt.dto.storeSale.StoreSalePageDTO;
import com.ruoyi.xkt.dto.storeSale.StoreSalePageResDTO;
import com.ruoyi.xkt.dto.storeSale.StoreSalePayStatusDTO;
import java.util.List;
@ -22,7 +23,7 @@ public interface IStoreSaleService {
* @param storeSaleId 档口销售出库主键
* @return 档口销售出库
*/
public StoreSale selectStoreSaleByStoreSaleId(Long storeSaleId);
public StoreSaleDTO selectStoreSaleByStoreSaleId(Long storeSaleId);
/**
* 查询档口销售出库列表
@ -80,4 +81,11 @@ public interface IStoreSaleService {
*/
Page<StoreSalePageResDTO> page(StoreSalePageDTO pageDTO);
/**
* 批量结算客户欠款
* @param payStatusDTO
* @return int
*/
void clearStoreCusDebt(StoreSalePayStatusDTO payStatusDTO);
}

196
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java
View File

@ -5,19 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.Page;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.xkt.domain.StoreCustomer;
import com.ruoyi.xkt.domain.StoreSale;
import com.ruoyi.xkt.domain.StoreSaleDetail;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bigDecimal.CollectorsUtil;
import com.ruoyi.xkt.domain.*;
import com.ruoyi.xkt.dto.storeCustomer.StoreCusGeneralSaleDTO;
import com.ruoyi.xkt.dto.storeSale.StoreSaleDTO;
import com.ruoyi.xkt.dto.storeSale.StoreSalePageDTO;
import com.ruoyi.xkt.dto.storeSale.StoreSalePageResDTO;
import com.ruoyi.xkt.mapper.StoreCustomerMapper;
import com.ruoyi.xkt.mapper.StoreSaleDetailMapper;
import com.ruoyi.xkt.mapper.StoreSaleMapper;
import com.ruoyi.xkt.dto.storeSale.StoreSalePayStatusDTO;
import com.ruoyi.xkt.mapper.*;
import com.ruoyi.xkt.service.IStoreSaleService;
import com.ruoyi.xkt.service.IVoucherSequenceService;
import lombok.RequiredArgsConstructor;
@ -49,6 +49,8 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
final StoreCustomerMapper storeCusMapper;
final IVoucherSequenceService sequenceService;
final StoreSaleDetailMapper storeSaleDetailMapper;
final StoreSaleRefundRecordMapper refundRecordMapper;
final StoreSaleRefundRecordDetailMapper refundRecordDetailMapper;
/**
* 获取当前档口客户的销售业绩
@ -61,7 +63,6 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
@Override
@Transactional(readOnly = true)
public StoreCusGeneralSaleDTO getCusGeneralSale(Integer days, Long storeId, Long storeCusId) {
// 获取档口客户
StoreCustomer storeCus = Optional.ofNullable(this.storeCusMapper.selectOne(new LambdaQueryWrapper<StoreCustomer>()
.eq(StoreCustomer::getId, storeCusId).eq(StoreCustomer::getDelFlag, "0")))
.orElseThrow(() -> new ServiceException("档口客户不存在!", HttpStatus.ERROR));
@ -75,7 +76,7 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
.eq(StoreSale::getDelFlag, "0").between(StoreSale::getVoucherDate, pastDate, nowDate));
// 初始化返回对象
StoreCusGeneralSaleDTO generalSaleDTO = StoreCusGeneralSaleDTO.builder().storeId(storeId).storeCusId(storeCusId)
.cusName(storeCus.getCusName()).saleAmount(BigDecimal.ZERO).debtAmount(BigDecimal.ZERO)
.storeCusName(storeCus.getCusName()).saleAmount(BigDecimal.ZERO).debtAmount(BigDecimal.ZERO)
.saleCount(0L).build();
if (CollectionUtils.isEmpty(saleList)) {
return generalSaleDTO;
@ -85,7 +86,7 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
// 总的销售数量
Long saleCount = saleList.stream().map(x -> x.getQuantity() == null ? 0L : x.getQuantity()).reduce(0L, Long::sum);
// 总的欠款金额
BigDecimal debtAmount = saleList.stream().filter(x -> Objects.equals(x.getPayWay(), "DEBT"))
BigDecimal debtAmount = saleList.stream().filter(x -> Objects.equals(x.getPaymentStatus(), "DEBT"))
.map(x -> ObjectUtils.defaultIfNull(x.getAmount(), BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add);
return generalSaleDTO.setSaleAmount(saleAmount).setSaleCount(saleCount).setDebtAmount(debtAmount);
}
@ -104,6 +105,27 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
return Page.convert(new PageInfo<>(list));
}
/**
* 批量结算客户欠款
*
* @param payStatusDTO 入参
* @return int
*/
@Override
@Transactional
public void clearStoreCusDebt(StoreSalePayStatusDTO payStatusDTO) {
List<StoreSale> storeSaleList = Optional.ofNullable(this.storeSaleMapper.selectList(new LambdaQueryWrapper<StoreSale>()
.in(StoreSale::getId, payStatusDTO.getStoreSaleIdList()).eq(StoreSale::getDelFlag, "0")))
.orElseThrow(() -> new ServiceException("没有找到对应的销售出库单!", HttpStatus.ERROR));
// 勾选订单是否有已结算的
List<StoreSale> settledList = storeSaleList.stream().filter(x -> Objects.equals(x.getPaymentStatus(), "SETTLED")).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(settledList)) {
throw new ServiceException("当前订单已结算!" + settledList.stream().map(StoreSale::getCode).collect(Collectors.toList()), HttpStatus.ERROR);
}
storeSaleList.forEach(x -> x.setPaymentStatus("SETTLED"));
this.storeSaleMapper.updateById(storeSaleList);
}
/**
* 新增档口销售出库
*
@ -116,39 +138,34 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
StoreSale storeSale = BeanUtil.toBean(storeSaleDTO, StoreSale.class);
// 生成code
String code = this.sequenceService.generateCode(storeSaleDTO.getStoreId(), "STORE_SALE", DateUtils.getDate());
storeSale.setCode(code).setVoucherDate(DateUtils.getNowDate());
// 总的数量
Integer quantity = storeSaleDTO.getDetailList().stream().map(x -> ObjectUtils.defaultIfNull(x.getQuantity(), 0)).reduce(0, Integer::sum);
// 总的金额
BigDecimal amount = storeSaleDTO.getDetailList().stream().map(x -> ObjectUtils.defaultIfNull(x.getAmount(), BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add);
// 当前登录用户
LoginUser loginUser = SecurityUtils.getLoginUser();
// 属性赋值
storeSale.setCode(code).setVoucherDate(DateUtils.getNowDate()).setQuantity(quantity).setAmount(amount)
.setOperatorId(loginUser.getUserId()).setOperatorName(loginUser.getUsername());
int count = storeSaleMapper.insert(storeSale);
// 处理订单明细
List<StoreSaleDetail> saleDetailList = storeSaleDTO.getDetailList().stream().map(x -> BeanUtil.toBean(x, StoreSaleDetail.class)
.setSaleType(storeSaleDTO.getSaleType()).setStoreSaleId(storeSale.getId())).collect(Collectors.toList());
this.storeSaleDetailMapper.insert(saleDetailList);
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
return count;
}
/**
* 查询档口销售出库
*
* @param storeSaleId 档口销售出库主键
* @return 档口销售出库
*/
@Override
public StoreSale selectStoreSaleByStoreSaleId(Long storeSaleId) {
return storeSaleMapper.selectStoreSaleByStoreSaleId(storeSaleId);
}
/**
* 查询档口销售出库列表
*
* @param storeSale 档口销售出库
* @return 档口销售出库
*/
@Override
public List<StoreSale> selectStoreSaleList(StoreSale storeSale) {
return storeSaleMapper.selectStoreSaleList(storeSale);
}
/**
* 修改档口销售出库
*
@ -158,17 +175,110 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
@Override
@Transactional
public int updateStoreSale(StoreSaleDTO storeSaleDTO) {
// 当前登录用户
LoginUser loginUser = SecurityUtils.getLoginUser();
StoreSale storeSale = Optional.ofNullable(this.storeSaleMapper.selectOne(new LambdaQueryWrapper<StoreSale>()
.eq(StoreSale::getId, storeSaleDTO.getStoreSaleId()).eq(StoreSale::getDelFlag, "0")))
.orElseThrow(() -> new ServiceException("档口销售出库订单不存在!", HttpStatus.ERROR));
// 档口销售出库明细列表
List<StoreSaleDetail> saleDetailList = this.storeSaleDetailMapper.selectList(new LambdaQueryWrapper<StoreSaleDetail>()
.eq(StoreSaleDetail::getStoreSaleId, storeSaleDTO.getStoreSaleId()).eq(StoreSaleDetail::getDelFlag, "0"));
// 若为返单，则将之前数据记录到返单记录表中
if (Objects.equals(storeSaleDTO.getRefund(), Boolean.TRUE)) {
// 订单记录到StoreSaleRefundRecord
StoreSaleRefundRecord refundRecord = BeanUtil.toBean(storeSale, StoreSaleRefundRecord.class).setStoreSaleId(storeSale.getId())
.setOperatorId(loginUser.getUserId()).setOperatorName(loginUser.getUsername());
this.refundRecordMapper.insert(refundRecord);
// 明细记录到StoreSaleRefundRecordDetail
List<StoreSaleRefundRecordDetail> refundDetailRecordList = saleDetailList.stream().map(x -> BeanUtil.toBean(x, StoreSaleRefundRecordDetail.class)
.setStoreSaleRefundRecordId(refundRecord.getId())).collect(Collectors.toList());
this.refundRecordDetailMapper.insert(refundDetailRecordList);
}
storeSale.setUpdateTime(DateUtils.getNowDate());
return storeSaleMapper.updateStoreSale(storeSale);
// 更新档口销售数据
BeanUtil.copyProperties(storeSaleDTO, storeSale);
// 总的数量
Integer quantity = storeSaleDTO.getDetailList().stream().map(x -> ObjectUtils.defaultIfNull(x.getQuantity(), 0)).reduce(0, Integer::sum);
// 总的金额
BigDecimal amount = storeSaleDTO.getDetailList().stream().map(x -> ObjectUtils.defaultIfNull(x.getAmount(), BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add);
int count = this.storeSaleMapper.updateById(storeSale.setQuantity(quantity).setAmount(amount)
.setOperatorId(loginUser.getUserId()).setOperatorName(loginUser.getUsername()));
// 先将所有明细置为无效，再新增
this.storeSaleDetailMapper.updateById(saleDetailList.stream().peek(x -> x.setDelFlag("2")).collect(Collectors.toList()));
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 扣件库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// 再新增档口销售出库明细数据
List<StoreSaleDetail> detailList = storeSaleDTO.getDetailList().stream().map(x -> BeanUtil.toBean(x, StoreSaleDetail.class)
.setSaleType(storeSaleDTO.getSaleType()).setStoreSaleId(storeSale.getId())).collect(Collectors.toList());
this.storeSaleDetailMapper.insert(detailList);
return count;
}
/**
* 查询档口销售出库
*
* @param storeSaleId 档口销售出库主键
* @return 档口销售出库
*/
@Override
@Transactional(readOnly = true)
public StoreSaleDTO selectStoreSaleByStoreSaleId(Long storeSaleId) {
StoreSale storeSale = Optional.ofNullable(this.storeSaleMapper.selectOne(new LambdaQueryWrapper<StoreSale>()
.eq(StoreSale::getId, storeSaleId).eq(StoreSale::getDelFlag, "0")))
.orElseThrow(() -> new ServiceException("档口销售出库订单不存在!", HttpStatus.ERROR));
StoreSaleDTO storeSaleDTO = BeanUtil.toBean(storeSale, StoreSaleDTO.class);
// 查询销售出库明细
List<StoreSaleDetail> saleDetailList = this.storeSaleDetailMapper.selectList(new LambdaQueryWrapper<StoreSaleDetail>()
.eq(StoreSaleDetail::getStoreSaleId, storeSaleId).eq(StoreSaleDetail::getDelFlag, "0"));
storeSaleDTO.setDetailList(saleDetailList.stream().map(x -> BeanUtil.toBean(x, StoreSaleDTO.SaleDetailVO.class)).collect(Collectors.toList()));
return storeSaleDTO;
}
/**
* 删除档口销售出库信息
*
* @param storeSaleId 档口销售出库主键
* @return 结果
*/
@Override
public int deleteStoreSaleByStoreSaleId(Long storeSaleId) {
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 增加库存
// TODO 客户销售金额扣减、商品销售金额扣减
// 删除档口销售出库数据
StoreSale storeSale = Optional.ofNullable(this.storeSaleMapper.selectOne(new LambdaQueryWrapper<StoreSale>()
.eq(StoreSale::getId, storeSaleId).eq(StoreSale::getDelFlag, "0")))
.orElseThrow(() -> new ServiceException("档口销售出库订单不存在!", HttpStatus.ERROR));
storeSale.setDelFlag("2");
int count = this.storeSaleMapper.updateById(storeSale);
// 删除档口销售出库明细数据
List<StoreSaleDetail> saleDetailList = this.storeSaleDetailMapper.selectList(new LambdaQueryWrapper<StoreSaleDetail>()
.eq(StoreSaleDetail::getStoreSaleId, storeSaleId).eq(StoreSaleDetail::getDelFlag, "0"));
this.storeSaleDetailMapper.updateById(saleDetailList.stream().peek(x -> x.setDelFlag("2")).collect(Collectors.toList()));
return count;
}
/**
* 批量删除档口销售出库
*
@ -180,16 +290,18 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
return storeSaleMapper.deleteStoreSaleByStoreSaleIds(storeSaleIds);
}
/**
* 删除档口销售出库信息
* 查询档口销售出库列表
*
* @param storeSaleId 档口销售出库主键
* @return 结果
* @param storeSale 档口销售出库
* @return 档口销售出库集合
*/
@Override
public int deleteStoreSaleByStoreSaleId(Long storeSaleId) {
return storeSaleMapper.deleteStoreSaleByStoreSaleId(storeSaleId);
public List<StoreSale> selectStoreSaleList(StoreSale storeSale) {
return null;
}
}