Browse Source

优化 相关代码

java110 5 years ago
parent
commit
acb14e4abc

+ 18 - 0
service-common/src/main/java/com/java110/common/package-info.java

@@ -13,4 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ * 公共信息 包
+ * <p>
+ * 包括:
+ * 评价 属性管理 日志记录 设备管理 文档记录 工作流 系统异常 等信息
+ * <p>
+ * api 请写 对外提供接口信息
+ * bmo 业务相关内容
+ * dao 数据库操作相关内容
+ * kafka 为订单调度异步处理
+ * listener 为方式一开发中的 业务处理
+ * smo 内部服务调用接口能力开放
+ * <p>
+ * add by 吴学文 2020-12-23
+ * <p>
+ * 文档参考 : http://www.homecommunity.cn/
+ */
 package com.java110.common;

+ 22 - 0
service-community/src/main/java/com/java110/community/api/CommunitysApi.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.community.api;
+
+/**
+ * @desc add by 吴学文 8:30
+ */
+public class CommunitysApi {
+}

+ 19 - 0
service-community/src/main/java/com/java110/community/package-info.java

@@ -13,4 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
+/**
+ * 资产相关 包
+ * <p>
+ * 资产包括:
+ * 小区 楼栋 单元 房屋 车辆 停车场 停车位 等信息
+ *
+ * api 请写 对外提供接口信息
+ * bmo 业务相关内容
+ * dao 数据库操作相关内容
+ * kafka 为订单调度异步处理
+ * listener 为方式一开发中的 业务处理
+ * smo 内部服务调用接口能力开放
+ *
+ * add by 吴学文 2020-12-23
+ *
+ * 文档参考 : http://www.homecommunity.cn/
+ */
 package com.java110.community;

+ 19 - 0
service-fee/src/main/java/com/java110/fee/package-info.java

@@ -13,4 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ * 费用信息 包
+ * <p>
+ * 包括:
+ * 费用折扣 公摊公式 费用打印 收据 缴费审核 费用导入 水电抄表 租赁费用等信息
+ * <p>
+ * api 请写 对外提供接口信息
+ * bmo 业务相关内容
+ * dao 数据库操作相关内容
+ * discount 优惠折扣实现类
+ * kafka 为订单调度异步处理
+ * listener 为方式一开发中的 业务处理
+ * smo 内部服务调用接口能力开放
+ * <p>
+ * add by 吴学文 2020-12-23
+ * <p>
+ * 文档参考 : http://www.homecommunity.cn/
+ */
 package com.java110.fee;

+ 33 - 0
service-front/src/main/java/com/java110/front/smo/payment/adapt/IOweFeeToNotifyAdapt.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.front.smo.payment.adapt;
+
+/**
+ * 房屋租赁 通知
+ */
+public interface IOweFeeToNotifyAdapt {
+
+    /**
+     * 通知
+     *
+     * @param param
+     * @return
+     * @throws Exception
+     */
+    String confirmPayFee(String param);
+
+
+}

+ 2 - 2
service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouOweFeeToNotifyAdapt.java

@@ -21,7 +21,7 @@ import com.java110.core.factory.WechatFactory;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.front.properties.WechatAuthProperties;
-import com.java110.front.smo.payment.adapt.IPayNotifyAdapt;
+import com.java110.front.smo.payment.adapt.IOweFeeToNotifyAdapt;
 import com.java110.utils.cache.CommonCache;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ServiceConstant;
@@ -58,7 +58,7 @@ import java.util.UUID;
  */
 
 @Component(value = "fuiouOweFeeToNotifyAdapt")
-public class FuiouOweFeeToNotifyAdapt implements IPayNotifyAdapt {
+public class FuiouOweFeeToNotifyAdapt implements IOweFeeToNotifyAdapt {
 
     private static final Logger logger = LoggerFactory.getLogger(FuiouOweFeeToNotifyAdapt.class);
 

+ 5 - 1
service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java

@@ -22,6 +22,8 @@ import com.java110.dto.fee.FeeDto;
 import com.java110.dto.rentingPool.RentingPoolDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.front.properties.WechatAuthProperties;
+import com.java110.front.smo.payment.IOweFeeToNotifySMO;
+import com.java110.front.smo.payment.adapt.IOweFeeToNotifyAdapt;
 import com.java110.front.smo.payment.adapt.IPayNotifyAdapt;
 import com.java110.utils.cache.CommonCache;
 import com.java110.utils.constant.CommonConstant;
@@ -38,6 +40,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
@@ -48,7 +51,7 @@ import java.util.*;
  */
 
 @Component(value = "wechatOweFeeToNotifyAdapt")
-public class WechatOweFeeToNotifyAdapt implements IPayNotifyAdapt {
+public class WechatOweFeeToNotifyAdapt implements IOweFeeToNotifyAdapt {
 
     private static final Logger logger = LoggerFactory.getLogger(WechatOweFeeToNotifyAdapt.class);
 
@@ -202,4 +205,5 @@ public class WechatOweFeeToNotifyAdapt implements IPayNotifyAdapt {
         return BeanConvertUtil.covertBean(smallWeChats.get(0), SmallWeChatDto.class);
     }
 
+
 }

+ 2 - 1
service-front/src/main/java/com/java110/front/smo/payment/impl/OweFeeToNotifySMOImpl.java

@@ -1,6 +1,7 @@
 package com.java110.front.smo.payment.impl;
 
 import com.java110.front.smo.payment.IOweFeeToNotifySMO;
+import com.java110.front.smo.payment.adapt.IOweFeeToNotifyAdapt;
 import com.java110.front.smo.payment.adapt.IRentingToNotifyAdapt;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.WechatConstant;
@@ -28,7 +29,7 @@ public class OweFeeToNotifySMOImpl implements IOweFeeToNotifySMO {
         String payNotifyAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_NOTIFY_ADAPT);
         payNotifyAdapt = StringUtil.isEmpty(payNotifyAdapt) ? DEFAULT_OWE_FEE_TO_NOTIFY_ADAPT : payNotifyAdapt;
         //支付适配器
-        IRentingToNotifyAdapt tPayNotifyAdapt = ApplicationContextFactory.getBean(payNotifyAdapt, IRentingToNotifyAdapt.class);
+        IOweFeeToNotifyAdapt tPayNotifyAdapt = ApplicationContextFactory.getBean(payNotifyAdapt, IOweFeeToNotifyAdapt.class);
         String resXml = tPayNotifyAdapt.confirmPayFee(param);
         logger.info("【小程序支付回调响应】 响应内容:\n" + resXml);
         return new ResponseEntity<String>(resXml, HttpStatus.OK);