hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-31 02:08:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

📖 CRM：code review 合同金额排行榜、回款金额排行榜

Browse Source
This commit is contained in:
YunaiV
2024-01-30 09:24:42 +08:00
parent 278f220cef
commit 52a68e1838
13 changed files with 92 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java
View File

@@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSalesOrderItemDO;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@@ -30,7 +29,7 @@ public class ErpSaleOrderSaveReqVO {
private LocalDateTime orderTime;
@Schema(description = "销售员编号数组")
private String salePersonIds;
private List<Long> salePersonIds;
@Schema(description = "合计价格，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "26094")
@NotNull(message = "合计价格，单位：元不能为空")
@@ -69,6 +68,61 @@ public class ErpSaleOrderSaveReqVO {
// private Integer status;
@Schema(description = "ERP 销售订单明细列表")
private List<ErpSalesOrderItemDO> salesOrderItems;
private List<Item> salesOrderItems;
@Schema(description = "管理后台 - ERP 销售订单明细新增/修改 Request VO")
@Data
public class Item {
@Schema(description = "编号", example = "20704")
private Long id;
// TODO 芋艿：后面删除
// @Schema(description = "销售订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "30765")
// @NotNull(message = "销售订单编号不能为空")
// private Long orderId;
// @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "5574")
// @NotNull(message = "商品 SPU 编号不能为空")
// private Long productSpuId;
@Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "21273")
@NotNull(message = "商品 SKU 编号不能为空")
private Long productSkuId;
@Schema(description = "商品单位", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "商品单位不能为空")
private String productUnit;
@Schema(description = "商品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "6897")
@NotNull(message = "商品单价不能为空")
private BigDecimal productPrice;
@Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "22100")
@NotNull(message = "数量不能为空")
private Integer count;
// TODO 芋艿：后面删除
// @Schema(description = "总价", requiredMode = Schema.RequiredMode.REQUIRED, example = "26868")
// @NotNull(message = "总价不能为空")
// private BigDecimal totalPrice;
@Schema(description = "备注", example = "你说的对")
private String description;
@Schema(description = "税率，百分比", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "税率，百分比不能为空")
private BigDecimal taxPercent;
@Schema(description = "税额，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "15791")
@NotNull(message = "税额，单位：元不能为空")
private BigDecimal taxPrice;
// TODO 芋艿：后面删除
// @Schema(description = "支付金额，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "21930")
// @NotNull(message = "支付金额，单位：元不能为空")
// private BigDecimal payPrice;
}
}

26
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
View File

@@ -40,11 +40,16 @@ public class ErpSaleOrderServiceImpl implements ErpSaleOrderService {
saleOrderMapper.insert(saleOrder);
// 插入子表
createSalesOrderItemsList(saleOrder.getId(), createReqVO.getSalesOrderItems());
// createSalesOrderItemsList(saleOrder.getId(), createReqVO.getSalesOrderItems());
// 返回
return saleOrder.getId();
}
private void createSalesOrderItemsList(Long id, List<ErpSalesOrderItemDO> list) {
list.forEach(o -> o.setId(id));
salesOrderItemMapper.insertBatch(list);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateSaleOrder(ErpSaleOrderSaveReqVO updateReqVO) {
@@ -55,7 +60,13 @@ public class ErpSaleOrderServiceImpl implements ErpSaleOrderService {
saleOrderMapper.updateById(updateObj);
// 更新子表
updateSalesOrderItemsList(updateReqVO.getId(), updateReqVO.getSalesOrderItems());
// updateSalesOrderItemsList(updateReqVO.getId(), updateReqVO.getSalesOrderItems());
}
private void updateSalesOrderItemsList(Long id, List<ErpSalesOrderItemDO> list) {
deleteSalesOrderItemsById(id);
list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
createSalesOrderItemsList(id, list);
}
@Override
@@ -88,17 +99,6 @@ public class ErpSaleOrderServiceImpl implements ErpSaleOrderService {
// ==================== 子表（ERP 销售订单明细） ====================
private void createSalesOrderItemsList(Long id, List<ErpSalesOrderItemDO> list) {
list.forEach(o -> o.setId(id));
salesOrderItemMapper.insertBatch(list);
}
private void updateSalesOrderItemsList(Long id, List<ErpSalesOrderItemDO> list) {
deleteSalesOrderItemsById(id);
list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
createSalesOrderItemsList(id, list);
}
private void deleteSalesOrderItemsById(Long id) {
salesOrderItemMapper.deleteById(id);
}