优化代码

java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.feeReceipt;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,12 @@ import java.util.Date;
 public class FeeReceiptDto extends PageDto implements Serializable {
 
     private String amount;
-private String objId;
-private String remark;
-private String objName;
-private String communityId;
-private String receiptId;
-private String objType;
+    private String objId;
+    private String remark;
+    private String objName;
+    private String communityId;
+    private String receiptId;
+    private String objType;
 
 
     private Date createTime;
@@ -31,43 +32,56 @@ private String objType;
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getObjName() {
+
+    public String getObjName() {
         return objName;
     }
-public void setObjName(String objName) {
+
+    public void setObjName(String objName) {
         this.objName = objName;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getReceiptId() {
+
+    public String getReceiptId() {
         return receiptId;
     }
-public void setReceiptId(String receiptId) {
+
+    public void setReceiptId(String receiptId) {
         this.receiptId = receiptId;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
 

java110-bean/src/main/java/com/java110/dto/feeReceiptDetail/FeeReceiptDetailDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.feeReceiptDetail;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,15 +16,16 @@ import java.util.Date;
 public class FeeReceiptDetailDto extends PageDto implements Serializable {
 
     private String area;
-private String amount;
-private String feeName;
-private String detailId;
-private String startTime;
-private String endTime;
-private String communityId;
-private String receiptId;
-private String feeId;
-private String cycle;
+    private String amount;
+    private String feeName;
+    private String detailId;
+    private String startTime;
+    private String endTime;
+    private String communityId;
+    private String receiptId;
+    private String feeId;
+    private String cycle;
+    private String squarePrice;
 
 
     private Date createTime;
@@ -34,61 +36,80 @@ private String cycle;
     public String getArea() {
         return area;
     }
-public void setArea(String area) {
+
+    public void setArea(String area) {
         this.area = area;
     }
-public String getAmount() {
+
+    public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getFeeName() {
+
+    public String getFeeName() {
         return feeName;
     }
-public void setFeeName(String feeName) {
+
+    public void setFeeName(String feeName) {
         this.feeName = feeName;
     }
-public String getDetailId() {
+
+    public String getDetailId() {
         return detailId;
     }
-public void setDetailId(String detailId) {
+
+    public void setDetailId(String detailId) {
         this.detailId = detailId;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getReceiptId() {
+
+    public String getReceiptId() {
         return receiptId;
     }
-public void setReceiptId(String receiptId) {
+
+    public void setReceiptId(String receiptId) {
         this.receiptId = receiptId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getCycle() {
+
+    public String getCycle() {
         return cycle;
     }
-public void setCycle(String cycle) {
+
+    public void setCycle(String cycle) {
         this.cycle = cycle;
     }
 
@@ -108,4 +129,12 @@ public void setCycle(String cycle) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getSquarePrice() {
+        return squarePrice;
+    }
+
+    public void setSquarePrice(String squarePrice) {
+        this.squarePrice = squarePrice;
+    }
 }

java110-bean/src/main/java/com/java110/po/feeReceiptDetail/FeeReceiptDetailPo.java

@@ -15,6 +15,7 @@ public class FeeReceiptDetailPo implements Serializable {
     private String receiptId;
     private String feeId;
     private String cycle;
+    private String squarePrice;
 
     public String getArea() {
         return area;
@@ -104,5 +105,11 @@ public class FeeReceiptDetailPo implements Serializable {
         this.cycle = cycle;
     }
 
+    public String getSquarePrice() {
+        return squarePrice;
+    }
 
+    public void setSquarePrice(String squarePrice) {
+        this.squarePrice = squarePrice;
+    }
 }

java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java

@@ -1,6 +1,7 @@
 package com.java110.core.smo;
 
 import com.java110.dto.fee.FeeDto;
+import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
 
 import java.util.Date;
 import java.util.Map;
@@ -22,6 +23,13 @@ public interface IComputeFeeSMO {
      */
     Date getFeeEndTime();
 
+    /**
+     * 刷新
+     * @param feeDto
+     * @param feeReceiptDetailPo
+     */
+    void freshFeeReceiptDetail(FeeDto feeDto, FeeReceiptDetailPo feeReceiptDetailPo);
+
     /**
      * 根据周期 计算费用状态
      * @param feeDto

java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -9,6 +9,7 @@ import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.ListenerExecuteException;
 import com.java110.utils.util.Assert;
@@ -48,6 +49,76 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         return null;
     }
 
+
+    /**
+     * 刷新 收据明细
+     * @param feeDto
+     * @param feeReceiptDetailPo
+     */
+    @Override
+    public void freshFeeReceiptDetail(FeeDto feeDto, FeeReceiptDetailPo feeReceiptDetailPo) {
+        if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //房屋相关
+            String computingFormula = feeDto.getComputingFormula();
+            RoomDto roomDto = new RoomDto();
+            roomDto.setRoomId(feeDto.getPayerObjId());
+            roomDto.setCommunityId(feeDto.getCommunityId());
+            List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+            if (roomDtos == null || roomDtos.size() != 1) {
+                return;
+            }
+            if ("1001".equals(computingFormula)) { //面积*单价+附加费
+                feeReceiptDetailPo.setArea(roomDtos.get(0).getBuiltUpArea());
+                feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+            } else if ("2002".equals(computingFormula)) { // 固定费用
+                feeReceiptDetailPo.setArea("");
+                feeReceiptDetailPo.setSquarePrice(feeDto.getAdditionalAmount());
+            } else if ("4004".equals(computingFormula)) {
+            } else if ("5005".equals(computingFormula)) {
+                if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+                } else {
+                    BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+                    BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+                    BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+                    feeReceiptDetailPo.setArea(sub.doubleValue() + "");
+                    feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+                }
+            } else {
+            }
+        } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//车位相关
+            String computingFormula = feeDto.getComputingFormula();
+            OwnerCarDto ownerCarDto = new OwnerCarDto();
+            ownerCarDto.setCommunityId(feeDto.getCommunityId());
+            ownerCarDto.setCarId(feeDto.getPayerObjId());
+            List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+            Assert.listOnlyOne(ownerCarDtos, "未找到车辆信息");
+            if ("1001".equals(computingFormula)) { //面积*单价+附加费
+                ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+                parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
+                parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
+                List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+                if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //数据有问题
+                    return;
+                }
+                feeReceiptDetailPo.setArea(parkingSpaceDtos.get(0).getArea());
+                feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+            } else if ("2002".equals(computingFormula)) { // 固定费用
+                feeReceiptDetailPo.setArea("");
+                feeReceiptDetailPo.setSquarePrice(feeDto.getAdditionalAmount());
+            } else if ("4004".equals(computingFormula)) {
+            } else if ("5005".equals(computingFormula)) {
+                if (StringUtil.isEmpty(feeDto.getCurDegrees())) {
+                } else {
+                    BigDecimal curDegree = new BigDecimal(Double.parseDouble(feeDto.getCurDegrees()));
+                    BigDecimal preDegree = new BigDecimal(Double.parseDouble(feeDto.getPreDegrees()));
+                    BigDecimal sub = curDegree.subtract(preDegree).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+                    feeReceiptDetailPo.setArea(sub.doubleValue() + "");
+                    feeReceiptDetailPo.setSquarePrice(feeDto.getSquarePrice() + "/" + feeDto.getAdditionalAmount());
+                }
+            } else {
+            }
+        }
+    }
+
     /**
      * 查询费用对象名称
      *

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

@@ -5,147 +5,144 @@
 <mapper namespace="feeReceiptDetailServiceDaoImpl">
 
 
-
-
-
     <!-- 保存收据明细信息 add by wuxw 2018-07-03 -->
     <insert id="saveFeeReceiptDetailInfo" parameterType="Map">
         insert into fee_receipt_detail(
-area,amount,fee_name,detail_id,start_time,end_time,community_id,receipt_id,fee_id,cycle
-) values (
-#{area},#{amount},#{feeName},#{detailId},#{startTime},#{endTime},#{communityId},#{receiptId},#{feeId},#{cycle}
-)
+        area,amount,fee_name,detail_id,start_time,end_time,community_id,receipt_id,fee_id,cycle,square_price
+        ) values (
+        #{area},#{amount},#{feeName},#{detailId},#{startTime},#{endTime},#{communityId},#{receiptId},#{feeId},#{cycle},#{squarePrice}
+        )
     </insert>
 
 
-
     <!-- 查询收据明细信息 add by wuxw 2018-07-03 -->
     <select id="getFeeReceiptDetailInfo" parameterType="Map" resultType="Map">
-        select  t.area,t.amount,t.fee_name,t.fee_name feeName,t.detail_id,t.detail_id detailId,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle 
-from fee_receipt_detail t 
-where 1 =1 
-<if test="area !=null and area != ''">
-   and t.area= #{area}
-</if> 
-<if test="amount !=null and amount != ''">
-   and t.amount= #{amount}
-</if> 
-<if test="feeName !=null and feeName != ''">
-   and t.fee_name= #{feeName}
-</if> 
-<if test="detailId !=null and detailId != ''">
-   and t.detail_id= #{detailId}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="receiptId !=null and receiptId != ''">
-   and t.receipt_id= #{receiptId}
-</if> 
-<if test="feeId !=null and feeId != ''">
-   and t.fee_id= #{feeId}
-</if> 
-<if test="cycle !=null and cycle != ''">
-   and t.cycle= #{cycle}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.area,t.amount,t.fee_name,t.fee_name feeName,t.detail_id,t.detail_id detailId,t.start_time,t.start_time
+        startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
+        communityId,t.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle,t.square_price squarePrice
+        from fee_receipt_detail t
+        where 1 =1
+        <if test="area !=null and area != ''">
+            and t.area= #{area}
+        </if>
+        <if test="amount !=null and amount != ''">
+            and t.amount= #{amount}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="receiptId !=null and receiptId != ''">
+            and t.receipt_id= #{receiptId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="cycle !=null and cycle != ''">
+            and t.cycle= #{cycle}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改收据明细信息 add by wuxw 2018-07-03 -->
     <update id="updateFeeReceiptDetailInfo" parameterType="Map">
-        update  fee_receipt_detail t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="area !=null and area != ''">
-, t.area= #{area}
-</if> 
-<if test="amount !=null and amount != ''">
-, t.amount= #{amount}
-</if> 
-<if test="feeName !=null and feeName != ''">
-, t.fee_name= #{feeName}
-</if> 
-<if test="detailId !=null and detailId != ''">
-, t.detail_id= #{detailId}
-</if> 
-<if test="startTime !=null and startTime != ''">
-, t.start_time= #{startTime}
-</if> 
-<if test="endTime !=null and endTime != ''">
-, t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="feeId !=null and feeId != ''">
-, t.fee_id= #{feeId}
-</if> 
-<if test="cycle !=null and cycle != ''">
-, t.cycle= #{cycle}
-</if> 
- where 1=1 <if test="receiptId !=null and receiptId != ''">
-and t.receipt_id= #{receiptId}
-</if> 
+        update fee_receipt_detail t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="area !=null and area != ''">
+            , t.area= #{area}
+        </if>
+        <if test="amount !=null and amount != ''">
+            , t.amount= #{amount}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            , t.fee_name= #{feeName}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            , t.detail_id= #{detailId}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            , t.start_time= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            , t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            , t.fee_id= #{feeId}
+        </if>
+        <if test="cycle !=null and cycle != ''">
+            , t.cycle= #{cycle}
+        </if>
+        where 1=1
+        <if test="receiptId !=null and receiptId != ''">
+            and t.receipt_id= #{receiptId}
+        </if>
 
     </update>
 
     <!-- 查询收据明细数量 add by wuxw 2018-07-03 -->
-     <select id="queryFeeReceiptDetailsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from fee_receipt_detail t 
-where 1 =1 
-<if test="area !=null and area != ''">
-   and t.area= #{area}
-</if> 
-<if test="amount !=null and amount != ''">
-   and t.amount= #{amount}
-</if> 
-<if test="feeName !=null and feeName != ''">
-   and t.fee_name= #{feeName}
-</if> 
-<if test="detailId !=null and detailId != ''">
-   and t.detail_id= #{detailId}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="receiptId !=null and receiptId != ''">
-   and t.receipt_id= #{receiptId}
-</if> 
-<if test="feeId !=null and feeId != ''">
-   and t.fee_id= #{feeId}
-</if> 
-<if test="cycle !=null and cycle != ''">
-   and t.cycle= #{cycle}
-</if> 
+    <select id="queryFeeReceiptDetailsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from fee_receipt_detail t
+        where 1 =1
+        <if test="area !=null and area != ''">
+            and t.area= #{area}
+        </if>
+        <if test="amount !=null and amount != ''">
+            and t.amount= #{amount}
+        </if>
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name= #{feeName}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="receiptId !=null and receiptId != ''">
+            and t.receipt_id= #{receiptId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="cycle !=null and cycle != ''">
+            and t.cycle= #{cycle}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

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

@@ -19,7 +19,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
+        objType,t.create_time createTime
         from fee_receipt t
         where 1 =1
         <if test="amount !=null and amount != ''">

service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -6,6 +6,7 @@ import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.fee.IFeeBMO;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.smo.IComputeFeeSMO;
 import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
@@ -24,7 +25,6 @@ import com.java110.po.fee.PayFeeDetailPo;
 import com.java110.po.fee.PayFeePo;
 import com.java110.po.feeReceipt.FeeReceiptPo;
 import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
-import com.java110.core.smo.IComputeFeeSMO;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ResponseConstant;
@@ -181,6 +181,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         feeReceiptDetailPo.setFeeName(StringUtil.isEmpty(feeDto.getImportFeeName()) ? feeDto.getFeeName() : feeDto.getImportFeeName());
         feeReceiptDetailPo.setStartTime(businessFeeDetail.getString("startTime"));
         feeReceiptDetailPo.setReceiptId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_receiptId));
+        computeFeeSMOImpl.freshFeeReceiptDetail(feeDto, feeReceiptDetailPo);
         feeReceiptPo.setAmount(feeReceiptDetailPo.getAmount());
         feeReceiptPo.setCommunityId(feeReceiptDetailPo.getCommunityId());
         feeReceiptPo.setReceiptId(feeReceiptDetailPo.getReceiptId());

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

@@ -31,6 +31,7 @@ import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
+import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -169,6 +170,8 @@ public class PayFeeListener extends AbstractServiceApiDataFlowListener {
         //这里只是写入 收据表，暂不考虑 事务一致性问题，就算写入失败 也只是影响 收据打印，如果 贵公司对 收据要求 比较高，不能有失败的情况 请加入事务管理
         feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);
         feeReceiptInnerServiceSMOImpl.saveFeeReceipt(feeReceiptPo);
+
+        dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailPo));
     }
 
     /**

service-api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java

@@ -120,7 +120,7 @@ public class SaveOwnerListener extends AbstractServiceApiPlusListener {
             ownerBMOImpl.sellRoom(reqJson, context);
 
             //添加物业费用信息
-            ownerBMOImpl.addPropertyFee(reqJson, context);
+            //ownerBMOImpl.addPropertyFee(reqJson, context);
         }
         if (reqJson.containsKey("ownerPhoto") && !StringUtils.isEmpty(reqJson.getString("ownerPhoto"))) {
             FileDto fileDto = new FileDto();

service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java

@@ -113,12 +113,14 @@ public class FeeReceiptApi {
      */
     @RequestMapping(value = "/queryFeeReceipt", method = RequestMethod.GET)
     public ResponseEntity<String> queryFeeReceipt(@RequestParam(value = "communityId") String communityId,
+                                                  @RequestParam(value = "receiptId") String receiptId,
                                                   @RequestParam(value = "page") int page,
                                                   @RequestParam(value = "row") int row) {
         FeeReceiptDto feeReceiptDto = new FeeReceiptDto();
         feeReceiptDto.setPage(page);
         feeReceiptDto.setRow(row);
         feeReceiptDto.setCommunityId(communityId);
+        feeReceiptDto.setReceiptId(receiptId);
         return getFeeReceiptBMOImpl.get(feeReceiptDto);
     }
 
@@ -192,12 +194,14 @@ public class FeeReceiptApi {
      */
     @RequestMapping(value = "/queryFeeReceiptDetail", method = RequestMethod.GET)
     public ResponseEntity<String> queryFeeReceiptDetail(@RequestParam(value = "communityId") String communityId,
+                                                        @RequestParam(value = "receiptId") String receiptId,
                                                         @RequestParam(value = "page") int page,
                                                         @RequestParam(value = "row") int row) {
         FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
         feeReceiptDetailDto.setPage(page);
         feeReceiptDetailDto.setRow(row);
         feeReceiptDetailDto.setCommunityId(communityId);
+        feeReceiptDetailDto.setReceiptId(receiptId);
         return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto);
     }
 }

service-fee/src/main/java/com/java110/fee/bmo/impl/PayOweFeeImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.smo.IComputeFeeSMO;
 import com.java110.dto.fee.*;
 import com.java110.dto.repair.RepairDto;
 import com.java110.fee.bmo.IPayOweFee;
@@ -19,7 +20,6 @@ import com.java110.po.fee.PayFeePo;
 import com.java110.po.feeReceipt.FeeReceiptPo;
 import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
 import com.java110.po.owner.RepairPoolPo;
-import com.java110.core.smo.IComputeFeeSMO;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.ListenerExecuteException;
 import com.java110.utils.lock.DistributedLock;
@@ -110,7 +110,7 @@ public class PayOweFeeImpl implements IPayOweFee {
         if (fees.size() > 0) {
             feeReceiptInnerServiceSMOImpl.saveFeeReceipt(feeReceiptPo);
         }
-        return ResultVo.success();
+        return ResultVo.createResponseEntity(feeReceiptPo);
     }
 
     private void doPayOweFee(JSONObject feeObj, FeeReceiptPo feeReceiptPo) {
@@ -230,7 +230,7 @@ public class PayOweFeeImpl implements IPayOweFee {
         BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("feePrice")));
         BigDecimal cycles = receivedAmount.divide(feePrice, 2, BigDecimal.ROUND_HALF_EVEN);
         paramInJson.put("tmpCycles", cycles);
-        payFeeDetailPo.setEndTime(computeFeeSMOImpl.getFeeStateByCycles(feeDto, cycles.doubleValue() + ""));
+        payFeeDetailPo.setEndTime(DateUtil.getFormatTimeString(computeFeeSMOImpl.getFeeEndTimeByCycles(feeDto, cycles.doubleValue() + ""), DateUtil.DATE_FORMATE_STRING_A));
         payFeeDetailPo.setCommunityId(paramInJson.getString("communityId"));
         payFeeDetailPo.setCycles(cycles.doubleValue() + "");
         payFeeDetailPo.setReceivableAmount(receivedAmount.doubleValue() + "");
@@ -252,6 +252,7 @@ public class PayOweFeeImpl implements IPayOweFee {
         feeReceiptDetailPo.setFeeName(StringUtil.isEmpty(feeDto.getImportFeeName()) ? feeDto.getFeeName() : feeDto.getImportFeeName());
         feeReceiptDetailPo.setStartTime(payFeeDetailPo.getStartTime());
         feeReceiptDetailPo.setReceiptId(feeReceiptPo.getReceiptId());
+        computeFeeSMOImpl.freshFeeReceiptDetail(feeDto, feeReceiptDetailPo);
         feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);
 
         BigDecimal amount = new BigDecimal(Double.parseDouble(feeReceiptPo.getAmount()));

service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java

@@ -8,13 +8,7 @@ import com.java110.utils.exception.FilterException;
 import com.java110.utils.util.StringUtil;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpMethod;
@@ -91,7 +85,7 @@ public class PageProcessAspect {
                     if (params.get(key).length > 0) {
                         String value = "";
                         for (int paramIndex = 0; paramIndex < params.get(key).length; paramIndex++) {
-                            value = params.get(key)[paramIndex] + ",";
+                            value += (params.get(key)[paramIndex] + ",");
                         }
                         value = value.endsWith(",") ? value.substring(0, value.length() - 1) : value;
                         paramObj.put(key, value);