From 4494dcd878811c5bed6a1f5e646bb07e6fa66082 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 三月 2025 15:00:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 15 +++++--
ruoyi-admin/src/main/resources/application-test.yml | 6 +-
ruoyi-applet/src/main/resources/application-prod.yml | 6 +++
ruoyi-admin/src/main/resources/application-prod.yml | 10 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java | 11 +++--
ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java | 32 ++++++++++++++++
6 files changed, 66 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java
index fd0274e..56ef4cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java
@@ -1,9 +1,11 @@
package com.ruoyi.web.controller.api;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.ruoyi.common.constant.AmountConstant;
+import com.ruoyi.common.enums.BillTypeEnum;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TOrderBill;
@@ -133,10 +135,11 @@
List<TOrderBill> orderBills = orderBillService.getByOrderNo(orderid);
List<TBillDto> bills = orderBills.stream().map(ob
-> tBillService.getDetailByBillId(ob.getBillId())).collect(Collectors.toList());
-
+ respBill.setBillNo(orderid);
+ List<String> types = bills.stream().map(bill -> BillTypeEnum.getByCode(Integer.parseInt(bill.getBillType())).getName()).distinct().collect(Collectors.toList());
// 封装详细账单信息
- respBill.setBillName(order.getUserName());
- respBill.setFeeAmt(BigDecimal.valueOf(order.getAmount()).divide(AmountConstant.b100,2, RoundingMode.HALF_DOWN).toPlainString());
+ respBill.setBillName("缴费："+CollectionUtil.join(types,","));
+ respBill.setOweAmt(BigDecimal.valueOf(order.getAmount()).divide(AmountConstant.b100,2, RoundingMode.HALF_DOWN).toPlainString());
respBills.add(respBill);
respInfo.setCustName(order.getUserName());
respInfo.setCustAddress("");
@@ -151,9 +154,7 @@
respInfo.setAmtRule(amtRule);
/*QueryBillResponse.Message.Info.Bill.UnitDetail unitDetail = respBill.new UnitDetail(
"unitName", "6.66", "1");*/
- BigDecimal outstandAmount = bills.stream().map(TBillDto::getOutstandingMoney).reduce(BigDecimal::add).get();
//欠费金额
- respBill.setOweAmt(outstandAmount.setScale(2,RoundingMode.HALF_DOWN).toPlainString());
respBill.setFeeAmt("0.00");
//
// QueryBillResponse.Message.Info.Bill.DescDetail descDtail1 = respBill.new DescDetail(
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 99a087e..db91005 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -213,4 +213,12 @@
bucket: xzgttest-1305134071
bucketAddr: ap-chengdu
rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
- location: /xizang
\ No newline at end of file
+ location: /xizang
+com:
+ taxi591:
+ bank:
+ cer-path: /usr/local/bank/TrustPay.cer
+ base-url: http://hello.enjoy.abchina.com
+ enable: true
+ keystore-password: gggs6666
+ pfx-path: /usr/local/bank/103882597000441.pfx
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 4fa25ea..59dae4a 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -230,8 +230,8 @@
com:
taxi591:
bank:
- cer-path: D:\workspaces\工作文件\畅云\农业银行\TrustPayTest.cer
+ cer-path: D:\workspaces\工作文件\畅云\农业银行\正式\TrustPay.cer
base-url: http://hello.enjoy.abchina.com
enable: true
- keystore-password:
- pfx-path: D:\workspaces\工作文件\畅云\农业银行\103882200000958.pfx
\ No newline at end of file
+ keystore-password: gggs6666
+ pfx-path: D:\workspaces\工作文件\畅云\农业银行\正式\103882597000441.pfx
\ No newline at end of file
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 8f58ec4..b6939b8 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.bo.ProcessTaskListBO;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TInvoiceDTO;
import com.ruoyi.system.model.*;
@@ -72,6 +73,8 @@
private ISysUserService sysUserService;
@Autowired
private TContractRentTypeService contractRentTypeService;
+ @Autowired
+ private StateProcessTemplateService processTemplateService;
/**
* 获取轮播图管理列表
*/
@@ -213,11 +216,13 @@
@PostMapping(value = "/admin/myToDo")
public R<MyToDoVO> adminMyToDo() {
MyToDoVO myToDoVO = new MyToDoVO();
- LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
- if (loginUserApplet != null) {
- long examineCount = contractService.count(new LambdaQueryWrapper<TContract>()
- .eq(TContract::getStatus, 2));
- myToDoVO.setExamineCount((int) examineCount);
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser != null) {
+// long examineCount = contractService.count(new LambdaQueryWrapper<TContract>()
+// .eq(TContract::getStatus, 2));
+ ProcessTaskListBO processTaskListBO = new ProcessTaskListBO();
+ PageInfo<ProcessTaskListVO> processTaskListVOPageInfo = processTemplateService.waitTaskPage(processTaskListBO);
+ myToDoVO.setExamineCount((int) processTaskListVOPageInfo.getTotal());
List<String> contractIds = billService.lambdaQuery().eq(TBill::getPayFeesStatus, 4).list()
.stream().map(TBill::getContractId).collect(Collectors.toList());
int overdueCount = contractService.lambdaQuery().in(TContract::getId, contractIds).list()
diff --git a/ruoyi-applet/src/main/resources/application-prod.yml b/ruoyi-applet/src/main/resources/application-prod.yml
index b652f22..a8e94fe 100644
--- a/ruoyi-applet/src/main/resources/application-prod.yml
+++ b/ruoyi-applet/src/main/resources/application-prod.yml
@@ -214,3 +214,9 @@
bucketAddr: ap-chengdu
rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
location: xizang
+sms:
+ enable: true
+ appId: 1400957506
+ secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
+ secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
+ sign: 畅云出行
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java
new file mode 100644
index 0000000..3145e60
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java
@@ -0,0 +1,32 @@
+package com.ruoyi.common.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum BillTypeEnum {
+
+ Zujin(1,"租金"),
+ Yajin(2,"押金"),
+ ShenghuoFee(3,"生活费用"),
+ FangwuYanshou(4,"房屋验收"),
+ ;
+
+ private Integer code;
+
+ private String name;
+ BillTypeEnum(Integer code,String name){
+ this.code = code;
+ this.name = name;
+ }
+
+ public static BillTypeEnum getByCode(Integer code){
+ BillTypeEnum[] values = BillTypeEnum.values();
+ for (BillTypeEnum value : values) {
+ if (value.code==code){
+ return value;
+ }
+ }
+ return null;
+ }
+
+}
--
Gitblit v1.7.1