开发商城页面

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

@@ -807,7 +807,8 @@
         oweId,t.fee_id,t.fee_id feeId,t.amount_owed,t.amount_owed amountOwed,t.payer_obj_name,t.payer_obj_name
         payerObjName,t.config_id,t.config_id configId,t.fee_name,t.fee_name
         feeName,t.end_time,t.end_time endTime,t.community_id,t.community_id
-        communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId
+        communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId,
+        t.owner_name ownerName,t.owner_tel ownerTel
         from report_owe_fee t
         where 1 =1
         and t.amount_owed > 0

service-common/src/main/java/com/java110/common/bmo/mall/impl/GetOwnerFeeImpl.java

@@ -87,6 +87,8 @@ public class GetOwnerFeeImpl implements IMallCommonApiBmo {
         // todo 这里取一个房屋欠费即可
         String roomId = reportOweFeeDtos.get(0).getPayerObjId();
         String communityId = reportOweFeeDtos.get(0).getCommunityId();
+        String ownerName = reportOweFeeDtos.get(0).getOwnerName();
+        String roomName = reportOweFeeDtos.get(0).getPayerObjName();
 
         FeeDto feeDto = new FeeDto();
         feeDto.setState(FeeDto.STATE_DOING);
@@ -148,6 +150,8 @@ public class GetOwnerFeeImpl implements IMallCommonApiBmo {
         data.put("storeId", storeDtos.get(0).getStoreId());
         data.put("storeName", storeDtos.get(0).getName());
         data.put("communityTel", communityDtos.get(0).getTel());
+        data.put("ownerName", ownerName);
+        data.put("roomName",roomName);
         data.put("qrCode", ownerUrl + "x");
         data.put("fees", tmpFeeDtos);
         data.put("oweMoney",oweMoney.doubleValue());

service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java

@@ -168,6 +168,8 @@ public class PayFeeCmd extends Cmd {
 
         if (maxEndTime != null && endTime != null && !FeeDto.FEE_FLAG_ONCE.equals(feeDtos.get(0).getFeeFlag())) {
             Date newDate = DateUtil.stepMonth(endTime, reqJson.getDouble("cycles").intValue());
+            //todo 这里加一天 因为少一秒
+            maxEndTime = DateUtil.stepDay(maxEndTime, 1);
             if (newDate.getTime() > maxEndTime.getTime()) {
                 throw new IllegalArgumentException("缴费周期超过 缴费结束时间,请用按结束时间方式缴费");
             }