Browse Source

更改

master
ligaode 2 months ago
parent
commit
cd37b83046
  1. 12
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystem.java
  2. 12
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDetailsVo.java
  3. 16
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemDto.java
  4. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemVo.java
  5. 17
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java
  6. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java
  7. 21
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java
  8. 41
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java
  9. 44
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsDto.java
  10. 19
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smsgoods/SmsGoodsFeign.java
  11. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java
  12. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java
  13. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java
  14. 181
      yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsPricestrategyBillRest.java
  15. 34
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java
  16. 9
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java
  17. 18
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java
  18. 23
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBill.java
  19. 10
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDetailsVo.java
  20. 26
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillDto.java
  21. 19
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillQuery.java
  22. 70
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java
  23. 26
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillVo.java
  24. 23
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailDetailsVo.java
  25. 28
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.java
  26. 4
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java
  27. 24
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybillgoodstypedetail/SmsPricestrategyBillGoodstypedetailDetailsVo.java

12
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;
}

12
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;
}

16
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(采购系统管理) <br/>
* File: BasePurchaseSystemDto.java <br/>
@ -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;
}

2
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;
}

17
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(采购系统管理) <br/>
* File: BasePurchaseSystemMapper.java <br/>
* Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemMapper <br/>
* Description: 采购系统管理表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-06 09:27:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BasePurchaseSystemMapper extends BaseMapper<BasePurchaseSystem> {
//@Update("update base_purchase_system set name=#{msg} where id=#{id}")
//IPage<BasePurchaseSystemVo> voPage(IPage<BasePurchaseSystem> page, @Param(Constants.WRAPPER) QueryWrapper<BasePurchaseSystem> qw);
IPage<BasePurchaseSystemVo> selectPageVo(IPage<BasePurchaseSystem> page, @Param(Constants.WRAPPER) Wrapper<BasePurchaseSystem> qw);
List<BasePurchaseSystemVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BasePurchaseSystem> qw);

1
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 = "采购系统管理表")

21
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(采购系统管理) <br/>
* File: BasePurchaseSystemService.java <br/>
* Class: com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService <br/>
* Description: 采购系统管理表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-01-06 09:27:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BasePurchaseSystemService extends MybatisBaseService<BasePurchaseSystemMapper, BasePurchaseSystem> {
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
private QueryWrapper<BasePurchaseSystem> createQueryWrapper(BasePurchaseSystemQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BasePurchaseSystem> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BasePurchaseSystemVo> listPageVo(PagerQuery<BasePurchaseSystemQuery> pq) {
BasePurchaseSystemQuery query = pq.getParams();
QueryWrapper<BasePurchaseSystem> qw = new QueryWrapper<>();

41
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<AppFirstShelvesVo> list(PagerQuery<AppFirstShelvesQuery> 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<SmsPricestrategyBillGoodstypedetailDetailsVo> 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();
}

44
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
}

19
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<String> saveSmsGoods(@RequestBody SmsGoodsDto dto);
}

6
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;

6
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<SmsPricestrategyBillDetailDetailsVo> selByGoodsTypeSid(@RequestParam("goodsTypeSid") String goodsTypeSid);
}

8
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; // 加价比例
}

181
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(价格策略) <br/>
* File: SmsPricestrategyBillFeignFallback.java <br/>
* Class: com.yxt.sms.biz.smspricestrategybill.SmsPricestrategyBillRest <br/>
* Description: 价格策略申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:29:38 <br/>
*
* @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<PagerVo<SmsPricestrategyBillVo>> listPage(@RequestBody PagerQuery<SmsPricestrategyBillQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<SmsPricestrategyBillVo> 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<PagerVo<SmsPricestrategyBillVo>> listPage(@RequestBody PagerQuery<SmsPricestrategyBillQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<SmsPricestrategyBillVo> 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<SmsPricestrategyBillDetailsVo> 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<List<SmsPricestrategyBillNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) {
return smsPricestrategyBillService.getPreviousNodesForReject(query);
}
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
public ResultBean<List<SmsPricestrategyBillNodeVo>> 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<SmsPricestrategyBillDetailsVo> 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<List<SmsPricestrategyBillNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query) {
return smsPricestrategyBillService.getPreviousNodesForReject(query);
}
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
public ResultBean<List<SmsPricestrategyBillNodeVo>> 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<SmsPricestrategyBillDetailDetailsVo> selByGoodsTypeSid(@RequestParam("goodsTypeSid") String goodsTypeSid){
return smsPricestrategyBillService.selByGoodsTypeSid(goodsTypeSid);
}
}

