优化百乐福 物业需求

java110-bean/src/main/java/com/java110/po/feeReceipt/FeeReceiptPo.java

@@ -14,6 +14,7 @@ public class FeeReceiptPo implements Serializable {
     private String objType;
     private String payObjId;
     private String payObjName;
+    private String createTime;
 
     public String getAmount() {
         return amount;
@@ -94,4 +95,12 @@ public class FeeReceiptPo implements Serializable {
     public void setPayObjName(String payObjName) {
         this.payObjName = payObjName;
     }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

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

@@ -16,7 +16,7 @@ public class FeeReceiptDetailPo implements Serializable {
     private String feeId;
     private String cycle;
     private String squarePrice;
-
+    private String createTime;
     public String getArea() {
         return area;
     }
@@ -112,4 +112,12 @@ public class FeeReceiptDetailPo implements Serializable {
     public void setSquarePrice(String squarePrice) {
         this.squarePrice = squarePrice;
     }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

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

@@ -9,8 +9,14 @@
     <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,square_price
+        <if test="createTime != null">
+            ,create_time
+        </if>
         ) values (
         #{area},#{amount},#{feeName},#{detailId},#{startTime},#{endTime},#{communityId},#{receiptId},#{feeId},#{cycle},#{squarePrice}
+        <if test="createTime != null">
+            ,#{createTime}
+        </if>
         )
     </insert>
 

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

@@ -9,8 +9,14 @@
     <insert id="saveFeeReceiptInfo" parameterType="Map">
         insert into fee_receipt(
         amount,obj_id,remark,obj_name,community_id,receipt_id,obj_type,pay_obj_id,pay_obj_name
+        <if test="createTime != null">
+            ,create_time
+        </if>
         ) values (
         #{amount},#{objId},#{remark},#{objName},#{communityId},#{receiptId},#{objType},#{payObjId},#{payObjName}
+        <if test="createTime != null">
+            ,#{createTime}
+        </if>
         )
     </insert>
 

service-job/src/main/java/com/java110/job/adapt/fee/PayFeeDetailToMonthAdapt.java

@@ -111,10 +111,10 @@ public class PayFeeDetailToMonthAdapt extends DatabusAdaptImpl {
      * @param businessPayFeeDetail
      */
     private void doPayFeeDetail(Business business, JSONObject businessPayFeeDetail) {
-        if(businessPayFeeDetail.containsKey("receivedAmount")
-                && businessPayFeeDetail.getDoubleValue("receivedAmount")<0){
-            return ;
-        }
+//        if(businessPayFeeDetail.containsKey("receivedAmount")
+//                && businessPayFeeDetail.getDoubleValue("receivedAmount")<0){
+//            return ;
+//        }
         payFeeDetailToMonthImpl.doPayFeeDetail(business,businessPayFeeDetail);
     }
 

service-job/src/main/java/com/java110/job/adapt/payment/receipt/PayFeeReceiptAdapt.java

@@ -165,6 +165,7 @@ public class PayFeeReceiptAdapt extends DatabusAdaptImpl {
             feeReceiptDetailPo.setFeeName(StringUtil.isEmpty(feeDto.getImportFeeName()) ? feeDto.getFeeName() : feeDto.getImportFeeName());
             feeReceiptDetailPo.setStartTime(businessPayFeeDetail.getString("startTime"));
             feeReceiptDetailPo.setReceiptId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_receiptId));
+            feeReceiptDetailPo.setCreateTime(payFeeDetailPo.getCreateTime());
 
             //处理 小数点后 0
             feeDto.setSquarePrice(Double.parseDouble(feeDto.getSquarePrice()) + "");
@@ -179,6 +180,7 @@ public class PayFeeReceiptAdapt extends DatabusAdaptImpl {
             feeReceiptPo.setObjName(computeFeeSMOImpl.getFeeObjName(feeDto));
             feeReceiptPo.setPayObjId(ownerDto.getOwnerId());
             feeReceiptPo.setPayObjName(ownerDto.getName());
+            feeReceiptPo.setCreateTime(payFeeDetailPo.getCreateTime());
 
             //这里只是写入 收据表，暂不考虑 事务一致性问题，就算写入失败 也只是影响 收据打印，如果 贵公司对 收据要求 比较高，不能有失败的情况 请加入事务管理
             feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);

service-job/src/main/java/com/java110/job/adapt/report/ReportOwnerPayFeeAdapt.java

@@ -83,10 +83,10 @@ public class ReportOwnerPayFeeAdapt extends DatabusAdaptImpl {
     }
 
     private void doSendPayFeeDetail(Business business, JSONObject businessPayFeeDetail) {
-        if(businessPayFeeDetail.containsKey("receivedAmount")
-                && businessPayFeeDetail.getDoubleValue("receivedAmount")<0){
-            return ;
-        }
+//        if(businessPayFeeDetail.containsKey("receivedAmount")
+//                && businessPayFeeDetail.getDoubleValue("receivedAmount")<0){
+//            return ;
+//        }
         //查询缴费明细
         PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(businessPayFeeDetail, PayFeeDetailPo.class);