From e9431a4c7e11b3feb04123e648a95fe369d38439 Mon Sep 17 00:00:00 2001 From: lzh Date: Tue, 17 Jan 2023 17:31:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=BF=83-=E9=94=80?= =?UTF-8?q?=E5=94=AE=E6=8A=A5=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gdinstorage/GdInstorageCountMapper.java | 1 + .../gdinstorage/GdInstorageCountService.java | 2 + .../biz/gdinstorage/GdInstorageMapper.java | 4 + .../biz/gdinstorage/GdInstorageService.java | 10 +++ .../portal/biz/gdsales/GdSalesMapper.java | 5 +- .../biz/gdsales/GdSalesReportdayService.java | 88 ++++++++++++++++++- .../portal/biz/gdsales/GdSalesService.java | 3 + .../portal/biz/gdsales/ReportCenterRest.java | 65 ++++++++++++++ 8 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/ReportCenterRest.java diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java index 62fc0192..c3f44bd5 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.java @@ -117,4 +117,5 @@ public interface GdInstorageCountMapper extends BaseMapper { " GROUP BY prs.storeCode,prt.code) t" + " GROUP BY t.storeCode; ") List> ycspdhmxb(); + } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java index 1ea7e2ba..34eacd55 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountService.java @@ -328,3 +328,5 @@ public class GdInstorageCountService extends ServiceImpl @@ -48,4 +49,7 @@ public interface GdInstorageMapper extends BaseMapper { @Delete("delete from gd_instorage where orderDate=#{orderDate} ") void clearByOrderDate(@Param("orderDate") String orderDate); + + @Select("select sum(colq16) as amount from gd_instorage where orderDate=#{orderDate}") + double amountOfDay(@Param("orderDate") String orderDate); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java index 85c1fdf3..e97c7dd9 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java @@ -320,4 +320,14 @@ public class GdInstorageService extends ServiceImpl { @Select("select CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount from ( " + " select gs.saleNum,gs.salePrice from gd_sales gs left join store_index si on gs.storeCode=si.code " + " where gs.dataDate=#{dataDate} and si.`type` ='连锁内加盟' ) t ") - double amountOfLsnjmOnDay(String orderDate); + double amountOfLsnjmOnDay(@Param("dataDate") String orderDate); + + @Select("select CONVERT(IFNULL(sum(saleNum*salePrice),0),DECIMAL(12,2)) as amount from gd_sales gs where gs.dataDate=#{dataDate} ") + double amountOfDay(@Param("dataDate") String orderDate); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesReportdayService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesReportdayService.java index 414c4bad..c445252d 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesReportdayService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesReportdayService.java @@ -1,12 +1,16 @@ package com.yxt.supervise.portal.biz.gdsales; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageCountService; import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageJmdService; +import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageService; import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageYcService; import com.yxt.supervise.portal.biz.gdinventory.GdInventoryOkService; import com.yxt.supervise.portal.biz.gdinventory.GdInventoryYcService; @@ -14,8 +18,7 @@ import com.yxt.supervise.portal.biz.gdwholesale.GdWholesaleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; @Service public class GdSalesReportdayService extends ServiceImpl { @@ -38,6 +41,8 @@ public class GdSalesReportdayService extends ServiceImpl> getSalesReport(String customerSid, String orderDate, String type) { + ResultBean rb = ResultBean.fireFail(); + Map map = new HashMap<>(); + double xsLwlsd = gdSalesService.amountOfLwlsdDay(orderDate); // 连网连锁店 + double xsLsnjm = gdSalesService.amountOfLsnjmDay(orderDate); // 连锁内加盟 + double xsPszx = gdWholesaleService.amountOfDay(orderDate); // 配送中心 + double xsLswjm = gdInstorageJmdService.amountOfDay(orderDate); // 连锁外加盟 + double xsYc = gdSalesYcService.amountOfDay(orderDate); // 36524集团报烟门店仓 + double xsYcJmd = gdInstorageYcService.amountOfDayJmd(orderDate); // 烟草连锁外加盟（销配结算） + double cgsp = xsLwlsd + xsLsnjm + xsPszx + xsLswjm;//常规商品 + double yc = xsYc + xsYcJmd; //烟草 + double all = cgsp + yc; //全部 + + List> financialDataList = new ArrayList<>(); // 现金流量 + financialDataList.add(MapUtil.builder(new HashMap()) + .put("name", "销售商品收到的现金(元)") + .put("totalPrice", "" + all).build()); + financialDataList.add(MapUtil.builder(new HashMap()) + .put("name", "收到其他与经营活动有关的现金(元)") + .put("totalPrice", "0").build()); + map.put("financialData", financialDataList); + + List> listSalesChannelData = new ArrayList<>(); + listSalesChannelData.add(MapUtil.builder(new HashMap()) + .put("salesChannelCategory", "连网连锁店") + .put("totalAmount", "" + xsLwlsd) + .put("accountsReceivable", "0") + .put("deductionAccountsReceivable", "" + xsLwlsd).build()); + listSalesChannelData.add(MapUtil.builder(new HashMap()) + .put("salesChannelCategory", "连锁内加盟") + .put("totalAmount", "" + xsLsnjm) + .put("accountsReceivable", "0") + .put("deductionAccountsReceivable", "" + xsLsnjm).build()); + listSalesChannelData.add(MapUtil.builder(new HashMap()) + .put("salesChannelCategory", "配送中心") + .put("totalAmount", "" + xsPszx) + .put("accountsReceivable", "0") + .put("deductionAccountsReceivable", "" + xsPszx).build()); + listSalesChannelData.add(MapUtil.builder(new HashMap()) + .put("salesChannelCategory", "连锁外加盟") + .put("totalAmount", "" + xsLswjm) + .put("accountsReceivable", "0") + .put("deductionAccountsReceivable", "" + xsLswjm).build()); + listSalesChannelData.add(MapUtil.builder(new HashMap()) + .put("salesChannelCategory", "36524集团报烟门店仓") + .put("totalAmount", "" + xsYc) + .put("accountsReceivable", "0") + .put("deductionAccountsReceivable", "" + xsYc).build()); + listSalesChannelData.add(MapUtil.builder(new HashMap()) + .put("salesChannelCategory", "烟草连锁外加盟") + .put("totalAmount", "" + xsYcJmd) + .put("accountsReceivable", "0") + .put("deductionAccountsReceivable", "" + xsYcJmd).build()); + map.put("listSalesChannelData", listSalesChannelData); + + List> financialAnalysisChartData = new ArrayList<>(); + financialAnalysisChartData.add(CollUtil.newArrayList("日期", "分销商进货额", "实际发货额")); + for (int i = 7; i > 0; i--) { + String dateago = dayAgo(orderDate, -(i - 1)); + System.out.println("xx " + dateago); + double rkje = gdInstorageService.amountOfDay(dateago); //入库金额 + double xsje = xsLwlsd + xsLsnjm; + financialAnalysisChartData.add(CollUtil.newArrayList(dateago, "" + rkje, "" + xsje)); + } + map.put("financialAnalysisChartData", financialAnalysisChartData); + + return rb.success().setData(map); + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java index 52dcc8ad..a44336ed 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/GdSalesService.java @@ -449,4 +449,7 @@ public class GdSalesService extends ServiceImpl { public double amountOfLsnjmDay(String orderDate) { return baseMapper.amountOfLsnjmOnDay(orderDate); } + public double amountOfDay(String orderDate) { + return baseMapper.amountOfDay(orderDate); + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/ReportCenterRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/ReportCenterRest.java new file mode 100644 index 00000000..eabe7093 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdsales/ReportCenterRest.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.gdsales; + +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.repository.query.Param; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * Project: yxt_supervise
+ * File: ReportCenterRest.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.ReportCenterRest
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/17 14:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@RestController("com.yxt.supervise.portal.biz.gdsales.ReportCenterRest") +@RequestMapping("/reportCenter") +public class ReportCenterRest { + + @Autowired + private GdSalesReportdayService gdSalesReportdayService; + + @GetMapping("/getSalesReport") + public ResultBean> getSalesReport(@Param("customerSid") String customerSid, + @Param("date") String date, + @Param("type") String type) { + System.out.println("@@@@@: " + date); + return gdSalesReportdayService.getSalesReport(customerSid, date, type); + } +}