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

java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -157,6 +157,8 @@ public class FeeDto extends PageDto implements Serializable {
     private String customStartTime;
     private String customEndTime;
 
+    private String deleteFlag;
+
     public String getAmount() {
         return amount;
     }
@@ -767,4 +769,12 @@ public class FeeDto extends PageDto implements Serializable {
     public void setCustomEndTime(String customEndTime) {
         this.customEndTime = customEndTime;
     }
+
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
 }

java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml

@@ -345,22 +345,40 @@
         left join c_business cb on t.b_id = cb.b_id
         left join c_orders co on cb.o_id = co.o_id
         left join u_user uu on co.user_id = uu.user_id
+        <if test="deleteFlag != null and deleteFlag != ''">
+            inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '1' and pf.b_id = t.b_id
+        </if>
         where 1=1
+        <if test="feeId != null and feeId != ''">
         and t.fee_id = #{feeId}
+        </if>
+        <if test="deleteFlag != null and deleteFlag != ''">
+            and t.operate = 'DEL'
+        </if>
         and t.community_id = #{communityId}
     </select>
 
     <select id="queryHisFees" parameterType="Map" resultType="Map">
         select t.operate,t.start_time startTime,t.end_time endTime,t.create_time createTime,pfc.fee_name feeName,
         t.amount,
-        uu.`name` userName
+        uu.`name` userName,pfa.`value` payerObjName,pfa1.value ownerName
         from business_pay_fee t
-        left join  pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '0'
+        left join  pay_fee_config pfc on t.config_id = pfc.config_id
         left join c_business cb on t.b_id = cb.b_id
         left join c_orders co on cb.o_id = co.o_id
         left join u_user uu on co.user_id = uu.user_id
+        left join pay_fee_attrs pfa on pfa.fee_id = t.fee_id and pfa.spec_cd = '390012'
+        left join pay_fee_attrs pfa1 on pfa1.fee_id = t.fee_id and pfa1.spec_cd = '390008'
+        <if test="deleteFlag != null and deleteFlag != ''">
+            inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '1' and pf.b_id = t.b_id
+        </if>
         where 1=1
-        and t.fee_id = #{feeId}
+        <if test="feeId != null and feeId != ''">
+            and t.fee_id = #{feeId}
+        </if>
+        <if test="deleteFlag != null and deleteFlag != ''">
+            and t.operate = 'DEL'
+        </if>
         and t.community_id = #{communityId}
         order by t.create_time desc,t.operate
         <if test="page != -1 and page != null ">

java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -1744,7 +1744,7 @@
         pf.payer_obj_type payerObjType,t.start_time startTime,t.end_time endTime,t.create_time createTime,
         t.receivable_amount receivableAmount,t.received_amount receivedAmount,pfa.`value`
         importFeeName,t.prime_rate,d.name primeRate,fdr.discount_small_type discountSmallType,fdr.rule_name
-        ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName,cb.o_id oId,
+        ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName,t.pay_order_id oId,
         d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName,t.fee_id feeId,pft.`value` repairId,
         t.detail_id,t.detail_id detailId,pf.payer_obj_id,pfb.value ownerId,concat(pa.num,'停车场',ps.num,'车位') psName,
         fad.amount withholdAmount,t.cashier_id cashierId,t.cashier_name cashierName,t.payable_amount payableAmount,pfc.fee_flag feeFlag
@@ -1771,7 +1771,6 @@
         left join t_dict d3 on t.state = d3.status_cd and d3.table_name = "pay_fee_detail" and d3.table_columns =
         "state"
         LEFT JOIN contract co on pf.payer_obj_id = co.contract_id and co.status_cd = '0' and pf.payer_obj_type='7777'
-        LEFT JOIN c_business cb on t.b_id = cb.b_id
         left join fee_account_detail fad on t.detail_id = fad.detail_id and t.community_id = fad.community_id and
         fad.status_cd = '0' and fad.state = '1002'
         where t.status_cd = '0'

service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/SaveReturnPayFeeCmd.java

@@ -113,6 +113,11 @@ public class SaveReturnPayFeeCmd extends Cmd {
 
         Assert.listOnlyOne(feeDtos, "不存在该费用");
 
+        FeeDetailDto feeDetailDto = new FeeDetailDto();
+        feeDetailDto.setDetailId(reqJson.getString("detailId"));
+        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
+        Assert.listOnlyOne(feeDetailDtos, "未找到需要修改的活动 或多条数据");
+
         reqJson.put("configId", feeDtos.get(0).getConfigId());
         reqJson.put("feeTypeCd", feeDtos.get(0).getFeeTypeCd());
 
@@ -122,7 +127,9 @@ public class SaveReturnPayFeeCmd extends Cmd {
         returnPayFeePo.setCycles((reqJson.getDouble("cycles") * -1) + "");
         returnPayFeePo.setReceivableAmount((reqJson.getDouble("receivableAmount") * -1) + "");
         returnPayFeePo.setReceivedAmount((reqJson.getDouble("receivedAmount") * -1) + "");
-        returnPayFeePo.setPrimeRate("7"); //退费默认方式为转账
+        //todo 这里不知道为啥写死为 转账，物业交费是现金 退费为转账时 物业误解，所以暂时屏蔽,如果退款也需要 支付方式 建议退款页面补充
+        //returnPayFeePo.setPrimeRate("7"); //退费默认方式为转账
+        returnPayFeePo.setPrimeRate(feeDetailDtos.get(0).getPrimeRate());
         returnPayFeePo.setApplyPersonId(userId);
         returnPayFeePo.setApplyPersonName(userDtos.get(0).getName());
         int flag = returnPayFeeV1InnerServiceSMOImpl.saveReturnPayFee(returnPayFeePo);
@@ -132,10 +139,7 @@ public class SaveReturnPayFeeCmd extends Cmd {
         }
         reqJson.put("state", "1000");
 
-        FeeDetailDto feeDetailDto = new FeeDetailDto();
-        feeDetailDto.setDetailId(reqJson.getString("detailId"));
-        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
-        Assert.listOnlyOne(feeDetailDtos, "未找到需要修改的活动 或多条数据");
+
 
         JSONObject businessReturnPayFee = new JSONObject();
         businessReturnPayFee.putAll(BeanConvertUtil.beanCovertMap(feeDetailDtos.get(0)));

service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/UpdateReturnPayFeeCmd.java

@@ -441,6 +441,7 @@ public class UpdateReturnPayFeeCmd extends Cmd {
         businessReturnPayFee.putAll(BeanConvertUtil.beanCovertMap(feeDetailDtos.get(0)));
         businessReturnPayFee.putAll(paramInJson);
         PayFeeDetailPo returnPayFeePo = BeanConvertUtil.covertBean(businessReturnPayFee, PayFeeDetailPo.class);
+        returnPayFeePo.setPrimeRate(feeDetailDtos.get(0).getPrimeRate());
         int flag = payFeeDetailV1InnerServiceSMOImpl.updatePayFeeDetailNew(returnPayFeePo);
         if (flag < 1) {
             throw new CmdException("更新数据失败");

service-report/src/main/java/com/java110/report/cmd/fee/QueryHisFeeCmd.java

@@ -30,8 +30,12 @@ public class QueryHisFeeCmd extends Cmd {
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
-        Assert.hasKeyAndValue(reqJson,"feeId","未包含费用ID");
         Assert.hasKeyAndValue(reqJson,"communityId","未包含小区");
+        if (reqJson.containsKey("deleteFlag")) {
+            return;
+        }
+        Assert.hasKeyAndValue(reqJson,"feeId","未包含费用ID");
+
 
     }