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-09-15 20:20:33 +08:00
parent e3d5e14c2a
commit 77571ccea2
39 changed files with 36 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerController.java
View File

@ -6,11 +6,9 @@ import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.Page;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusAddOverPriceVO;
import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusFuzzyResVO;
import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusPageVO;
import com.ruoyi.web.controller.xkt.vo.storeCustomer.StoreCusVO;
import com.ruoyi.xkt.dto.storeCustomer.StoreCusAddOverPriceDTO;
import com.ruoyi.xkt.dto.storeCustomer.StoreCusDTO;
import com.ruoyi.xkt.dto.storeCustomer.StoreCusPageDTO;
import com.ruoyi.xkt.dto.storeCustomer.StoreCusPageResDTO;
@ -83,13 +81,4 @@ public class StoreCustomerController extends XktBaseController {
return R.ok(BeanUtil.toBean(storeCusService.selectByStoreCusId(storeCusId), StoreCusVO.class));
}
@PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()")
@Log(title = "修改大小码加价", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改大小码加价", httpMethod = "PUT", response = R.class)
@PutMapping("/add-over-price")
public R<Integer> updateAddOverPrice(@Validated @RequestBody StoreCusAddOverPriceVO addOverPriceVO) {
return R.ok(storeCusService.updateAddOverPrice(BeanUtil.toBean(addOverPriceVO, StoreCusAddOverPriceDTO.class)));
}
}

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreMemberController.java
View File

@ -6,11 +6,8 @@ import com.ruoyi.common.core.controller.XktBaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.Page;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.web.controller.xkt.vo.store.StorePageVO;
import com.ruoyi.web.controller.xkt.vo.storeMember.StoreMemberCreateVO;
import com.ruoyi.web.controller.xkt.vo.storeMember.StoreMemberPageVO;
import com.ruoyi.xkt.dto.store.StorePageDTO;
import com.ruoyi.xkt.dto.store.StorePageResDTO;
import com.ruoyi.xkt.dto.storeMember.StoreMemberCreateDTO;
import com.ruoyi.xkt.dto.storeMember.StoreMemberPageDTO;
import com.ruoyi.xkt.dto.storeMember.StoreMemberPageResDTO;

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleAccountController.java
View File

@ -37,6 +37,16 @@ import java.util.List;
* 获取档口子账号详情
* <p>
* 停用/启用档口子账号
* <p>
* 新增档口子账号
* <p>
* 修改档口子账号
* <p>
* 获取档口子账号列表
* <p>
* 获取档口子账号详情
* <p>
* 停用/启用档口子账号
*//*
@Api(tags = "档口子账号")

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleController.java
View File

@ -39,6 +39,16 @@ import java.util.List;
* 获取档口子角色列表
* <p>
* 停用/启用档口子角色
* <p>
* 新增档口子角色
* <p>
* 编辑档口子角色
* <p>
* 获取档口子角色详细信息
* <p>
* 获取档口子角色列表
* <p>
* 停用/启用档口子角色
*//*
@Api(tags = "档口子角色")

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreRoleMenuController.java
View File

@ -34,6 +34,18 @@ import java.util.List;
* 修改档口子角色菜单
* <p>
* 删除档口子角色菜单
* <p>
* 查询档口子角色菜单列表
* <p>
* 导出档口子角色菜单列表
* <p>
* 获取档口子角色菜单详细信息
* <p>
* 新增档口子角色菜单
* <p>
* 修改档口子角色菜单
* <p>
* 删除档口子角色菜单
*//*
@RestController

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscountVO.java
View File

