Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-db/src/main/resources/mapper/fee/FeeReceiptServiceDaoImplMapper.xml

@@ -30,7 +30,7 @@
     <select id="getFeeReceiptInfo" parameterType="Map" resultType="Map">
         select t.amount,t.obj_id,t.obj_id objId,t.remark,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name
         objName,t.community_id,t.community_id communityId,t.receipt_id,t.receipt_id receiptId,t.obj_type,t.obj_type
-        objType,t.create_time createTime,frd.fee_name feeName,t.pay_obj_id payObjId,t.pay_obj_name payObjName
+        objType,t.create_time createTime,frd.fee_name feeName,t.pay_obj_id payObjId,t.pay_obj_name payObjName,pf.fee_type_cd feeTypeCd
         from fee_receipt t
         inner join fee_receipt_detail frd on t.receipt_id = frd.receipt_id and frd.status_cd = '0'
         inner join pay_fee pf on frd.fee_id = pf.fee_id and pf.status_cd = '0'

service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java

@@ -264,11 +264,11 @@ public class PayFeeListener extends AbstractServiceApiDataFlowListener {
         feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
         List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
 
-        if (feeReceiptDetailDtos != null || feeReceiptDetailDtos.size() > 0) {
+        if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
             dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
             return;
         }
-        dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailPo));
+        dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDto));
     }