修复 收费bug

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BillController.java

@@ -87,21 +87,22 @@ public class BillController extends BaseController {
     @PostMapping(value = "/bill/uploadExcel/add", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public ResponseBean addUploadExcel(HttpSession session,
                                        @RequestParam(value = "billId", required = false) Integer billId,
-                                       @RequestParam("file") MultipartFile file,
+                                       @RequestParam(value = "file", required = false) MultipartFile file,
                                        @RequestParam("billExplain") String billExplain,
                                        @RequestParam("billName") String billName,
-                                       @RequestParam("endDate") Date endDate,
+                                       @RequestParam("endDate") String endDate,
                                        @RequestParam("billStatus") String billStatus) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-//        Date date = null;
-//        try {
-//            date = simpleDateFormat.parse(endDate);
-//        } catch (ParseException e) {
-//            e.printStackTrace();
-//        }
-        responseBean = iBillService.getExcelData(billId, file, billExplain, billName, endDate, billStatus, userElement);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = null;
+        try {
+            String d = simpleDateFormat.format(new Long(endDate));
+            date = simpleDateFormat.parse(d);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        responseBean = iBillService.getExcelData(billId, file, billExplain, billName, date, billStatus, userElement);
         return responseBean;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillInvoiceServiceImpl.java

@@ -179,6 +179,10 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 Bill bill = billMapper.selectById(billInvoice.getBillId());
                 bill.setPayedNum(bill.getPayedNum() + 1);
                 bill.setUnpayedNum(bill.getUnpayedNum() - 1);
+                // 未交户数为0时, 收费组状态变更为 1 , 收费完成
+                if (bill.getUnpayedNum() == 0) {
+                    bill.setBillStatus("1");
+                }
                 billMapper.updateById(bill);
 
             }
@@ -211,6 +215,14 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         // 收费金额
         Double payPrice = jsonObject.getDouble("payPrice");
 
+        // 判断是不是已经 收费完成
+        Bill bill = billMapper.selectById(billId);
+        if ("1".equals(bill.getBillStatus())) {
+            // 状态 收费完成, 不允许添加收费单
+            responseBean.addError("不能给收费已完成的收费组添加收费单!");
+            return responseBean;
+        }
+
         // 楼栋资料库
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phase", phase);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -2,6 +2,7 @@ package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.constant.Constant;
@@ -163,11 +164,36 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     public ResponseBean getExcelData(Integer billId, MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
 
+        List<BillInvoice> records = null;
+        if (billId != null) {
+            // 查询出这个收费单, 存在的缴费单数据
+            QueryWrapper<BillInvoice> billInvoiceQueryWrapper = new QueryWrapper<>();
+            billInvoiceQueryWrapper.eq("bill_id", billId);
+            billInvoiceQueryWrapper.eq("community_id", userElement.getCommunityId());
+            records = billInvoiceMapper.selectList(billInvoiceQueryWrapper);
+        }
+
+        // 如果没有携带 excel 文件, 并且这个收费组里面也没有收费单, 那么就提示 发送账单失败，需要先上传账单excel
+        if (null == file && "0".equals(billStatus) && (null == records ||records.size() == 0)) {
+            responseBean.addError("发送账单失败，需要先上传账单excel");
+            return responseBean;
+        }
+
         responseBean = getExcelData(file, responseBean);
         List<TempBill> tempBills = (List<TempBill>) responseBean.getData();
 
-        Double sumDouble = tempBills.stream().mapToDouble(TempBill::getMoney).sum() * 100;
+        Double sumDouble = 0.0;
         String strSumDouble = sumDouble + "";
+        // 如果 List 有数据, 表示携带了文件上传, 那么就从excel文件里面读取金额
+        if (tempBills.size() > 0) {
+            sumDouble = tempBills.stream().mapToDouble(TempBill::getMoney).sum() * 100;
+            strSumDouble = sumDouble + "";
+        }
+        // 如果 List 没有数据, records 有数据, 就表示用户做的修改操作 并且没有上传文件, 那么这里的金额应该从数据库读取
+        if (tempBills.size() == 0 && records != null) {
+            sumDouble = records.stream().mapToDouble(BillInvoice::getPayPrice).sum();
+            strSumDouble = sumDouble + "";
+        }
 
         // 存入缴费项表
         Bill bill = new Bill();
@@ -178,22 +204,27 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             strSumDouble = strSumDouble.substring(0, strSumDouble.lastIndexOf("."));
             bill.setPayPrice(strSumDouble);
         }
-        bill.setPayTotalNum(tempBills.size());
+
         bill.setPayedNum(0);
-        bill.setUnpayedNum(tempBills.size());
         bill.setBillStatus(billStatus);
         bill.setCreateUser(userElement.getId());
         bill.setCreateDate(new Date());
         bill.setCommunityId(userElement.getCommunityId());
-        bill.setPayTotalNum(tempBills.size());
-        bill.setUnpayedNum(tempBills.size());
+        Integer payTotalNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;
+        Integer unpayedNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;
+        bill.setPayTotalNum(payTotalNum);
+        bill.setUnpayedNum(unpayedNum);
 
-        if (billId != null) {
+        if (file != null) {
             // 删除掉旧数据
-            QueryWrapper<BillInvoice> billInvoiceQueryWrapper = new QueryWrapper<>();
-            billInvoiceQueryWrapper.eq("bill_id", billId);
-            billInvoiceMapper.delete(billInvoiceQueryWrapper);
+            QueryWrapper<BillInvoice> billInvoiceQuery = new QueryWrapper<>();
+            billInvoiceQuery.eq("bill_id", billId);
+            billInvoiceMapper.delete(billInvoiceQuery);
+        }
 
+        if (billId != null) {
+            bill.setCreateUser(null);
+            bill.setCreateDate(null);
             // 设置主键, 表示修改
             bill.setId(billId);
         }
@@ -238,17 +269,20 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             }).collect(Collectors.toList());
 
             iBillInvoiceService.saveBatch(billInvoices);
-            responseBean.addSuccess("操作成功!");
-        } else {
-            responseBean.addError("操作失败!");
         }