34
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(价格策略) <br/>
* File: SmsPricestrategy.java <br/>
* Class: com.yxt.sms.api.smspricestrategy.SmsPricestrategy <br/>
* Description: 价格策略. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @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; // 供应商名称

9
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<SmsGoods> {
@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<SmsGoods> selByGoodsTypeSid(String goodsTypeSid);
@Update("update sms_goods set price = #{price} where sid = #{sid}")
void updateSalesPrice(@Param("sid") String sid,@Param("price") String price);
}

18
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<SmsGoodsMapper, SmsGoods> {
public SmsGoods fetchEntityByGoodsID(String goodsID) {
return baseMapper.fetchEntityByGoodsID(goodsID);
}
@ -41,16 +43,24 @@ public class SmsGoodsService extends MybatisBaseService<SmsGoodsMapper, SmsGoods
public String saveSmsGoods(SmsGoodsDto dto) {
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
sid = dto.getSid();
SmsGoods smsGoods = fetchBySid(sid);
BeanUtil.copyProperties(dto,smsGoods,"id","sid");
BeanUtil.copyProperties(dto, smsGoods, "id", "sid");
baseMapper.updateById(smsGoods);
} else {
SmsGoods smsGoods = new SmsGoods();
sid = smsGoods.getSid();
BeanUtil.copyProperties(dto,smsGoods,"id","sid");
BeanUtil.copyProperties(dto, smsGoods, "id", "sid");
baseMapper.insert(smsGoods);
}
return sid;
}
public List<SmsGoods> selByGoodsTypeSid(String goodsTypeSid) {
return baseMapper.selByGoodsTypeSid(goodsTypeSid);
}
public void updateSalesPrice(String sid, String price) {
baseMapper.updateSalesPrice(sid, price);
}
}

23
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(价格策略) <br/>
* File: SmsPricestrategyBill.java <br/>
* Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBill <br/>
* Description: 价格策略申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @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; // 组织名称
}

10
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<SmsPricestrategyBillDetailDetailsVo> smsPricestrategyBillDetailList;

26
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(价格策略) <br/>
* File: SmsPricestrategyBillDto.java <br/>
* Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillDto <br/>
* Description: 价格策略申请 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @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<SmsPricestrategyBillDetailDto> smsPricestrategyBillDetailList;

19
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(价格策略) <br/>
* File: SmsPricestrategyBillQuery.java <br/>
* Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillQuery <br/>
* Description: 价格策略申请 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @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("申请部门名称")

