|
|
@ -194,7 +194,7 @@ public class GdSalesReportdayService extends ServiceImpl<GdSalesReportdayMapper, |
|
|
|
* @param type 类型1.全部,2.常规商品3.烟草 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<Map<String, Object>> getSalesReport(String customerSid, String orderDate, String type) { |
|
|
|
public ResultBean<Map<String, Object>> getSalesReport1(String customerSid, String orderDate, String type) { |
|
|
|
if (StrUtil.isBlank(orderDate)) { |
|
|
|
orderDate = DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd"); |
|
|
|
} |
|
|
@ -237,6 +237,113 @@ public class GdSalesReportdayService extends ServiceImpl<GdSalesReportdayMapper, |
|
|
|
|
|
|
|
return rb.success().setData(map); |
|
|
|
} |
|
|
|
/** |
|
|
|
* 获取销售报表 |
|
|
|
* |
|
|
|
* @param customerSid 客户Sid |
|
|
|
* @param orderDate 查询日期 |
|
|
|
* @param type 类型1.全部,2.常规商品3.烟草 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<Map<String, Object>> getSalesReport(String customerSid, String orderDate, String type) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
Map<String, Object> map = JsonUtilJackson.str2map(testData_getSalesReport()); |
|
|
|
return rb.success().setData(map); |
|
|
|
} |
|
|
|
private String testData_getSalesReport() { |
|
|
|
return "{\n" + |
|
|
|
" \"financialAnalysisChartData\": [\n" + |
|
|
|
" [\n" + |
|
|
|
" \"日期\",\n" + |
|
|
|
" \"分销商进货额\",\n" + |
|
|
|
" \"实际发货额\"\n" + |
|
|
|
" ],\n" + |
|
|
|
" [\n" + |
|
|
|
" \"2023-06-02\",\n" + |
|
|
|
" \"291591.27\",\n" + |
|
|
|
" \"354555.73\"\n" + |
|
|
|
" ],\n" + |
|
|
|
" [\n" + |
|
|
|
" \"2023-06-03\",\n" + |
|
|
|
" \"21563.0\",\n" + |
|
|
|
" \"403784.09\"\n" + |
|
|
|
" ],\n" + |
|
|
|
" [\n" + |
|
|
|
" \"2023-06-04\",\n" + |
|
|
|
" \"0.0\",\n" + |
|
|
|
" \"367231.18\"\n" + |
|
|
|
" ],\n" + |
|
|
|
" [\n" + |
|
|
|
" \"2023-06-05\",\n" + |
|
|
|
" \"272098.85\",\n" + |
|
|
|
" \"337348.25\"\n" + |
|
|
|
" ],\n" + |
|
|
|
" [\n" + |
|
|
|
" \"2023-06-06\",\n" + |
|
|
|
" \"180591.9\",\n" + |
|
|
|
" \"370475.4\"\n" + |
|
|
|
" ],\n" + |
|
|
|
" [\n" + |
|
|
|
" \"2023-06-07\",\n" + |
|
|
|
" \"106404.0\",\n" + |
|
|
|
" \"375834.9\"\n" + |
|
|
|
" ],\n" + |
|
|
|
" [\n" + |
|
|
|
" \"2023-06-08\",\n" + |
|
|
|
" \"250534.28\",\n" + |
|
|
|
" \"371908.26\"\n" + |
|
|
|
" ]\n" + |
|
|
|
" ],\n" + |
|
|
|
" \"listSalesChannelData\": [\n" + |
|
|
|
" {\n" + |
|
|
|
" \"deductionAccountsReceivable\": \"8494.51\",\n" + |
|
|
|
" \"salesChannelCategory\": \"连网连锁店\",\n" + |
|
|
|
" \"totalAmount\": \"8494.51\",\n" + |
|
|
|
" \"accountsReceivable\": \"0\"\n" + |
|
|
|
" },\n" + |
|
|
|
" {\n" + |
|
|
|
" \"deductionAccountsReceivable\": \"363413.75\",\n" + |
|
|
|
" \"salesChannelCategory\": \"连锁内加盟\",\n" + |
|
|
|
" \"totalAmount\": \"363413.75\",\n" + |
|
|
|
" \"accountsReceivable\": \"0\"\n" + |
|
|
|
" },\n" + |
|
|
|
" {\n" + |
|
|
|
" \"deductionAccountsReceivable\": \"12170.4\",\n" + |
|
|
|
" \"salesChannelCategory\": \"配送中心\",\n" + |
|
|
|
" \"totalAmount\": \"12170.4\",\n" + |
|
|
|
" \"accountsReceivable\": \"0\"\n" + |
|
|
|
" },\n" + |
|
|
|
" {\n" + |
|
|
|
" \"deductionAccountsReceivable\": \"13536.08\",\n" + |
|
|
|
" \"salesChannelCategory\": \"连锁外加盟\",\n" + |
|
|
|
" \"totalAmount\": \"13536.08\",\n" + |
|
|
|
" \"accountsReceivable\": \"0\"\n" + |
|
|
|
" },\n" + |
|
|
|
" {\n" + |
|
|
|
" \"deductionAccountsReceivable\": \"240159.42\",\n" + |
|
|
|
" \"salesChannelCategory\": \"36524集团报烟门店仓\",\n" + |
|
|
|
" \"totalAmount\": \"240159.42\",\n" + |
|
|
|
" \"accountsReceivable\": \"0\"\n" + |
|
|
|
" },\n" + |
|
|
|
" {\n" + |
|
|
|
" \"deductionAccountsReceivable\": \"0.0\",\n" + |
|
|
|
" \"salesChannelCategory\": \"烟草连锁外加盟\",\n" + |
|
|
|
" \"totalAmount\": \"0.0\",\n" + |
|
|
|
" \"accountsReceivable\": \"0\"\n" + |
|
|
|
" }\n" + |
|
|
|
" ],\n" + |
|
|
|
" \"financialData\": [\n" + |
|
|
|
" {\n" + |
|
|
|
" \"totalPrice\": \"637774.16\",\n" + |
|
|
|
" \"name\": \"销售商品收到的现金(元)\"\n" + |
|
|
|
" },\n" + |
|
|
|
" {\n" + |
|
|
|
" \"totalPrice\": \"0\",\n" + |
|
|
|
" \"name\": \"收到其他与经营活动有关的现金(元)\"\n" + |
|
|
|
" }\n" + |
|
|
|
" ]\n" + |
|
|
|
"}"; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<Map<String, Object>> getGoodsOnWay(String date) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|