-
-
+        responseBean.addSuccess("操作成功!");
         return responseBean;
     }
 
     private ResponseBean getExcelData(MultipartFile file, ResponseBean responseBean) {
-        ResponseBean responseBean1 = new ResponseBean();
+
+        // 数据
+        List<TempBill> tempBills = Lists.newArrayList();
+        if (null == file) {
+            responseBean.addSuccess(tempBills);
+            return responseBean;
+        }
+
         //获取文件的名字
         String originalFilename = file.getOriginalFilename();
         Workbook workbook = null;
@@ -269,9 +303,6 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         Sheet sheetAt = workbook.getSheetAt(0);
         int lastRowNum = sheetAt.getLastRowNum();
 
-        // 数据
-        List<TempBill> tempBills = Lists.newArrayList();
-
         // 从第7行开始读取
         for (int i= 6; i<= lastRowNum; i++) {
             Row row = sheetAt.getRow(i);
@@ -322,7 +353,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
 
             if (StringUtils.isNotBlank(money)) {
-                Double moneyDouble = Double.valueOf(money) * 100;
+                Double moneyDouble = Double.valueOf(money); // * 100
                 money = moneyDouble + "";
                 money = money.substring(0, money.lastIndexOf("."));
                 temp.setMoney(Integer.valueOf(money));

VUECODE/smart-property-manage/src/views/bill/add/index.vue

@@ -11,6 +11,7 @@
         <el-date-picker
           v-model="ruleForm.endDate"
           type="date"
+          value-format="timestamp"
           placeholder="选择日期"/>
       </el-form-item>
       <div>

VUECODE/smart-property-manage/src/views/bill/edi/index.vue

@@ -11,6 +11,7 @@
         <el-date-picker
           v-model="ruleForm.endDate"
           type="date"
+          value-format="timestamp"
           placeholder="选择日期"/>
       </el-form-item>
       <div>
@@ -68,14 +69,14 @@
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
-      <el-form-item v-if="isUpload" style="margin-top: 20px;">
+      <el-form-item style="margin-top: 20px;"> <!-- v-if="isUpload" -->
         <el-button @click="submitFormAdd('ruleForm', 2)">保存草稿</el-button>
         <el-button type="primary" @click="submitFormAdd('ruleForm', 0)">发送账单</el-button>
       </el-form-item>
-      <el-form-item v-else style="margin-top: 20px;">
-        <el-button @click="submitForm('ruleForm', 2)">保存草稿</el-button>
-        <el-button type="primary" @click="submitForm('ruleForm', 0)">发送账单</el-button>
-      </el-form-item>
+      <!--<el-form-item v-else style="margin-top: 20px;">-->
+      <!--<el-button @click="submitForm('ruleForm', 2)">保存草稿</el-button>-->
+      <!--<el-button type="primary" @click="submitForm('ruleForm', 0)">发送账单</el-button>-->
+      <!--</el-form-item>-->
     </el-form>
   </div>
 </template>
@@ -211,7 +212,7 @@ export default {
           // const data = this.ruleForm
           // data.files = this.files
           const formData = new FormData()
-          formData.append('billId', this.ruleForm.billId)
+          formData.append('billId', this.listQuery.billId)
           formData.append('billExplain', this.ruleForm.billExplain)
           formData.append('billName', this.ruleForm.billName)
           formData.append('endDate', this.ruleForm.endDate)

VUECODE/smart-property-manage/src/views/bill/info/add/index.vue

@@ -31,12 +31,6 @@
             :value="item.roomNo"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="截止时间">
-        <el-date-picker
-          v-model="formInline.worthOf"
-          type="date"
-          placeholder="选择日期"/>
-      </el-form-item>
       <br>
       <el-form-item label="收费单说明">
         <el-input
@@ -148,10 +142,10 @@ export default {
         this.$message.error('户号')
         return
       }
-      if (this.formInline.worthOf === '') {
-        this.$message.error('催缴日期')
-        return
-      }
+      // if (this.formInline.worthOf === '') {
+      //   this.$message.error('催缴日期')
+      //   return
+      // }
       if (this.formInline.billInvoiceExplain === '') {
         this.$message.error('收费单说明')
         return

VUECODE/smart-property-manage/src/views/bill/info/index.vue

@@ -433,7 +433,20 @@ export default {
       })
     },
     addBillInvoice() {
-      this.$router.push({ name: 'bill-info-add', params: { id: this.formInline.billId }})
+      // 如果是 收费已完成 的收费项, 则不允许跳进添加页面
+      this.$store.dispatch('GetBillByIdInfo', this.formInline.billId).then(res => {
+        const resCode = res.code
+        if (resCode === '0') {
+          const billStatus = res.data.billStatus
+          if (billStatus === '1') {
+            this.$message.error('不能给收费已完成的收费组添加收费单!')
+            return
+          }
+          this.$router.push({ name: 'bill-info-add', params: { id: this.formInline.billId }})
+        }
+      }).catch(() => {
+        console.log('GetBillByIdInfo error')
+      })
     },
     showPayPrice(payPrice) { //  转换金额
       const price = payPrice / 100