修改结算标志

zoniot-pay/zoniot-pay-core/src/main/java/com/zcxk/rmcp/pay/entity/pay/MeasurementInstance.java

@@ -70,4 +70,6 @@ public class MeasurementInstance implements Serializable {
     private Integer deptOrgId;
     @ApiModelProperty(value = "")
     private Integer communityId;
+    @ApiModelProperty(value = "结账标志")
+    private Integer checkoutId;
 }

zoniot-pay/zoniot-pay-core/src/main/resources/mapper/pay/MeasurementInstanceMapper.xml

@@ -160,6 +160,9 @@
             <if test="clearingStartDate != null">
                 clearing_start_date = #{clearingStartDate},
             </if>
+            <if test="checkoutId != null">
+                checkout_id = #{checkoutId},
+            </if>
         </set>
         where id = #{id}
     </update>

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/MeasurementSettlementServiceImpl.java

@@ -764,7 +764,7 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void billPlease(MeasurementSettlementDto measurementSettlementDto) {
         Date billingPeriod = measurementSettlementDto.getBillingPeriod();
         Integer year = DateUtil.getYear(billingPeriod);
@@ -772,8 +772,7 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
         Date startTime = measurementSettlementDto.getClearingStartDate();
         Date endTime = measurementSettlementDto.getClearingEndDate();
         measurementSettlementDto.setTenantId(UserUtil.getCurrentUser().getTenantId());
-
-            //存储本期未结账数据
+        //存储本期未结账数据
             this.insertAccountNumber(year,month,startTime,endTime,measurementSettlementDto);
             //本期交易未结账数据
             this.insertTransaction(year,month,measurementSettlementDto);
@@ -781,6 +780,10 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
             this.insertFeeSummary(year,month,measurementSettlementDto);
             //本期水量
             this.insetAmountInfo(year,month,measurementSettlementDto);
+        MeasurementInstance measurementInstance=new MeasurementInstance();
+        measurementInstance.setId(measurementSettlementDto.getId());
+        measurementInstance.setCheckoutId(1);
+        measurementInstanceMapper.update(measurementInstance);
 
     }