From 9027f39fbef8cbcefd48f017701e791712becac5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 三月 2022 08:53:42 +0800
Subject: [PATCH] 方便 微信支付后好对账 商品名称统一修改为 小区-房屋-费用名称 模式
---
service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java b/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
index f60d18b..cd13462 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/PayFeePreListener.java
@@ -9,7 +9,9 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.app.AppDto;
+import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
@@ -19,6 +21,7 @@
import com.java110.dto.repair.RepairUserDto;
import com.java110.entity.center.AppService;
import com.java110.entity.order.Orders;
+import com.java110.intf.community.ICommunityV1InnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
@@ -35,7 +38,6 @@
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -103,6 +105,9 @@
public HttpMethod getHttpMethod() {
return HttpMethod.POST;
}
+
+ @Autowired
+ private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;
@Override
public void soService(ServiceDataFlowEvent event) throws ParseException {
@@ -244,10 +249,38 @@
//杩欓噷璋冩暣涓哄疄鏀堕噾棰�
paramOut.put("receivableAmount", paramObj.getString("receivableAmount"));
paramOut.put("receivedAmount", paramObj.getString("receivedAmount"));
+
+ FeeDto feeDto = (FeeDto) paramObj.get("feeInfo");
+ String feeName = getObjName(feeDto);
+ paramOut.put("feeName", feeName);
+
responseEntity = new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
dataFlowContext.setResponseEntity(responseEntity);
}
+
+ private String getObjName(FeeDto feeDto) {
+ //鏌ヨ灏忓尯鍚嶇О
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setCommunityId(feeDto.getCommunityId());
+ List<CommunityDto> communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto);
+
+ Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦�");
+
+ List<FeeAttrDto> feeAttrDtos = feeDto.getFeeAttrDtos();
+ if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
+ return communityDtos.get(0).getName() + "-" + feeDto.getFeeName();
+ }
+
+ for (FeeAttrDto feeAttrDto : feeAttrDtos) {
+ if (FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME.equals(feeAttrDto.getSpecCd())) {
+ return communityDtos.get(0).getName() + "-" + feeAttrDto.getValue() + "-" + feeDto.getFeeName();
+ }
+ }
+
+ return communityDtos.get(0).getName() + "-" + feeDto.getFeeName();
+ }
+
private void dealOwnerCartEndTime(JSONObject paramObj, JSONArray businesses) {
//涓哄仠杞﹁垂鍗曠嫭澶勭悊
if (paramObj.containsKey("carPayerObjType")
--
Gitblit v1.8.0