70
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(价格策略) <br/>
* File: SmsPricestrategyBillService.java <br/>
* Class: com.yxt.sms.biz.smspricestrategybill.SmsPricestrategyBillService <br/>
* Description: 价格策略申请 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestrategyBillMapper, SmsPricestrategyBill> {
@ -112,13 +95,7 @@ public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestra
@Autowired
private SysUserRoleFeign sysUserRoleFeign;
@Autowired
private BaseGoodsSkuFeign baseGoodsSkuFeign;
@Resource
private WmsInventoryFeign wmsInventoryFeign;
@Autowired
private WmsInventoryRecordFeign wmsInventoryRecordFeign;
@Autowired
private BaseGoodsSkuExtendFeign baseGoodsSkuExtendFeign;
private SmsGoodsService smsGoodsService;
public PagerVo<SmsPricestrategyBillVo> listPageVo(PagerQuery<SmsPricestrategyBillQuery> pq) {
SmsPricestrategyBillQuery query = pq.getParams();
@ -456,28 +433,14 @@ public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestra
List<SmsPricestrategyBillDetailDetailsVo> smsPricestrategyBillDetailDetailsVos = smsPricestrategyBillDetailService.selByMainSid(businessSid);
for (SmsPricestrategyBillDetailDetailsVo smsPricestrategyBillDetailDetailsVo : smsPricestrategyBillDetailDetailsVos) {
List<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailDetailsVos = smsPricestrategyBillGoodstypedetailService.selByMainSid(smsPricestrategyBillDetailDetailsVo.getSid());
List<String> 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> 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<SmsPricestra
flowFeign.delegate(delegateQuery);
return rb.success();
}
public ResultBean<SmsPricestrategyBillDetailDetailsVo> selByGoodsTypeSid(String goodsTypeSid) {
ResultBean rb = ResultBean.fireFail();
SmsPricestrategyBillDetailDetailsVo smsPricestrategyBillDetailDetailsVo = smsPricestrategyBillDetailService.selByGoodsTypeSid(goodsTypeSid);
if (smsPricestrategyBillDetailDetailsVo == null){
return rb.success().setData(null);
}
List<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailDetailsVos = smsPricestrategyBillGoodstypedetailService.selByMainSid(smsPricestrategyBillDetailDetailsVo.getSid());
smsPricestrategyBillDetailDetailsVo.setSmsPricestrategyBillGoodstypedetailList(smsPricestrategyBillGoodstypedetailDetailsVos);
return rb.success().setData(smsPricestrategyBillDetailDetailsVo);
}
}

26
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(价格策略) <br/>
* File: SmsPricestrategyBillVo.java <br/>
* Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillVo <br/>
* Description: 价格策略申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @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;

23
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(价格策略) <br/>
* File: SmsPricestrategyBillDetailVo.java <br/>
* Class: com.yxt.sms.api.smspricestrategybilldetail.SmsPricestrategyBillDetailVo <br/>
* Description: 价格策略申请明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @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;

28
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(价格策略) <br/>
* File: SmsPricestrategyBillDetailMapper.java <br/>
* Class: com.yxt.sms.biz.smspricestrategybilldetail.SmsPricestrategyBillDetailMapper <br/>
* Description: 价格策略申请明细. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SmsPricestrategyBillDetailMapper extends BaseMapper<SmsPricestrategyBillDetail> {
@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<SmsPricestrategyBillDetailDetailsVo> selByMainSid(String mainSid);
@Select("select * from sms_pricestrategy_bill_detail where mainSid = #{mainSid}")
List<SmsPricestrategyBillDetailDetailsVo> 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);
}

4
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailService.java

@ -97,4 +97,8 @@ public class SmsPricestrategyBillDetailService extends MybatisBaseService<SmsPri
String sid = baseMapper.selSid(goodsTypeSid,deptSid);
return rb.success().setData(sid);
}
public SmsPricestrategyBillDetailDetailsVo selByGoodsTypeSid(String goodsTypeSid) {
return baseMapper.selByGoodsTypeSid(goodsTypeSid);
}
}

24
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybillgoodstypedetail/SmsPricestrategyBillGoodstypedetailDetailsVo.java

@ -25,41 +25,25 @@
*********************************************************/
package com.yxt.sms.biz.smspricestrategybillgoodstypedetail;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-sms(价格策略) <br/>
* File: SmsPricestrategyBillGoodstypedetailVo.java <br/>
* Class: com.yxt.sms.api.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailVo <br/>
* Description: 价格策略商品类别明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-28 14:32:24 <br/>
*
* @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; // 加价比例
}
Loading…
Cancel
Save