From 57225f21b498bcef1baa714c7963ea0a35515984 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 11 May 2024 14:33:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=B2=9C=E4=B8=B0=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E4=BF=9D=E7=95=992=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dto/decoration/BudgetDTO.java | 81 +++++++- .../store/dto/decoration/BudgetDetailDTO.java | 184 +++++++++++++++++- .../service/impl/DecorationServiceImpl.java | 5 +- .../controller/webb/PCTestController.java | 5 + 4 files changed, 260 insertions(+), 15 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDTO.java index 7a0ccd93c..763b468b3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDTO.java @@ -3,6 +3,7 @@ package com.cool.store.dto.decoration; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -10,7 +11,7 @@ import java.util.List; * @Date 2024/4/28 15:17 * @Version 1.0 */ -@Data + public class BudgetDTO { @ApiModelProperty("预算主键") private Long id; @@ -19,15 +20,87 @@ public class BudgetDTO { @ApiModelProperty("计价类型") private String type; @ApiModelProperty("合计") - private String vzHj; + private BigDecimal vzHj; @ApiModelProperty("取费合计") - private String totalAmount; + private BigDecimal totalAmount; @ApiModelProperty("成本合计") - private String totalCost; + private BigDecimal totalCost; @ApiModelProperty("创建时间") private String createDate; @ApiModelProperty("创建人") private String createBy; @ApiModelProperty("预算详情") private List details; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public BigDecimal getVzHj() { + return vzHj; + } + + public void setVzHj(BigDecimal vzHj) { + this.vzHj = vzHj.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getTotalAmount() { + return totalAmount; + } + + public void setTotalAmount(BigDecimal totalAmount) { + this.totalAmount = totalAmount.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getTotalCost() { + return totalCost; + } + + public void setTotalCost(BigDecimal totalCost) { + this.totalCost = totalCost.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public List getDetails() { + return details; + } + + public void setDetails(List details) { + this.details = details; + } } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDetailDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDetailDTO.java index cecc30eeb..52a103a91 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDetailDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/BudgetDetailDTO.java @@ -25,19 +25,19 @@ public class BudgetDetailDTO { @ApiModelProperty("预算工程量") private String amount; @ApiModelProperty("单价") - private String unitPrice; + private BigDecimal unitPrice; @ApiModelProperty("预算合计") - private String totalPrice; + private BigDecimal totalPrice; @ApiModelProperty("人工单价") - private String labour; + private BigDecimal labour; @ApiModelProperty("材料单价") - private String material; + private BigDecimal material; @ApiModelProperty("主材成本") - private String mainMaterialCostPrice; + private BigDecimal mainMaterialCostPrice; @ApiModelProperty("辅材成本") - private String auxiliaryMaterialCostPrice; + private BigDecimal auxiliaryMaterialCostPrice; @ApiModelProperty("人工成本") - private String labourCostPrice; + private BigDecimal labourCostPrice; @ApiModelProperty("结算工程量") private String remark; @ApiModelProperty("结算合计") @@ -49,9 +49,177 @@ public class BudgetDetailDTO { @ApiModelProperty("损耗单价") private BigDecimal lossPrice; @ApiModelProperty("计划利润") - private String planProfit; + private BigDecimal planProfit; @ApiModelProperty("利润率") private BigDecimal profitRate; @ApiModelProperty("唯一供应商") private String supplierName; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getNodeType() { + return nodeType; + } + + public void setNodeType(String nodeType) { + this.nodeType = nodeType; + } + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUnitName() { + return unitName; + } + + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + public String getAmount() { + return amount; + } + + public void setAmount(String amount) { + this.amount = amount; + } + + public BigDecimal getUnitPrice() { + return unitPrice; + } + + public void setUnitPrice(BigDecimal unitPrice) { + this.unitPrice = unitPrice.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getLabour() { + return labour; + } + + public void setLabour(BigDecimal labour) { + this.labour = labour.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getMaterial() { + return material; + } + + public void setMaterial(BigDecimal material) { + this.material = material.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getMainMaterialCostPrice() { + return mainMaterialCostPrice; + } + + public void setMainMaterialCostPrice(BigDecimal mainMaterialCostPrice) { + this.mainMaterialCostPrice = mainMaterialCostPrice.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getAuxiliaryMaterialCostPrice() { + return auxiliaryMaterialCostPrice; + } + + public void setAuxiliaryMaterialCostPrice(BigDecimal auxiliaryMaterialCostPrice) { + this.auxiliaryMaterialCostPrice = auxiliaryMaterialCostPrice.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getLabourCostPrice() { + return labourCostPrice; + } + + public void setLabourCostPrice(BigDecimal labourCostPrice) { + this.labourCostPrice = labourCostPrice.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public BigDecimal getLoss() { + return loss; + } + + public void setLoss(BigDecimal loss) { + this.loss = loss.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getTotalCost() { + return totalCost; + } + + public void setTotalCost(BigDecimal totalCost) { + this.totalCost = totalCost.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getCost() { + return cost; + } + + public void setCost(BigDecimal cost) { + this.cost = cost.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getLossPrice() { + return lossPrice; + } + + public void setLossPrice(BigDecimal lossPrice) { + this.lossPrice = lossPrice.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getPlanProfit() { + return planProfit; + } + + public void setPlanProfit(BigDecimal planProfit) { + this.planProfit = planProfit.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public BigDecimal getProfitRate() { + return profitRate; + } + + public void setProfitRate(BigDecimal profitRate) { + this.profitRate = profitRate.setScale(2, BigDecimal.ROUND_HALF_UP); + } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index f1d276ead..3c2056ca3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -176,14 +176,13 @@ public class DecorationServiceImpl implements DecorationService { //预算 BudgetDTO proposedBookBudget = getBudgetDTOS(decoration); if (proposedBookBudget == null) return null; - String vzHj = proposedBookBudget.getVzHj(); + BigDecimal vzHj = proposedBookBudget.getVzHj(); //支付二维码url Long regionId = shopInfoDAO.getRegionIdByid(shopId); String payPic = regionQrcodeConfigDao.getPayPicByRegionId(regionId); DecorationModelDTO decorationModelDTO = new DecorationModelDTO(); decorationModelDTO.setPayUrl(payPic); - BigDecimal totalAmount = new BigDecimal(vzHj); - decorationModelDTO.setTotalAmount(totalAmount.setScale(2, RoundingMode.HALF_UP)); + decorationModelDTO.setTotalAmount(vzHj); return decorationModelDTO; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index 7436fa490..d2b0c8c7e 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -5,6 +5,7 @@ import com.cool.store.dao.*; import com.cool.store.entity.*; import com.cool.store.enums.MessageEnum; import com.cool.store.enums.SMSMsgEnum; +import com.cool.store.mq.util.HttpRestTemplateService; import com.cool.store.response.ResponseResult; import com.cool.store.service.ShopService; import com.cool.store.service.impl.CommonService; @@ -29,7 +30,10 @@ public class PCTestController { private ShopService shopService; @Resource private LineInterviewDAO lineInterviewDAO; + static String url = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails&projectid="; + @Resource + private HttpRestTemplateService httpRestTemplateService; @GetMapping("/sendMessage") public ResponseResult sendMessage(@RequestParam("lineId")Long lineId, @RequestParam("pointId")Long pointId, @RequestParam MessageEnum messageEnum){ @@ -71,4 +75,5 @@ public class PCTestController { shopService.initShop(lineInfo); return ResponseResult.success(Boolean.FALSE); } + }