回款微信推送,跳转小程序回款详情

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreport/CsmCashReportQuery.java

@@ -1,11 +1,14 @@
 package com.yxt.supervise.report.api.csmcashreport;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * @author wangpengfei
  * @date 2023/6/21 9:19
  */
+@Data
 public class CsmCashReportQuery {
     //'日期(yyyy-MM-dd)',
     private String dataDate;

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreport/CsmCashReportVo.java

@@ -1,11 +1,14 @@
 package com.yxt.supervise.report.api.csmcashreport;
 
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * @author wangpengfei
  * @date 2023/6/21 9:19
  */
+@Data
 public class CsmCashReportVo {
     private String id;
     private String sid;
@@ -16,9 +19,9 @@ public class CsmCashReportVo {
     // '银行名称',
     private String bankName;
     // '公司Sid',
-    private String companySid;
+    private String CompanySid;
     // '公司名称',
-    private String companyName;
+    private String CompanyName;
     //昨日销售总计金额(元)',
     private double salesAmountYesterday;
     // '今日应回款金额(元)',
@@ -45,4 +48,18 @@ public class CsmCashReportVo {
     private String auditResult;
     //'日期(yyyy年MM月dd日)',
     private String reportDate;
+
+    ///小程序参数
+    //
+    private String companyName;
+    private String totalSales;
+    private double collection;
+    private double actualCollection;
+    private double difference;
+    private String endTime;
+    private String balance;
+    private String account;
+    private String accountNumber;
+    private String reviewedBy="石家庄市宇信通电子有限公司";
+    private String date;
 }

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreportcashedtoday/CsmCashReportCashedTodayVo.java

@@ -30,4 +30,13 @@ public class CsmCashReportCashedTodayVo implements Vo {
     private double cashedAmount;
     // '回款差额',
     private double differentAmount;
+
+    //小程序参数
+
+    private String payChannels;
+    private double money;
+    private String mainBody;
+    private double collection;
+    private double different;
+    private String notes;
 }

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayVo.java

@@ -25,4 +25,11 @@ public class CsmCashReportSalesYesterdayVo implements Vo {
     private String companyName;
     //'回款周期',
     private String accountCycle;
+
+    //小程序参数
+    private String payChannels;
+    private double money;
+    private String mainBody;
+    private String cycle;
+
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportMapper.java

@@ -2,7 +2,10 @@ package com.yxt.supervise.report.biz.csmcashreport;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.supervise.report.api.csmcashreport.CsmCashReport;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReportVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * @author wangpengfei
@@ -10,4 +13,23 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CsmCashReportMapper extends BaseMapper<CsmCashReport> {
+    @Select("select * from csm_cash_report where dataDate=#{date} group by CompanyName")
+    CsmCashReportVo getCsmCashReport (@Param("date") String date);
+
+    @Select("SELECT\n" +
+            "\tcompanyName as companyName,\n" +
+            "\tsalesAmountYesterday as totalSales,\n" +
+            "\tcashedAmountToday as collection,\n" +
+            "\tcashedAmountTodayReal as actualCollection,\n" +
+            "\tcashedAmountDifferent as different,\n" +
+            "\ttillTime as endTime,\n" +
+            "\taccountBalance as balance ,\n" +
+            "\tbankName as account,\n" +
+            "\treportDate as date,\n" +
+            "\tauditResult \n" +
+            "\t\n" +
+            "FROM\n" +
+            "\tcsm_cash_report where dataDate=#{date} and CompanyName=#{name}")
+    CsmCashReportVo getCsmReportByComSid (@Param("date") String date,@Param("name") String name );
+
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java

@@ -2,19 +2,19 @@ package com.yxt.supervise.report.biz.csmcashreport;
 
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.report.api.csmcashreport.CsmCashReportDto;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReportQuery;
 import com.yxt.supervise.report.api.reportsalesdaystore.ReportSalesDayStoreDto;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author wangpengfei
  * @date 2023/6/21 10:51
  */
+@Api(tags = "回款报告")
 @RestController
-@RequestMapping("/csmcashreport")
+@RequestMapping("v1/csmcashreport")
 public class CsmCashReportRest {
     @Autowired
     CsmCashReportService csmCashReportService;
@@ -25,4 +25,14 @@ public class CsmCashReportRest {
         ResultBean rb = ResultBean.fireFail();
         return csmCashReportService.save(dto);
     }
+    @GetMapping("/getCsmCashReport")
+    public ResultBean getCsmCashReport(@RequestParam("date") String date){
+        ResultBean rb = ResultBean.fireFail();
+        return csmCashReportService.getCsmCashReport(date);
+    }
+    @PostMapping("/getCsmReportByComSid")
+    public ResultBean getCsmReportByComSid(@RequestBody CsmCashReportQuery query){
+        ResultBean rb = ResultBean.fireFail();
+        return csmCashReportService.getCsmReportByComSid(query);
+    }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportService.java

@@ -5,6 +5,7 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.report.api.csmcashreport.CsmCashReport;
 import com.yxt.supervise.report.api.csmcashreport.CsmCashReportDto;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReportQuery;
 import com.yxt.supervise.report.api.reportsalesdaystore.ReportSalesDayStore;
 import com.yxt.supervise.report.api.reportsalesdaystore.ReportSalesDayStoreDto;
 import org.springframework.stereotype.Service;
@@ -24,4 +25,17 @@ public class CsmCashReportService extends MybatisBaseService<CsmCashReportMapper
         return rb.success().setMsg("保存成功");
 
     }
+    public ResultBean getCsmCashReport(String date) {
+        ResultBean rb=new ResultBean();
+        return rb.success().setData(baseMapper.getCsmCashReport(date));
+
+    }
+    public ResultBean getCsmReportByComSid(CsmCashReportQuery query) {
+        ResultBean rb=new ResultBean();
+        String date=query.getDataDate();
+        String name=query.getCompanyName();
+        return rb.success().setData(baseMapper.getCsmReportByComSid(date,name));
+
+    }
+
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayMapper.java

@@ -1,8 +1,14 @@
 package com.yxt.supervise.report.biz.csmcashreportcashedtoday;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReportVo;
 import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedToday;
+import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedTodayVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * @author wangpengfei
@@ -10,4 +16,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CsmCashReportCashedTodayMapper extends BaseMapper<CsmCashReportCashedToday> {
+    @Select("SELECT\n" +
+            "\tdisbursementChannelName as payChannels,\n" +
+            "\tamount as money,\n" +
+            "\tCompanyName as mainBody,\n" +
+            "\tcashedAmount as collection,\n" +
+            "\tdifferentAmount as different,\n" +
+            "\tremarks as notes,\n" +
+            "\tsalesDate\n" +
+            "FROM\n" +
+            "\tcsm_cash_report_cashed_today  where dataDate=#{date} ")
+    List<CsmCashReportCashedTodayVo> getCsmReportTodayByComSid (@Param("date") String date, @Param("name") String name );
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayRest.java

@@ -3,20 +3,19 @@ package com.yxt.supervise.report.biz.csmcashreportcashedtoday;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.report.api.csmcashreport.CsmCashReportDto;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReportQuery;
 import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedToday;
 import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedTodayDto;
+import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedTodayQuery;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author wangpengfei
  * @date 2023/6/21 10:56
  */
 @RestController
-@RequestMapping("/csmcashreportcashed")
+@RequestMapping("v1/csmcashreportcashed")
 public class CsmCashReportCashedTodayRest {
     @Autowired
     CsmCashReportCashedTodayService csmCashReportCashedTodayService;
@@ -28,4 +27,9 @@ public class CsmCashReportCashedTodayRest {
         ResultBean rb = ResultBean.fireFail();
         return csmCashReportCashedTodayService.save(dto);
     }
+    @PostMapping("/getCsmReportTodayByComSid")
+    public ResultBean getCsmReportByComSid(@RequestBody CsmCashReportCashedTodayQuery query){
+        ResultBean rb = ResultBean.fireFail();
+        return csmCashReportCashedTodayService.getCsmReportTodayByComSid(query);
+    }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportcashedtoday/CsmCashReportCashedTodayService.java

@@ -5,8 +5,10 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.report.api.csmcashreport.CsmCashReport;
 import com.yxt.supervise.report.api.csmcashreport.CsmCashReportDto;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReportQuery;
 import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedToday;
 import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedTodayDto;
+import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedTodayQuery;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -27,4 +29,11 @@ public class CsmCashReportCashedTodayService extends MybatisBaseService<CsmCashR
         return rb.success().setMsg("保存成功");
 
     }
+    public ResultBean getCsmReportTodayByComSid(CsmCashReportCashedTodayQuery query) {
+        ResultBean rb=new ResultBean();
+        String date=query.getDataDate();
+        String name=query.getCompanyName();
+        return rb.success().setData(baseMapper.getCsmReportTodayByComSid(date,name));
+
+    }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayMapper.java

@@ -1,8 +1,14 @@
 package com.yxt.supervise.report.biz.csmcashreportsalesyesterday;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReportVo;
 import com.yxt.supervise.report.api.csmcashreportsalesyesterday.CsmCashReportSalesYesterday;
+import com.yxt.supervise.report.api.csmcashreportsalesyesterday.CsmCashReportSalesYesterdayVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * @author wangpengfei
@@ -10,4 +16,11 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CsmCashReportSalesYesterdayMapper extends BaseMapper<CsmCashReportSalesYesterday> {
+    @Select("SELECT\n" +
+            "\tdisbursementChannelName as payChannels,\n" +
+            "\tamount as money,\n" +
+            "\tCompanyName as mainBody,\n" +
+            "\taccountCycle as cycle \n" +
+            "FROM csm_cash_report_sales_yesterday where dataDate=#{date}")
+    List<CsmCashReportSalesYesterdayVo> getCsmReportYesterdayByComSid (@Param("date") String date, @Param("name") String name );
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayRest.java

@@ -2,18 +2,16 @@ package com.yxt.supervise.report.biz.csmcashreportsalesyesterday;
 
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedTodayDto;
+import com.yxt.supervise.report.api.csmcashreportsalesyesterday.CsmCashReportSalesYesterdayQuery;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author wangpengfei
  * @date 2023/6/21 10:57
  */
 @RestController
-@RequestMapping("/csmcashreportsales")
+@RequestMapping("v1/csmcashreportsales")
 public class CsmCashReportSalesYesterdayRest {
     @Autowired
     CsmCashReportSalesYesterdayService csmCashReportSalesYesterdayService;
@@ -24,4 +22,9 @@ public class CsmCashReportSalesYesterdayRest {
         ResultBean rb = ResultBean.fireFail();
         return csmCashReportSalesYesterdayService.save(dto);
     }
+    @PostMapping("/getCsmReportYesterdayByComSid")
+    public ResultBean getCsmReportYesterdayByComSid(@RequestBody CsmCashReportSalesYesterdayQuery query){
+        ResultBean rb = ResultBean.fireFail();
+        return csmCashReportSalesYesterdayService.getCsmReportYesterdayByComSid(query);
+    }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreportsalesyesterday/CsmCashReportSalesYesterdayService.java

@@ -3,8 +3,10 @@ package com.yxt.supervise.report.biz.csmcashreportsalesyesterday;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReport;
 import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedTodayDto;
 import com.yxt.supervise.report.api.csmcashreportsalesyesterday.CsmCashReportSalesYesterday;
+import com.yxt.supervise.report.api.csmcashreportsalesyesterday.CsmCashReportSalesYesterdayQuery;
 import org.springframework.stereotype.Service;
 
 /**
@@ -21,4 +23,11 @@ public class CsmCashReportSalesYesterdayService extends MybatisBaseService<CsmCa
         return rb.success().setMsg("保存成功");
 
     }
+    public ResultBean getCsmReportYesterdayByComSid(CsmCashReportSalesYesterdayQuery query) {
+        ResultBean rb=new ResultBean();
+        String date=query.getDataDate();
+        String name=query.getCompanyName();
+        return rb.success().setData(baseMapper.getCsmReportYesterdayByComSid(date,name));
+
+    }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java

@@ -1,8 +1,14 @@
 package com.yxt.supervise.report.biz.wechat;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReport;
+import com.yxt.supervise.report.api.csmcashreport.CsmCashReportVo;
 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.util.WeixinCheckoutUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,6 +37,8 @@ public class WechatRest {
     WechatService wechatService;
     @Autowired
     private WechatApiService wechatApiService;
+    @Autowired
+    private CsmCashReportMapper csmCashReportMapper;
     @ApiOperation("token")
     @GetMapping(value = "token")
     public String wechate(String signature,String timestamp,String nonce,String echostr){
@@ -58,8 +66,9 @@ public class WechatRest {
     }
     @PostMapping("/sendMessage")
     public void sendMessage(@RequestBody WeChatTemplateMsg data) throws Exception {
+        CsmCashReportVo csmCashReportVo=csmCashReportMapper.getCsmCashReport("2023-06-14");
         // openId代表一个唯一微信用户，即微信消息的接收人
-        //String openId="otnrM57kui-WCUmRtChhb1HguOgw";
+//        String openId="otnrM57kui-WCUmRtChhb1HguOgw";
         //郭
         String openId="otnrM544hxIgkMOfaDU8VpJhj_6k";
         //刘
@@ -69,19 +78,15 @@ public class WechatRest {
         // 模板参数
         Map<String, Template> sendMag = new HashMap<String, Template>();
         // 公众号的模板id(也有相应的接口可以查询到)
-        String templateId = "fVgBuwpLC43YkeGWfl1Vw0mW0Qu5WP2giD77TfKAEc4";
+        String templateId = "CIrhaIkH6vWI4guaPqhDmMjOJkC3dt0Wpxs1JAO86N8";
         //微信的基础accessToken
         String accessToken=getAccessToken(APP_ID,APPSECRET);
         String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
-        sendMag.put("first", new Template("f123"));
+        sendMag.put("thing3", new Template(csmCashReportVo.getCompanyName()));
-        sendMag.put("keyword1", new Template("111"));
+        sendMag.put("time4", new Template(csmCashReportVo.getReportDate()));
-        sendMag.put("keyword2", new Template("222"));
-        sendMag.put("keyword3", new Template("333"));
-        sendMag.put("keyword4", new Template("444"));
-        sendMag.put("remark", new Template("123465"));
         Map<String, String> miniprogram = new HashMap<>();
         miniprogram.put("appid","wx11565021714ba796");
-        miniprogram.put("pagepath","pages/index/index");
+        miniprogram.put("pagepath","pages/index/auditReport?companyName="+csmCashReportVo.getCompanyName()+"&dataDate="+csmCashReportVo.getDataDate());
         RestTemplate restTemplate = new RestTemplate();
         //拼接base参数
         Map<String, Object> sendBody = new HashMap<>();