毛利

xingyun-chart/src/main/java/com/lframework/xingyun/chart/bo/OrderChartGrossProfitBo.java

@@ -0,0 +1,22 @@
+package com.lframework.xingyun.chart.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class OrderChartGrossProfitBo {
+    @ApiModelProperty("今日销售")
+    private float sale;
+    @ApiModelProperty("今日销售数量")
+    private Integer   saleNum;
+    @ApiModelProperty("今日零售")
+    private float retail;
+    @ApiModelProperty("今日零售数量")
+    private Integer retailNum;
+    @ApiModelProperty("今日采购")
+    private float procure;
+    @ApiModelProperty("今日采购数量")
+    private Integer procureNum;
+    @ApiModelProperty("今日毛利")
+    private float grossProfit;
+}

xingyun-chart/src/main/java/com/lframework/xingyun/chart/controller/ChartController.java

@@ -6,10 +6,7 @@ import com.lframework.starter.web.bo.BaseBo;
 import com.lframework.starter.web.controller.DefaultBaseController;
 import com.lframework.starter.web.resp.InvokeResult;
 import com.lframework.starter.web.resp.InvokeResultBuilder;
-import com.lframework.xingyun.chart.bo.OrderChartSameMonthBo;
-import com.lframework.xingyun.chart.bo.OrderChartSameMonthSumBo;
-import com.lframework.xingyun.chart.bo.OrderChartTodayBo;
-import com.lframework.xingyun.chart.bo.OrderChartTodaySumBo;
+import com.lframework.xingyun.chart.bo.*;
 import com.lframework.xingyun.chart.dto.OrderChartAmountDto;
 import com.lframework.xingyun.chart.dto.OrderChartSameMonthDto;
 import com.lframework.xingyun.chart.dto.OrderChartTodayDto;
@@ -81,6 +78,14 @@ public class ChartController extends DefaultBaseController {
     return InvokeResultBuilder.success(result);
   }
 
+  @ApiOperation("首页毛利")
+  @GetMapping("/queryGrossProfit")
+  public InvokeResult<OrderChartGrossProfitBo> queryGrossProfit() {
+    var result =orderChartService.queryGrossProfit();
+    return InvokeResultBuilder.success(result);
+  }
+
+
 
 
   @ApiOperation("单独订单报表")

xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartAmountDto.java

@@ -1,18 +1,27 @@
 package com.lframework.xingyun.chart.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class OrderChartAmountDto {
-
+    @ApiModelProperty("昨日销售")
     private  String saleDay;
+    @ApiModelProperty("当月销售")
     private  String saleMonth;
+    @ApiModelProperty("本年销售")
     private  String saleYear;
+    @ApiModelProperty("昨日零售")
     private  String retailDay;
+    @ApiModelProperty("当月零售")
     private  String retailMonth;
+    @ApiModelProperty("本年零售")
     private  String retailYear;
+    @ApiModelProperty("昨日采购")
     private  String procureDay;
+    @ApiModelProperty("当月采购")
     private  String procureMonth;
+    @ApiModelProperty("本年采购")
     private  String procureYear;
 
 }

xingyun-chart/src/main/java/com/lframework/xingyun/chart/dto/OrderChartGrossProfitDto.java

@@ -0,0 +1,20 @@
+package com.lframework.xingyun.chart.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class OrderChartGrossProfitDto {
+    @ApiModelProperty("今日销售")
+    private float sale;
+    @ApiModelProperty("今日销售数量")
+    private Integer   saleNum;
+    @ApiModelProperty("今日零售")
+    private float retail;
+    @ApiModelProperty("今日零售数量")
+    private Integer retailNum;
+    @ApiModelProperty("今日采购")
+    private float procure;
+    @ApiModelProperty("今日采购数量")
+    private Integer procureNum;
+}

xingyun-chart/src/main/java/com/lframework/xingyun/chart/impl/OrderChartServiceImpl.java

@@ -5,6 +5,7 @@ import com.lframework.starter.common.utils.DateUtil;
 import com.lframework.starter.web.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.utils.EnumUtil;
 import com.lframework.starter.web.utils.IdUtil;
+import com.lframework.xingyun.chart.bo.OrderChartGrossProfitBo;
 import com.lframework.xingyun.chart.dto.OrderChartAmountDto;
 import com.lframework.xingyun.chart.dto.OrderChartSameMonthDto;
 import com.lframework.xingyun.chart.dto.OrderChartSumDto;
@@ -127,6 +128,24 @@ public class OrderChartServiceImpl extends BaseMpServiceImpl<OrderChartMapper, O
   }
 
   @Override
