From cd37b830467ea1a509edc522b6e8f189b7afb80d Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 6 Mar 2025 16:30:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasePurchaseSystem.java | 12 +- .../BasePurchaseSystemDetailsVo.java | 12 +- .../BasePurchaseSystemDto.java | 16 +- .../BasePurchaseSystemVo.java | 2 + .../BasePurchaseSystemMapper.java | 17 -- .../BasePurchaseSystemRest.java | 1 - .../BasePurchaseSystemService.java | 21 -- .../firstshelves/AppFirstShelvesService.java | 41 ++++ .../terminal/fegin/smsgoods/SmsGoodsDto.java | 44 +++++ .../fegin/smsgoods/SmsGoodsFeign.java | 19 ++ .../SmsPricestrategyBillDetailDetailsVo.java | 6 +- .../SmsPricestrategyBillFeign.java | 6 +- ...estrategyBillGoodstypedetailDetailsVo.java | 8 +- .../apiadmin/SmsPricestrategyBillRest.java | 181 +++++++++--------- .../com/yxt/sms/biz/smsgoods/SmsGoods.java | 34 +--- .../yxt/sms/biz/smsgoods/SmsGoodsMapper.java | 9 +- .../yxt/sms/biz/smsgoods/SmsGoodsService.java | 18 +- .../SmsPricestrategyBill.java | 23 +-- .../SmsPricestrategyBillDetailsVo.java | 10 +- .../SmsPricestrategyBillDto.java | 26 +-- .../SmsPricestrategyBillQuery.java | 19 -- .../SmsPricestrategyBillService.java | 70 +++---- .../SmsPricestrategyBillVo.java | 26 +-- .../SmsPricestrategyBillDetailDetailsVo.java | 23 +-- .../SmsPricestrategyBillDetailMapper.java | 28 +-- .../SmsPricestrategyBillDetailService.java | 4 + ...estrategyBillGoodstypedetailDetailsVo.java | 24 +-- 27 files changed, 323 insertions(+), 377 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsDto.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsFeign.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java index 817b270e8e..75a96e7f40 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java @@ -52,18 +52,20 @@ import java.math.BigDecimal; public class BasePurchaseSystem extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("部门sid") + @ApiModelProperty("部门sid") private String deptSid; // 部门sid - @ApiModelProperty("部门名称") + @ApiModelProperty("部门名称") private String deptName; // 部门名称 - @ApiModelProperty("采购系统名称") + @ApiModelProperty("采购系统名称") private String purchaseSystemName; // 采购系统名称 @ApiModelProperty("财务中分公司编码") private String orgCode; // 财务中分公司编码 @ApiModelProperty("分摊比例") private BigDecimal shareProportion; + @ApiModelProperty("财务中供应商/客户编码") + private String suppCustCode; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java index 442343440f..ac54410624 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java @@ -53,18 +53,20 @@ public class BasePurchaseSystemDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("部门sid") + @ApiModelProperty("部门sid") private String deptSid; // 部门sid - @ApiModelProperty("部门名称") + @ApiModelProperty("部门名称") private String deptName; // 部门名称 - @ApiModelProperty("采购系统名称") + @ApiModelProperty("采购系统名称") private String purchaseSystemName; // 采购系统名称 @ApiModelProperty("财务中分公司编码") private String orgCode; // 财务中分公司编码 @ApiModelProperty("分摊比例") private BigDecimal shareProportion; + @ApiModelProperty("财务中供应商/客户编码") + private String suppCustCode; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java index ffb3d9de7a..afba731b4d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-base(采购系统管理)
* File: BasePurchaseSystemDto.java
@@ -51,16 +53,20 @@ public class BasePurchaseSystemDto implements Dto { private String sid; // sid - @ApiModelProperty("分公司sid") + @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") + @ApiModelProperty("分公司名称") private String useOrgName; // 分公司名称 - @ApiModelProperty("部门sid") + @ApiModelProperty("部门sid") private String deptSid; // 部门sid - @ApiModelProperty("部门名称") + @ApiModelProperty("部门名称") private String deptName; // 部门名称 - @ApiModelProperty("采购系统名称") + @ApiModelProperty("采购系统名称") private String purchaseSystemName; // 采购系统名称 @ApiModelProperty("财务中分公司编码") private String orgCode; // 财务中分公司编码 + @ApiModelProperty("分摊比例") + private BigDecimal shareProportion; + @ApiModelProperty("财务中供应商/客户编码") + private String suppCustCode; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java index ac09085c88..c500f4b833 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java @@ -67,4 +67,6 @@ public class BasePurchaseSystemVo implements Vo { private String orgCode; // 财务中分公司编码 @ApiModelProperty("分摊比例") private BigDecimal shareProportion; + @ApiModelProperty("财务中供应商/客户编码") + private String suppCustCode; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java index 8c7a21b326..071e2f05f0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java @@ -37,28 +37,11 @@ import org.apache.ibatis.annotations.Select; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo; import org.apache.ibatis.annotations.Update; - import java.util.List; -/** - * Project: anrui-base(采购系统管理)
- * File: BasePurchaseSystemMapper.java
- * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemMapper
- * Description: 采购系统管理表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-01-06 09:27:28
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface BasePurchaseSystemMapper extends BaseMapper { - //@Update("update base_purchase_system set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java index 05e5b55ae8..1861418278 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java @@ -33,7 +33,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import java.util.List; @Api(tags = "采购系统管理表") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java index 0f37f382fd..7b25f2d247 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java @@ -38,35 +38,14 @@ import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.List; -/** - * Project: anrui-base(采购系统管理)
- * File: BasePurchaseSystemService.java
- * Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService
- * Description: 采购系统管理表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-01-06 09:27:28
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class BasePurchaseSystemService extends MybatisBaseService { @Autowired private SysStaffOrgFeign sysStaffOrgFeign; - private QueryWrapper createQueryWrapper(BasePurchaseSystemQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - public PagerVo listPageVo(PagerQuery pq) { BasePurchaseSystemQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java index f90a5ccaff..d27e82fc1c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java @@ -30,6 +30,11 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.terminal.api.as.firstshelves.*; +import com.yxt.anrui.terminal.fegin.smsgoods.SmsGoodsDto; +import com.yxt.anrui.terminal.fegin.smsgoods.SmsGoodsFeign; +import com.yxt.anrui.terminal.fegin.smspricestrategybill.SmsPricestrategyBillDetailDetailsVo; +import com.yxt.anrui.terminal.fegin.smspricestrategybill.SmsPricestrategyBillFeign; +import com.yxt.anrui.terminal.fegin.smspricestrategybill.SmsPricestrategyBillGoodstypedetailDetailsVo; import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventoryFeign; import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventorySaveDto; import com.yxt.anrui.terminal.fegin.wmsgoodstag.GoodsTagListQuery; @@ -67,6 +72,10 @@ public class AppFirstShelvesService { private SysStaffOrgFeign sysStaffOrgFeign; @Autowired private SysOrganizationFeign sysOrganizationFeign; + @Resource + private SmsGoodsFeign smsGoodsFeign; + @Resource + private SmsPricestrategyBillFeign smsPricestrategyBillFeign; public ResultBean list(PagerQuery pagerQuery) { ResultBean rb = ResultBean.fireFail(); @@ -211,6 +220,38 @@ public class AppFirstShelvesService { if (chae.compareTo(BigDecimal.ZERO) == 0) { wmsGoodsTagFeign.updateState(wmsGoodsTag.getSid(), "1"); } + //生成销售商品列表 + SmsGoodsDto smsGoodsDto = new SmsGoodsDto(); + smsGoodsDto.setCreateBySid(dto.getUserSid()); + smsGoodsDto.setGoodsID(appFirstShelvesGoodsDto.getGoodsID()); + smsGoodsDto.setGoodsTypeSid(wmsInitialDetail.getGoodsTypeSid()); + smsGoodsDto.setGoodsTypeName(wmsInitialDetail.getGoodsTypeName()); + smsGoodsDto.setGoodsSpuSid(wmsGoodsTag.getGoodsSpuSid()); + smsGoodsDto.setGoodsSpuName(wmsGoodsTag.getGoodsSpuName()); + smsGoodsDto.setGoodsSkuSid(wmsGoodsTag.getGoodsSkuSid()); + smsGoodsDto.setGoodsSkuTitle(wmsGoodsTag.getGoodsSkuTitle()); + smsGoodsDto.setGoodsSkuCode(wmsGoodsTag.getGoodsSkuCode()); + smsGoodsDto.setGoodsSkuOwnSpec(wmsGoodsTag.getGoodsSkuOwnSpec()); + smsGoodsDto.setSupplierName(wmsInitialDetail.getSupplierName()); + smsGoodsDto.setUnit(wmsGoodsTag.getUnit()); + smsGoodsDto.setCost(wmsInitialDetail.getInCost().toString()); + BigDecimal saleGuidePrice = wmsInitialDetail.getSaleGuidePrice(); + SmsPricestrategyBillDetailDetailsVo data = smsPricestrategyBillFeign.selByGoodsTypeSid(wmsInitialDetail.getGoodsTypeSid()).getData(); + if (data == null) { + smsGoodsDto.setPrice(saleGuidePrice.toString()); + } else { + List smsPricestrategyBillGoodstypedetailDetailsVos = data.getSmsPricestrategyBillGoodstypedetailList(); + for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) { + if (saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { + BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); + saleGuidePrice = saleGuidePrice.add(saleGuidePrice.multiply(markupRate).divide(new BigDecimal("100"))); + smsGoodsDto.setPrice(saleGuidePrice.toString()); + } + } + } + smsGoodsDto.setUseOrgSid(deptSid); + smsGoodsDto.setCreateOrgSid(createOrgSid); + smsGoodsFeign.saveSmsGoods(smsGoodsDto); } return rb.success(); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsDto.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsDto.java new file mode 100644 index 0000000000..eb43d04925 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsDto.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.terminal.fegin.smsgoods; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SmsGoodsDto { + + private String sid; + private String createBySid; + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品类别sid") + private String goodsTypeSid; // 商品类别sid + @ApiModelProperty("商品类别名称") + private String goodsTypeName; // 商品类别名称 + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品SkuSid") + private String goodsSkuSid; // 商品SkuSid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; // 商品编码（图号） + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("销售单价") + private String price; // 销售单价 + @ApiModelProperty("入库单价") + private String cost; // 入库单价 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsFeign.java new file mode 100644 index 0000000000..e9ec6f578f --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsFeign.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.fegin.smsgoods; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient( + contextId = "yxt-sms-SmsGoods", + name = "yxt-sms", + path = "/apiadmin/v1/smsGoods" +) +public interface SmsGoodsFeign { + + @ApiOperation("保存修改") + @PostMapping("/saveSmsGoods") + public ResultBean saveSmsGoods(@RequestBody SmsGoodsDto dto); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java index 13207244b0..f0b3d30fa3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java @@ -53,13 +53,13 @@ public class SmsPricestrategyBillDetailDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("申请单sid") + @ApiModelProperty("申请单sid") private String mainSid; // 申请单sid - @ApiModelProperty("商品类别sid") + @ApiModelProperty("商品类别sid") private String goodsTypeSid; // 商品类别sid @ApiModelProperty("商品类别编码") private String goodsTypeCode; - @ApiModelProperty("商品类别名称") + @ApiModelProperty("商品类别名称") private String goodsTypeName; // 商品类别名称 @ApiModelProperty("价格策略类别(固定比例1、价格区间2)") private Integer strategyType; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java index ede3a63928..efb35302df 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; - import javax.validation.Valid; import java.util.List; @@ -52,4 +51,9 @@ public interface SmsPricestrategyBillFeign { @PutMapping(value = "/assignTask") @ResponseBody public ResultBean assignTask(@RequestBody SmsPricestrategyBillDelegateQuery query); + + @ApiOperation(value = "根据商品类型查询价格策略") + @PostMapping(value = "/selByGoodsTypeSid") + @ResponseBody + ResultBean selByGoodsTypeSid(@RequestParam("goodsTypeSid") String goodsTypeSid); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java index a179e6e456..48972dc313 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java @@ -52,13 +52,13 @@ public class SmsPricestrategyBillGoodstypedetailDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("业务sid") + @ApiModelProperty("业务sid") private String detailSid; // 业务sid - @ApiModelProperty("区间起始") + @ApiModelProperty("区间起始") private BigDecimal rangeStart; // 区间起始 - @ApiModelProperty("区间截止") + @ApiModelProperty("区间截止") private BigDecimal rangeEnd; // 区间截止 - @ApiModelProperty("加价比例") + @ApiModelProperty("加价比例") private BigDecimal markupRate; // 加价比例 } \ No newline at end of file diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java index fc535354b9..e4f872bdc9 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java @@ -31,6 +31,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.sms.biz.smspricestrategybill.*; import com.yxt.sms.biz.smspricestrategybill.flowable.*; +import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDetailsVo; import com.yxt.sms.feign.flowable.flow.BusinessVariables; import com.yxt.sms.feign.flowable.flow.ProcDefEnum; import io.swagger.annotations.Api; @@ -42,105 +43,99 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -/** - * Project: yxt-sms(价格策略)
- * File: SmsPricestrategyBillFeignFallback.java
- * Class: com.yxt.sms.biz.smspricestrategybill.SmsPricestrategyBillRest
- * Description: 价格策略申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:29:38
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "价格策略申请") @RestController @RequestMapping("v1/smspricestrategybill") public class SmsPricestrategyBillRest { - @Autowired - private SmsPricestrategyBillService smsPricestrategyBillService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = smsPricestrategyBillService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody SmsPricestrategyBillDto dto){ - ResultBean rb = ResultBean.fireFail(); - smsPricestrategyBillService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("根据sid批量删除") + @Autowired + private SmsPricestrategyBillService smsPricestrategyBillService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = smsPricestrategyBillService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SmsPricestrategyBillDto dto) { + ResultBean rb = ResultBean.fireFail(); + smsPricestrategyBillService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return smsPricestrategyBillService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return smsPricestrategyBillService.delAll(sids); + } - @ApiOperation("根据SID获取一条记录") + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - SmsPricestrategyBillDetailsVo vo = smsPricestrategyBillService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @ApiOperation("提交审批流程") - @PostMapping("/submit") - public ResultBean submit(@RequestBody @Valid SubmitSmsPricestrategyBillDto dto) { - return smsPricestrategyBillService.submit(dto); - } - - @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") - public ResultBean complete(@Valid @RequestBody SmsPricestrategyBillCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SMSPRICESTRATEGYBILL.getProDefId()); - return smsPricestrategyBillService.complete(bv); - } - - @ApiOperation(value = "获取上一个环节") - @GetMapping(value = "/getPreviousNodesForReject") - public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) { - return smsPricestrategyBillService.getPreviousNodesForReject(query); - } - - @ApiOperation(value = "获取下一个环节") - @GetMapping(value = "/getNextNodesForSubmit") - public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) { - return smsPricestrategyBillService.getNextNodesForSubmit(query); - } - - @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject") - public ResultBean reject(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) { - return smsPricestrategyBillService.reject(query); - } - - @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess") - public ResultBean revokeProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) { - return smsPricestrategyBillService.revokeProcess(query); - } - - @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess") - public ResultBean breakProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) { - return smsPricestrategyBillService.breakProcess(query); - } - - @ApiOperation(value = "加签") - @PostMapping(value = "/delegate") - public ResultBean delegate(@RequestBody SmsPricestrategyBillDelegateQuery query) { - return smsPricestrategyBillService.delegate(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + SmsPricestrategyBillDetailsVo vo = smsPricestrategyBillService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @ApiOperation("提交审批流程") + @PostMapping("/submit") + public ResultBean submit(@RequestBody @Valid SubmitSmsPricestrategyBillDto dto) { + return smsPricestrategyBillService.submit(dto); + } + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody SmsPricestrategyBillCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.SMSPRICESTRATEGYBILL.getProDefId()); + return smsPricestrategyBillService.complete(bv); + } + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) { + return smsPricestrategyBillService.getPreviousNodesForReject(query); + } + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) { + return smsPricestrategyBillService.getNextNodesForSubmit(query); + } + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) { + return smsPricestrategyBillService.reject(query); + } + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) { + return smsPricestrategyBillService.revokeProcess(query); + } + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query) { + return smsPricestrategyBillService.breakProcess(query); + } + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody SmsPricestrategyBillDelegateQuery query) { + return smsPricestrategyBillService.delegate(query); + } + + @ApiOperation(value = "根据商品类型查询价格策略") + @PostMapping(value = "/selByGoodsTypeSid") + @ResponseBody + ResultBean selByGoodsTypeSid(@RequestParam("goodsTypeSid") String goodsTypeSid){ + return smsPricestrategyBillService.selByGoodsTypeSid(goodsTypeSid); + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java index 9ef11cc2d9..bfbf3f1b47 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java @@ -30,47 +30,33 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.math.BigDecimal; -/** - * Project: yxt-sms(价格策略)
- * File: SmsPricestrategy.java
- * Class: com.yxt.sms.api.smspricestrategy.SmsPricestrategy
- * Description: 价格策略.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "商品售价列表", description = "商品售价列表") @TableName("sms_goods") public class SmsGoods extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("商品ID") + @ApiModelProperty("商品ID") private String goodsID; // 商品ID - @ApiModelProperty("商品类别sid") + @ApiModelProperty("商品类别sid") private String goodsTypeSid; // 商品类别sid - @ApiModelProperty("商品类别名称") + @ApiModelProperty("商品类别名称") private String goodsTypeName; // 商品类别名称 - @ApiModelProperty("商品基础信息Sid") + @ApiModelProperty("商品基础信息Sid") private String goodsSpuSid; // 商品基础信息Sid - @ApiModelProperty("商品名称") + @ApiModelProperty("商品名称") private String goodsSpuName; // 商品名称 - @ApiModelProperty("商品SkuSid") + @ApiModelProperty("商品SkuSid") private String goodsSkuSid; // 商品SkuSid - @ApiModelProperty("商品Sku名称") + @ApiModelProperty("商品Sku名称") private String goodsSkuTitle; // 商品Sku名称 - @ApiModelProperty("商品编码（图号）") + @ApiModelProperty("商品编码（图号）") private String goodsSkuCode; // 商品编码（图号） - @ApiModelProperty("规格型号") + @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; // 规格型号 - @ApiModelProperty("供应商sid") + @ApiModelProperty("供应商sid") private String supplierSid; // 供应商sid @ApiModelProperty("供应商名称") private String supplierName; // 供应商名称 diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java index 1ecd48915f..40cafed5a9 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java @@ -33,6 +33,7 @@ import com.yxt.sms.biz.smspricestrategy.SmsPricestrategyVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -40,6 +41,12 @@ import java.util.List; @Mapper public interface SmsGoodsMapper extends BaseMapper { - @Select("select * from sms_goods where goodsID =#{goodsID}") + @Select("select * from sms_goods where goodsID = #{goodsID}") SmsGoods fetchEntityByGoodsID(@Param("goodsID") String goodsID); + + @Select("select * from sms_goods where goodsTypeSid = #{goodsTypeSid}") + List selByGoodsTypeSid(String goodsTypeSid); + + @Update("update sms_goods set price = #{price} where sid = #{sid}") + void updateSalesPrice(@Param("sid") String sid,@Param("price") String price); } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java index 1c5e3f40f6..71ae4f2a7d 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java @@ -30,10 +30,12 @@ import com.yxt.common.base.service.MybatisBaseService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class SmsGoodsService extends MybatisBaseService { - + public SmsGoods fetchEntityByGoodsID(String goodsID) { return baseMapper.fetchEntityByGoodsID(goodsID); } @@ -41,16 +43,24 @@ public class SmsGoodsService extends MybatisBaseService selByGoodsTypeSid(String goodsTypeSid) { + return baseMapper.selByGoodsTypeSid(goodsTypeSid); + } + + public void updateSalesPrice(String sid, String price) { + baseMapper.updateSalesPrice(sid, price); + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java index 7fa2b4a605..4b55a753c0 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java @@ -34,28 +34,15 @@ import lombok.Data; import java.util.Date; -/** - * Project: yxt-sms(价格策略)
- * File: SmsPricestrategyBill.java
- * Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBill
- * Description: 价格策略申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "价格策略申请", description = "价格策略申请") @TableName("sms_pricestrategy_bill") public class SmsPricestrategyBill extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("申请部门sid") private String deptSid; @@ -71,12 +58,12 @@ public class SmsPricestrategyBill extends BaseEntity { private String nodeState; // 流程状态 @ApiModelProperty("任务id") private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 - @ApiModelProperty("组织sid") + @ApiModelProperty("组织sid") private String useOrgSid; // 组织sid - @ApiModelProperty("组织名称") + @ApiModelProperty("组织名称") private String useOrgName; // 组织名称 } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java index 415e5c81c9..4f53f0e3be 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java @@ -67,9 +67,9 @@ public class SmsPricestrategyBillDetailsVo implements Vo { private String remarks; @ApiModelProperty("制单人sid") private String createBySid; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("申请部门sid") private String deptSid; @@ -85,12 +85,12 @@ public class SmsPricestrategyBillDetailsVo implements Vo { private String nodeState; // 流程状态 @ApiModelProperty("任务id") private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 - @ApiModelProperty("组织sid") + @ApiModelProperty("组织sid") private String useOrgSid; // 组织sid - @ApiModelProperty("组织名称") + @ApiModelProperty("组织名称") private String useOrgName; // 组织名称 @ApiModelProperty("价格策略明细") private List smsPricestrategyBillDetailList; diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java index af6fe6eb8a..dd647bde52 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java @@ -25,31 +25,15 @@ *********************************************************/ package com.yxt.sms.biz.smspricestrategybill; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; - import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.Date; import java.util.List; -/** - * Project: yxt-sms(价格策略)
- * File: SmsPricestrategyBillDto.java
- * Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillDto
- * Description: 价格策略申请 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "价格策略申请 数据传输对象", description = "价格策略申请 数据传输对象") public class SmsPricestrategyBillDto implements Dto { @@ -60,9 +44,9 @@ public class SmsPricestrategyBillDto implements Dto { private String remarks; @ApiModelProperty("制单人sid") private String createBySid; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 @ApiModelProperty("申请部门sid") private String deptSid; @@ -78,12 +62,12 @@ public class SmsPricestrategyBillDto implements Dto { private String nodeState; // 流程状态 @ApiModelProperty("任务id") private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 - @ApiModelProperty("组织sid") + @ApiModelProperty("组织sid") private String useOrgSid; // 组织sid - @ApiModelProperty("组织名称") + @ApiModelProperty("组织名称") private String useOrgName; // 组织名称 @ApiModelProperty("价格策略明细") private List smsPricestrategyBillDetailList; diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java index ea72e9f411..496d8d0dd1 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java @@ -25,29 +25,11 @@ *********************************************************/ package com.yxt.sms.biz.smspricestrategybill; - -import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.query.Query; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - -/** - * Project: yxt-sms(价格策略)
- * File: SmsPricestrategyBillQuery.java
- * Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillQuery
- * Description: 价格策略申请 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "价格策略申请 查询条件", description = "价格策略申请 查询条件") public class SmsPricestrategyBillQuery implements Query { @@ -57,7 +39,6 @@ public class SmsPricestrategyBillQuery implements Query { private String userSid; @ApiModelProperty("菜单url") private String menuUrl; - @ApiModelProperty("组织名称") private String useOrgName; @ApiModelProperty("申请部门名称") diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java index ca311b36ec..6310f37ee5 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java @@ -32,6 +32,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.common.core.result.ResultBean; +import com.yxt.sms.biz.smsgoods.SmsGoods; +import com.yxt.sms.biz.smsgoods.SmsGoodsService; import com.yxt.sms.biz.smspricestrategybill.flowable.*; import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDetailsVo; import com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailDto; @@ -55,39 +57,20 @@ import com.yxt.sms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.sms.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.sms.feign.privilege.PrivilegeQuery; import com.yxt.sms.feign.sysuser.SysUserFeign; -import com.yxt.sms.feign.wms.wmsinventory.WmsInventoryFeign; -import com.yxt.sms.feign.wms.wmsinventoryrecord.WmsInventoryRecordFeign; -import com.yxt.sms.feign.yxtbase.BaseGoodsSkuExtendFeign; -import com.yxt.sms.feign.yxtbase.BaseGoodsSkuFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; - import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; -/** - * Project: yxt-sms(价格策略)
- * File: SmsPricestrategyBillService.java
- * Class: com.yxt.sms.biz.smspricestrategybill.SmsPricestrategyBillService
- * Description: 价格策略申请 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class SmsPricestrategyBillService extends MybatisBaseService { @@ -112,13 +95,7 @@ public class SmsPricestrategyBillService extends MybatisBaseService listPageVo(PagerQuery pq) { SmsPricestrategyBillQuery query = pq.getParams(); @@ -456,28 +433,14 @@ public class SmsPricestrategyBillService extends MybatisBaseService smsPricestrategyBillDetailDetailsVos = smsPricestrategyBillDetailService.selByMainSid(businessSid); for (SmsPricestrategyBillDetailDetailsVo smsPricestrategyBillDetailDetailsVo : smsPricestrategyBillDetailDetailsVos) { List smsPricestrategyBillGoodstypedetailDetailsVos = smsPricestrategyBillGoodstypedetailService.selByMainSid(smsPricestrategyBillDetailDetailsVo.getSid()); - List skuSids = baseGoodsSkuFeign.fetchSkuSid(smsPricestrategyBillDetailDetailsVo.getGoodsTypeSid()).getData(); - for (String skuSid : skuSids) { - BigDecimal price = wmsInventoryFeign.compute(skuSid).getData(); - if (price.compareTo(BigDecimal.ZERO) == 0) { - //查找出入库记录中最后一次销售出库的销售价 - BigDecimal cost = wmsInventoryRecordFeign.selCost(skuSid).getData(); - if (cost.compareTo(BigDecimal.ZERO) == 1){ - for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) { - if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { - BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); - cost = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100"))); - baseGoodsSkuExtendFeign.updateSalesPrice(skuSid, cost.toString()); - } - } - } - } else { - for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) { - if (price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { - BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); - price = price.add(price.multiply(markupRate).divide(new BigDecimal("100"))); - baseGoodsSkuExtendFeign.updateSalesPrice(skuSid, price.toString()); - } + List smsGoods = smsGoodsService.selByGoodsTypeSid(smsPricestrategyBillDetailDetailsVo.getGoodsTypeSid()); + for (SmsGoods smsGood : smsGoods) { + BigDecimal price = smsGood.getPrice(); + for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) { + if (price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { + BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); + price = price.add(price.multiply(markupRate).divide(new BigDecimal("100"))); + smsGoodsService.updateSalesPrice(smsGood.getSid(), price.toString()); } } } @@ -710,4 +673,15 @@ public class SmsPricestrategyBillService extends MybatisBaseService selByGoodsTypeSid(String goodsTypeSid) { + ResultBean rb = ResultBean.fireFail(); + SmsPricestrategyBillDetailDetailsVo smsPricestrategyBillDetailDetailsVo = smsPricestrategyBillDetailService.selByGoodsTypeSid(goodsTypeSid); + if (smsPricestrategyBillDetailDetailsVo == null){ + return rb.success().setData(null); + } + List smsPricestrategyBillGoodstypedetailDetailsVos = smsPricestrategyBillGoodstypedetailService.selByMainSid(smsPricestrategyBillDetailDetailsVo.getSid()); + smsPricestrategyBillDetailDetailsVo.setSmsPricestrategyBillGoodstypedetailList(smsPricestrategyBillGoodstypedetailDetailsVos); + return rb.success().setData(smsPricestrategyBillDetailDetailsVo); + } } \ No newline at end of file diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java index 7bf1474550..f17f4397fd 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java @@ -25,29 +25,13 @@ *********************************************************/ package com.yxt.sms.biz.smspricestrategybill; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.Date; -/** - * Project: yxt-sms(价格策略)
- * File: SmsPricestrategyBillVo.java
- * Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillVo
- * Description: 价格策略申请 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "价格策略申请 视图数据对象", description = "价格策略申请 视图数据对象") public class SmsPricestrategyBillVo implements Vo { @@ -60,18 +44,18 @@ public class SmsPricestrategyBillVo implements Vo { timezone = "GMT+8" ) private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("办结时间") private Date finishTime; @ApiModelProperty("流程状态") private String nodeState; - @ApiModelProperty("制单人姓名") + @ApiModelProperty("制单人姓名") private String createByName; // 制单人姓名 - @ApiModelProperty("单据编号") + @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("发起部门名称") + @ApiModelProperty("发起部门名称") private String deptName; // 发起部门名称 - @ApiModelProperty("组织名称") + @ApiModelProperty("组织名称") private String useOrgName; // 组织名称 @ApiModelProperty("流程定义的id") private String procDefId; diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java index bb1f6d66d0..a767c7ff91 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java @@ -25,44 +25,27 @@ *********************************************************/ package com.yxt.sms.biz.smspricestrategybilldetail; - import com.yxt.common.core.vo.Vo; - import com.yxt.sms.biz.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailDetailsVo; -import com.yxt.sms.biz.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.math.BigDecimal; import java.util.List; -/** - * Project: yxt-sms(价格策略)
- * File: SmsPricestrategyBillDetailVo.java
- * Class: com.yxt.sms.api.smspricestrategybilldetail.SmsPricestrategyBillDetailVo
- * Description: 价格策略申请明细 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "价格策略申请明细 视图数据详情", description = "价格策略申请明细 视图数据详情") public class SmsPricestrategyBillDetailDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("申请单sid") + @ApiModelProperty("申请单sid") private String mainSid; // 申请单sid - @ApiModelProperty("商品类别sid") + @ApiModelProperty("商品类别sid") private String goodsTypeSid; // 商品类别sid @ApiModelProperty("商品类别编码") private String goodsTypeCode; - @ApiModelProperty("商品类别名称") + @ApiModelProperty("商品类别名称") private String goodsTypeName; // 商品类别名称 @ApiModelProperty("价格策略类别(固定比例1、价格区间2)") private Integer strategyType; diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java index f35455d3ea..5afd4e1848 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java @@ -25,38 +25,24 @@ *********************************************************/ package com.yxt.sms.biz.smspricestrategybilldetail; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; - import java.util.List; -/** - * Project: yxt-sms(价格策略)
- * File: SmsPricestrategyBillDetailMapper.java
- * Class: com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailMapper
- * Description: 价格策略申请明细.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface SmsPricestrategyBillDetailMapper extends BaseMapper { - @Delete("delete from sms_pricestrategy_bill_detail where mainSid = #{mainSid}") + @Delete("delete from sms_pricestrategy_bill_detail where mainSid = #{mainSid}") void delByMainSid(String mainSid); - @Select("select * from sms_pricestrategy_bill_detail where mainSid = #{mainSid}") - List selByMainSid(String mainSid); + @Select("select * from sms_pricestrategy_bill_detail where mainSid = #{mainSid}") + List selByMainSid(String mainSid); + + String selSid(@Param("goodsTypeSid") String goodsTypeSid, @Param("deptSid") String deptSid); - String selSid(@Param("goodsTypeSid") String goodsTypeSid,@Param("deptSid") String deptSid); + @Select("select * from sms_pricestrategy_bill_detail where goodsTypeSid = #{goodsTypeSid}") + SmsPricestrategyBillDetailDetailsVo selByGoodsTypeSid(String goodsTypeSid); } \ No newline at end of file diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java index 0bcb1dbc0e..72527739d2 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java @@ -97,4 +97,8 @@ public class SmsPricestrategyBillDetailService extends MybatisBaseService - * File: SmsPricestrategyBillGoodstypedetailVo.java
- * Class: com.yxt.sms.api.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailVo
- * Description: 价格策略商品类别明细 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-28 14:32:24
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "价格策略商品类别明细 视图数据详情", description = "价格策略商品类别明细 视图数据详情") public class SmsPricestrategyBillGoodstypedetailDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("业务sid") + @ApiModelProperty("业务sid") private String detailSid; // 业务sid - @ApiModelProperty("区间起始") + @ApiModelProperty("区间起始") private BigDecimal rangeStart; // 区间起始 - @ApiModelProperty("区间截止") + @ApiModelProperty("区间截止") private BigDecimal rangeEnd; // 区间截止 - @ApiModelProperty("加价比例") + @ApiModelProperty("加价比例") private BigDecimal markupRate; // 加价比例 } \ No newline at end of file