no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitSalesItemBean.java

@@ -99,12 +99,21 @@ public class WebsitSalesItemBean {
     @ApiModelProperty(value = "是否入师傅库存 NO=否 YES=是")
     private String manageWorkerStock;
 
+    @ApiModelProperty(value = "转换师傅单价")
+    private BigDecimal convertPrice;
+
     @ApiModelProperty(value = "转换师傅入库数量")
     private BigDecimal convertQty;
 
     @ApiModelProperty(value = "转换师傅退货数量")
     private BigDecimal convertRetQty;
 
+    @ApiModelProperty(value = "师傅商品id")
+    private String workerGoodsId;
+
+    @ApiModelProperty(value = "师傅商品名称")
+    private String workerGoodsName;
+
     @ApiModelProperty(value = "库存数量（保存状态时显示）")
     private BigDecimal stockQty;
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitSalesLogic.java

@@ -867,7 +867,25 @@ public class WebsitSalesLogic {
                         salesItemBean.setGoodsCategoryName(Objects.nonNull(category) ? category.getCategoryName() : null);
                         salesItemBean.setPayType(salesBean.getPayType());
                         salesItemBean.setManageWorkerStock(bean.getGoods().getManageWorkerStock());
-                        salesItemBean.setConvertQty(bean.getQty());
+
+                        BigDecimal convertQty = salesItemBean.getSalesQty().divide(bean.getGoods().getGoodsSalesConvertQty(), 1, BigDecimal.ROUND_UP);
+                        BigDecimal totalSaleValue = salesItemBean.getSalesQty().multiply(salesItemBean.getPrice());
+                        BigDecimal convertPrice = totalSaleValue.divide(convertQty, 2, BigDecimal.ROUND_DOWN);
+
+                        if (StringUtils.isBlank(salesItemBean.getManageWorkerStock())
+                                || salesItemBean.getManageWorkerStock().equals(IsYesNoEnum.YES.getKey())) {
+                            final WorkerGoodsRela goodsRela = workerGoodsRelaService.lambdaQuery()
+                                    .eq(WorkerGoodsRela::getCompanyWechatId, bean.getGoods().getCompanyWechatId())
+                                    .eq(WorkerGoodsRela::getWebsitGoodsId, bean.getGoods().getGoodsId())
+                                    .one();
+                            if (Objects.nonNull(goodsRela)) {
+                                salesItemBean.setWorkerGoodsId(goodsRela.getWorkerGoodsId());
+                                salesItemBean.setWorkerGoodsName(goodsRela.getWorkerGoodsName());
+                            }
+                        }
+
+                        salesItemBean.setConvertQty(convertQty);
+                        salesItemBean.setConvertPrice(convertPrice);
                         salesItemBean.setItemSourceType(ItemSourceTypeEnum.BASE.getKey());
                         salesItemBean.setItemSourceId(bean.getGoods().getGoodsId());
                         salesItemBean.setNormType(bean.getGoods().getNormType());