@ -20,7 +20,8 @@ public class StoreCusProdDiscountVO {
@ApiModelProperty(value = "档口ID", required = true)
@NotNull(message = "档口ID不能为空!")
private Long storeId;
@ApiModelProperty(value = "档口客户ID")
@ApiModelProperty(value = "档口客户ID", required = true)
@NotNull(message = "档口客户ID不能为空!")
private Long storeCusId;
@NotBlank(message = "客户名称不能为空!")
@ApiModelProperty(value = "客户名称", required = true)
@ -30,8 +31,5 @@ public class StoreCusProdDiscountVO {
@NotNull(message = "所有商品优惠金额不能为空!")
@ApiModelProperty(value = "所有商品优惠金额", required = true)
private Integer allProductDiscount;
@NotNull(message = "大小码加价不能为空!")
@ApiModelProperty(value = "大小码加价 0 不加 1加价", required = true)
private Integer addOverPrice;
}

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

@ -1,27 +0,0 @@
package com.ruoyi.web.controller.xkt.vo.storeCustomer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author liujiang
* @version v1.0
* @date 2025/3/27 15:12
*/
@Data
@ApiModel
public class StoreCusAddOverPriceVO {
@NotNull(message = "档口ID不能为空!")
@ApiModelProperty(value = "档口ID", required = true)
private Long storeId;
@NotNull(message = "档口客户ID不可为空!")
@ApiModelProperty(value = "档口客户ID", required = true)
private Long storeCusId;
@NotNull(message = "是否大小码加价不为空!")
@ApiModelProperty(value = "是否大小码加价", required = true)
private Integer addOverPrice;
}

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

@ -29,9 +29,6 @@ public class StoreCusVO {
@ApiModelProperty(value = "客户联系电话")
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "联系电话格式不正确，请输入有效的中国大陆手机号")
private String phone;
@NotNull(message = "大小码加价不能为空!")
@ApiModelProperty(value = "大小码加价 0 不加 1加价", required = true)
private Integer addOverPrice;
@ApiModelProperty(value = "备注")
private String remark;

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

@ -99,8 +99,6 @@ public class StoreHomeProdResVO {
private Date createTime;
@ApiModelProperty(value = "商品标题")
private String prodTitle;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "详情内容")
private StoreProdDetailVO detail;
@ApiModelProperty(value = "档口商品尺码库存列表")

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

@ -50,8 +50,6 @@ public class StoreProdCreateVO {
private BigDecimal prodWeight;
@ApiModelProperty(value = "生产价格")
private Integer producePrice;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "发货时效")
private Integer deliveryTime;
@ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架", required = true)

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

@ -30,8 +30,6 @@ public class StoreProdPCResVO {
private Date createTime;
@ApiModelProperty(value = "是否已收藏商品")
private Boolean collectProd;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "颜色列表")
private List<SPPCColorVO> colorList;
@ApiModelProperty(value = "档口类目属性map")

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

@ -38,8 +38,6 @@ public class StoreProdResVO {
private BigDecimal prodWeight;
@ApiModelProperty(value = "生产价格")
private Integer producePrice;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "发货时效")
private Integer deliveryTime;
@ApiModelProperty(value = "上架方式 1 立即上架 2 定时上架")

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

@ -50,8 +50,6 @@ public class StoreProdUpdateVO {
private BigDecimal prodWeight;
@ApiModelProperty(value = "生产价格")
private Integer producePrice;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "发货时效")
private Integer deliveryTime;
@ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架", required = true)

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

@ -50,8 +50,6 @@ public class StoreProdVO {
private BigDecimal prodWeight;
@ApiModelProperty(value = "生产价格")
private Integer producePrice;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "发货时效")
private Integer deliveryTime;
@ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架", required = true)

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

@ -27,8 +27,6 @@ public class StoreProdColorPriceVO {
private String colorName;
@ApiModelProperty(value = "档口商品颜色定价")
private BigDecimal price;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "排序")
private Integer orderNum;

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

@ -34,8 +34,6 @@ public class StoreSaleSnResVO {
private BigDecimal price;
@ApiModelProperty(value = "档口客户优惠金额")
private BigDecimal discount;
@ApiModelProperty(value = "大小码加价")
private BigDecimal overPrice;
@ApiModelProperty(value = "标准尺码")
private Integer standard;
@ApiModelProperty(value = "[退货扫码时才有]销售时间")

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

@ -64,8 +64,6 @@ public class StoreSaleResVO {
private String colorName;
@ApiModelProperty(value = "尺码")
private Integer size;
@ApiModelProperty(value = "大小码加价 0 不加 1加价")
private Integer addOverPrice;
@ApiModelProperty(value = "商品货号")
private String prodArtNum;
@ApiModelProperty(value = "销售条码")

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

@ -22,8 +22,6 @@ public class ShopCartEditDetailResVO {
private Long storeProdId;
@ApiModelProperty(value = "商品货号")
private String prodArtNum;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "档口商品尺码库存列表")
private List<StoreProdColorVO> colorList;
@ApiModelProperty(value = "标准尺码")

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

@ -22,8 +22,6 @@ public class ShopCartToOrderResVO {
private Long storeProdId;
@ApiModelProperty(value = "商品货号")
private String prodArtNum;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "档口商品尺码库存列表")
private List<StoreProdColorVO> colorList;
@ApiModelProperty(value = "标准尺码")

2
sql/ry_20240629.sql
View File

@ -3256,7 +3256,6 @@ CREATE TABLE `store_customer`
`id` bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '档口客户ID',
`store_id` bigint UNSIGNED NOT NULL COMMENT '档口ID',
`cus_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户名称',
`add_over_price` int UNSIGNED NOT NULL COMMENT '大小码加价 0不加 1加价',
`all_prod_discount` decimal(10, 2) NULL DEFAULT NULL COMMENT '所有商品优惠金额',
`phone` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户联系电话',
`remark` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户备注',
@ -3374,7 +3373,6 @@ CREATE TABLE `store_product`
`prod_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题',
`prod_weight` decimal(10, 2) NULL DEFAULT NULL COMMENT '商品重量',
`produce_price` int UNSIGNED NULL DEFAULT NULL COMMENT '生产价格',
`over_price` int UNSIGNED NULL DEFAULT NULL COMMENT '大小码加价',
`delivery_time` int UNSIGNED NULL DEFAULT NULL COMMENT '发货时效',
`listing_way_schedule` datetime NULL DEFAULT NULL COMMENT '定时发货时间(精确到小时)',
`voucher_date` date NOT NULL COMMENT '单据日期',

5
xkt/src/main/java/com/ruoyi/xkt/domain/StoreCustomer.java
View File

@ -58,11 +58,6 @@ public class StoreCustomer extends XktBaseEntity {
*/
private Integer allProdDiscount;
/**
* 大小码加价 0 不加 1加价
*/
private Integer addOverPrice;
@Override
public String toString() {

6
xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java
View File

@ -72,12 +72,6 @@ public class StoreProduct extends XktBaseEntity {
@Excel(name = "生产价格")
private BigDecimal producePrice;
/**
* 大小码加价
*/
@Excel(name = "大小码加价")
private Integer overPrice;
/**
* 发货时效
*/

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscountDTO.java
View File

@ -27,7 +27,5 @@ public class StoreCusProdDiscountDTO {
private String phone;
@ApiModelProperty(value = "所有商品优惠金额")
private Integer allProductDiscount;
@ApiModelProperty(value = "大小码加价 0 不加 1加价")
private Integer addOverPrice;
}

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

@ -15,6 +15,4 @@ public class StoreCusAddOverPriceDTO {
private Long storeId;
@ApiModelProperty(value = "档口客户ID")
private Long storeCusId;
@ApiModelProperty(value = "是否大小码加价")
private Integer addOverPrice;
}

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

@ -22,8 +22,6 @@ public class StoreCusDTO {
private String cusName;
@ApiModelProperty(value = "客户联系电话")
private String phone;
@ApiModelProperty(value = "大小码加价 0 不加 1加价")
private Integer addOverPrice;
@ApiModelProperty("备注")
private String remark;

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

@ -25,8 +25,6 @@ public class StoreCusPageResDTO {
private String cusName;
@ApiModelProperty(value = "客户联系电话")
private String phone;
@ApiModelProperty(value = "大小码加价 0 不加 1加价")
private Integer addOverPrice;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("创建时间")

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java
View File

@ -96,8 +96,6 @@ public class StoreHomeProdResDTO {
private Date createTime;
@ApiModelProperty(value = "商品标题")
private String prodTitle;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "详情内容")
private StoreProdDetailDTO detail;
@ApiModelProperty(value = "档口商品尺码库存列表")

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorPrice/StoreProdColorPriceResDTO.java
View File

@ -31,8 +31,6 @@ public class StoreProdColorPriceResDTO {
private String colorName;
@ApiModelProperty(value = "档口商品颜色最低售价")
private BigDecimal price;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "排序")
private Integer orderNum;

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnResDTO.java
View File

@ -33,8 +33,6 @@ public class StoreSaleSnResDTO {
private BigDecimal price;
@ApiModelProperty(value = "档口客户优惠金额")
private BigDecimal discount;
@ApiModelProperty(value = "大小码加价")
private BigDecimal overPrice;
@ApiModelProperty(value = "标准尺码")
private Integer standard;
@ApiModelProperty(value = "[退货扫码时才有]销售时间")

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java
View File

@ -43,8 +43,6 @@ public class StoreProdDTO {
private BigDecimal prodWeight;
@ApiModelProperty(value = "生产价格")
private Integer producePrice;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "发货时效")
private Integer deliveryTime;
@ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架")

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java
View File

@ -34,8 +34,6 @@ public class StoreProdPCResDTO {
private Date createTime;
@ApiModelProperty(value = "是否已收藏商品")
private Boolean collectProd;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "颜色列表")
private List<StoreProdSkuItemDTO> colorList;
@ApiModelProperty(value = "档口类目属性map")

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java
View File

@ -44,8 +44,6 @@ public class StoreProdResDTO {
private BigDecimal prodWeight;
@ApiModelProperty(value = "生产价格")
private Integer producePrice;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "发货时效")
private Integer deliveryTime;
@ApiModelProperty(value = "上架方式")

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java
View File

@ -52,8 +52,6 @@ public class StoreProdUpdateDTO {
private BigDecimal prodWeight;
@ApiModelProperty(value = "生产价格")
private Integer producePrice;
@ApiModelProperty(value = "大小码加价")
private Integer overPrice;
@ApiModelProperty(value = "发货时效")
private Integer deliveryTime;
@ApiModelProperty(value = "上架方式:1 立即上架 2 定时上架", required = true)

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java
View File

@ -63,8 +63,6 @@ public class StoreSaleResDTO {
private String colorName;
@ApiModelProperty(value = "尺码")
private Integer size;
@ApiModelProperty(value = "大小码加价 0 不加 1加价")
private Integer addOverPrice;
@ApiModelProperty(value = "商品货号")
private String prodArtNum;
@ApiModelProperty(value = "销售条码")

7
xkt/src/main/java/com/ruoyi/xkt/service/IStoreCustomerService.java
View File

@ -60,11 +60,4 @@ public interface IStoreCustomerService {
*/
List<StoreCusFuzzyResDTO> fuzzyQueryList(Long storeId, String cusName);
/**
* 更改是否大小码加价
*
* @param addOverPriceDTO 入参
* @return Integer
*/
Integer updateAddOverPrice(StoreCusAddOverPriceDTO addOverPriceDTO);
}

2
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java
View File

@ -86,7 +86,7 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService {
// 新增档口 “现金客户”
StoreCustomer storeCus = new StoreCustomer().setStoreId(store.getId()).setPhone(store.getContactPhone())
// 默认创建现金客户
.setCusName(Constants.STORE_CUS_CASH).setAddOverPrice(0);
.setCusName(Constants.STORE_CUS_CASH);
this.storeCusMapper.insert(storeCus);
return count;
}

1
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java
View File

@ -240,7 +240,6 @@ public class StoreCustomerProductDiscountServiceImpl implements IStoreCustomerPr
storeCus.setPhone(cusProdDisDTO.getPhone());
storeCus.setStoreId(cusProdDisDTO.getStoreId());
storeCus.setAllProdDiscount(cusProdDisDTO.getAllProductDiscount());
storeCus.setAddOverPrice(cusProdDisDTO.getAddOverPrice());
this.storeCusMapper.insert(storeCus);
return storeCus;
}

17
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerServiceImpl.java
View File

@ -56,23 +56,6 @@ public class StoreCustomerServiceImpl implements IStoreCustomerService {
.map(x -> BeanUtil.toBean(x, StoreCusFuzzyResDTO.class).setStoreCusId(x.getId())).collect(Collectors.toList());
}
/**
* 更改是否大小码加价
*
* @param addOverPriceDTO 入参
* @return Integer
*/
@Override
@Transactional
public Integer updateAddOverPrice(StoreCusAddOverPriceDTO addOverPriceDTO) {
StoreCustomer storeCus = Optional.ofNullable(this.storeCusMapper.selectOne(new LambdaQueryWrapper<StoreCustomer>()
.eq(StoreCustomer::getStoreId, addOverPriceDTO.getStoreId()).eq(StoreCustomer::getId, addOverPriceDTO.getStoreCusId())
.eq(StoreCustomer::getDelFlag, Constants.UNDELETED)))
.orElseThrow(() -> new ServiceException("档口客户不存在!", HttpStatus.ERROR));
storeCus.setAddOverPrice(addOverPriceDTO.getAddOverPrice());
return this.storeCusMapper.updateById(storeCus);
}
@Override
@Transactional
public int create(StoreCusDTO storeCusDTO) {

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

@ -387,9 +387,7 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
.eq(StoreSaleDetail::getStoreSaleId, storeSaleId).eq(StoreSaleDetail::getDelFlag, Constants.UNDELETED));
List<StoreProduct> storeProdList = this.storeProdMapper.selectByIds(saleDetailList.stream().map(StoreSaleDetail::getStoreProdId).collect(Collectors.toList()));
Map<Long, StoreProduct> storeProdMap = storeProdList.stream().collect(Collectors.toMap(StoreProduct::getId, x -> x));
storeSaleDTO.setDetailList(saleDetailList.stream().map(x -> BeanUtil.toBean(x, StoreSaleResDTO.SSDetailDTO.class)
.setAddOverPrice(ObjectUtils.isNotEmpty(storeProdMap.get(x.getStoreProdId())) ? storeProdMap.get(x.getStoreProdId()).getOverPrice() : 0))
.collect(Collectors.toList()));
storeSaleDTO.setDetailList(saleDetailList.stream().map(x -> BeanUtil.toBean(x, StoreSaleResDTO.SSDetailDTO.class)).collect(Collectors.toList()));
return storeSaleDTO;
}