+  public OrderChartGrossProfitBo queryGrossProfit()
+  {
+    var GrossProfitDto= getBaseMapper().queryGrossProfit();
+    OrderChartGrossProfitBo  results =new OrderChartGrossProfitBo();
+    if (GrossProfitDto!=null)
+    {
+      results.setSale(GrossProfitDto.getSale());
+      results.setSaleNum(GrossProfitDto.getSaleNum());
+      results.setRetail(GrossProfitDto.getRetail());
+      results.setRetailNum(GrossProfitDto.getRetailNum());
+      results.setProcure(GrossProfitDto.getProcure());
+      results.setProcureNum(GrossProfitDto.getProcureNum());
+      float Amount=GrossProfitDto.getSaleNum()+GrossProfitDto.getRetailNum()-GrossProfitDto.getProcure();
+      results.setGrossProfit(Amount);
+    }
+    return  results;
+  }
+  @Override
   public List<OrderChartSameMonthDto> querySameMonthChart(QueryOrderChartVo vo) {
 
     LocalDate startDate = LocalDate.now().withDayOfMonth(1);

xingyun-chart/src/main/java/com/lframework/xingyun/chart/mappers/OrderChartMapper.java

@@ -1,10 +1,10 @@
 package com.lframework.xingyun.chart.mappers;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.lframework.starter.web.mapper.BaseMapper;
-import com.lframework.xingyun.chart.dto.OrderChartAmountDto;
-import com.lframework.xingyun.chart.dto.OrderChartSameMonthDto;
-import com.lframework.xingyun.chart.dto.OrderChartSumDto;
-import com.lframework.xingyun.chart.dto.OrderChartTodayDto;
+import com.lframework.xingyun.chart.bo.OrderChartGrossProfitBo;
+import com.lframework.xingyun.chart.dto.*;
 import com.lframework.xingyun.chart.entity.OrderChart;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -46,6 +46,13 @@ public interface OrderChartMapper extends BaseMapper<OrderChart> {
 
   OrderChartAmountDto queryAmount();
 
+
+  /**
+   * 查询当日毛利
+   */
+  @InterceptorIgnore(tenantLine=("true") )
+  OrderChartGrossProfitDto queryGrossProfit();
+
   /**
    * 查询当日数据列表
    *

xingyun-chart/src/main/java/com/lframework/xingyun/chart/service/OrderChartService.java

@@ -1,6 +1,7 @@
 package com.lframework.xingyun.chart.service;
 
 import com.lframework.starter.web.service.BaseMpService;
+import com.lframework.xingyun.chart.bo.OrderChartGrossProfitBo;
 import com.lframework.xingyun.chart.dto.OrderChartAmountDto;
 import com.lframework.xingyun.chart.dto.OrderChartSameMonthDto;
 import com.lframework.xingyun.chart.dto.OrderChartSumDto;
@@ -60,4 +61,6 @@ public interface OrderChartService extends BaseMpService<OrderChart> {
    */
 
   OrderChartAmountDto queryAmount();
+
+  OrderChartGrossProfitBo queryGrossProfit();
 }

xingyun-chart/src/main/resources/mappers/OrderChartMapper.xml

@@ -28,10 +28,30 @@
         <result column="retailYear" property="retailYear"/>
         <result column="procureDay" property="procureDay"/>
         <result column="procureMonth" property="procureMonth"/>
-        <result column="procurelYear" property="procurelYear"/>
+        <result column="procureYear" property="procureYear"/>
+    </resultMap>
+
+    <resultMap id="OrderChartGrossProfitDto" type="com.lframework.xingyun.chart.dto.OrderChartGrossProfitDto">
+        <result column="sale" property="sale"/>
+        <result column="saleNum" property="saleNum"/>
+        <result column="retail" property="retail"/>
+        <result column="retailNum" property="retailNum"/>
+        <result column="procure" property="procure"/>
+        <result column="procureNum" property="procureNum"/>
     </resultMap>
 
 
+    <select id="queryGrossProfit" resultMap="OrderChartGrossProfitDto">
+        select  IFNULL(SUM(case when c.biz_type=2   then c.total_amount else 0 end ), 0) AS sale ,
+        COUNT(c.biz_type=2 or null) saleNum,
+        IFNULL(SUM(case when c.biz_type=4   then c.total_amount else 0 end ), 0) AS retail ,
+        COUNT(c.biz_type=4 or null) retailNum,
+        IFNULL(SUM(case when c.biz_type=0   then c.total_amount else 0 end ), 0) AS procure,
+        COUNT(c.biz_type=0 or null) procureNum
+        from
+        tbl_order_chart  c
+        where DATE_FORMAT(create_date, '%Y-%m-%d') =DATE_FORMAT(CURRENT_DATE, '%Y-%m-%d')
+    </select>
 
     <select id="queryAmount" resultMap="OrderChartAmountDto">
         select