diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java index 6f438063..8195b50d 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeign.java @@ -22,14 +22,5 @@ import java.util.ArrayList; path = "reportinventory", fallback = ReportInventoryDayGatherFeignFallback.class) public interface ReportInventoryDayGatherFeign { - // -// @GetMapping("/getReportInventoryDayGathers") -// @ResponseBody -// public ResultBean getReportInventoryDayGathers(String orderDate); -// @GetMapping("/getReportInventoryDayStores") -// @ResponseBody -// public ResultBean getReportInventoryDayStores(String orderDate); -// @GetMapping("/getReportInventoryDayToStores") -// @ResponseBody -// public ResultBean getReportInventoryDayToStores(String orderDate); + } diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java index 4576357e..c12f9d24 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherFeignFallback.java @@ -16,18 +16,4 @@ import java.util.ArrayList; @Component public class ReportInventoryDayGatherFeignFallback implements ReportInventoryDayGatherFeign{ -// @Override -// public ResultBean getReportInventoryDayGathers(String orderDate) { -// return null; -// } -// -// @Override -// public ResultBean getReportInventoryDayStores(String orderDate) { -// return null; -// } -// -// @Override -// public ResultBean getReportInventoryDayToStores(String orderDate) { -// return null; -// } } diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java index be8ccf88..05520937 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java @@ -23,6 +23,8 @@ public class ReportInventoryDayStoreVo implements Vo { private String storeCode; private String storeCodeName; private Integer productCountNumber; + //商品品种数量 + private int typeNumber; private BigDecimal productAmount; private BigDecimal countAmount; private BigDecimal countProductNumber; diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreVo.java index 3c77957b..ba9a0607 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreVo.java +++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaytobaccostore/ReportInventoryDayTobaccoStoreVo.java @@ -29,8 +29,10 @@ public class ReportInventoryDayTobaccoStoreVo implements Vo { private String storeCode; //[门店编号]门店名称 private String storeCodeName; - //品种数量 + //商品数量 private Integer productCountNumber; + //商品品种数量 + private int typeNumber; //货值 private BigDecimal productAmount; //合计货值 diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java index d7d734c9..47859326 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java @@ -66,35 +66,7 @@ public class ReportInventoryRest implements ReportInventoryDayGatherFeign { } return rb.success().setData(pv); } -// // -// @GetMapping("/getReportInventoryDayGathers") -// public ResultBean getReportInventoryDayGathers(String orderDate){ -// ResultBean rb = ResultBean.fireFail(); -// ReportInventoryDayGatherVo pv = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate); -// if(null==pv){ -// return rb.success().setData(new ArrayList<>()); -// } -// pv.setDownloadUrl("http://8.130.39.13:7003/upload/kchzb/库存汇总表"+orderDate+".xlsx"); -// return rb.success().setData(pv); -// } -// @GetMapping("/getReportInventoryDayStores") -// public ResultBean getReportInventoryDayStores(String orderDate){ -// ResultBean rb = ResultBean.fireFail(); -// ReportInventoryDayStoreVo pv = reportInventoryDayStoreService.getReportInventoryDayStore(orderDate); -// if(null==pv){ -// return rb.success().setData(new ArrayList<>()); -// } -// return rb.success().setData(pv); -// } -// @GetMapping("/getReportInventoryDayToStores") -// public ResultBean getReportInventoryDayToStores(String orderDate){ -// ResultBean rb = ResultBean.fireFail(); -// ReportInventoryDayTobaccoStoreVo pv = reportInventoryDayTobaccoStoreService.getReportInventoryDayToStore(orderDate); -// if(null==pv){ -// return rb.success().setData(new ArrayList<>()); -// } -// return rb.success().setData(pv); -// } + //下载excel @GetMapping("/downloadExcel/{orderDate}") public ResultBean downloadExcel(@PathVariable("orderDate") String orderDate) { diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java index 6c59db41..65a1149d 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java @@ -35,7 +35,7 @@ public class ReportInventoryService { }); } public void sendMessage(String orderDate) throws Exception { - //wechatRest.inventorySendMessage(orderDate); + wechatRest.inventorySendMessage(orderDate); } public String buildsExcelById(String orderDate) { // long millis = System.currentTimeMillis(); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java index d68ed1fc..46260473 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java @@ -4,17 +4,11 @@ import com.alibaba.fastjson.JSONObject; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.report.aes.AesException; import com.yxt.supervise.report.aes.WXBizMsgCrypt; -import com.yxt.supervise.report.api.csmcashreport.CsmCashReport; import com.yxt.supervise.report.api.csmcashreport.CsmCashReportVo; import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; import com.yxt.supervise.report.api.wechat.Template; -import com.yxt.supervise.report.api.wechat.WeChatTemplateMsg; import com.yxt.supervise.report.biz.csmcashreport.CsmCashReportMapper; -import com.yxt.supervise.report.biz.csmcashreport.CsmCashReportService; -import com.yxt.supervise.report.biz.csmcashreportcashedtoday.CsmCashReportCashedTodayService; -import com.yxt.supervise.report.biz.csmcashreportsalesyesterday.CsmCashReportSalesYesterdayService; import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherMapper; -import com.yxt.supervise.report.biz.reportinventory.ReportInventoryService; import com.yxt.supervise.report.biz.util.WeixinCheckoutUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -153,8 +147,9 @@ public class WechatRest { String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken); List openIds=new ArrayList<>(); openIds.add("otnrM57kui-WCUmRtChhb1HguOgw"); - openIds.add("otnrM544hxIgkMOfaDU8VpJhj_6k"); - //openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk"); +// openIds.add("otnrM544hxIgkMOfaDU8VpJhj_6k"); +// openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk"); +// openIds.add("otnrM521f8KcCsRfL2Jj4Tk8np1g"); JSONObject jsonObject=new JSONObject(); for(String openId:openIds){ sendMag.put("character_string2", new Template(csmCashReportVo.getSerialNumber()));