base64 转码

CODE/smart-community/community-common/src/main/java/com/community/commom/utils/PayPriceUtils.java

@@ -21,7 +21,8 @@ public class PayPriceUtils {
      */
     public static Integer yuanConversionPoints(Double price) {
         Double d = price * 100;
-        return  Integer.parseInt(d + "");
+        String strD = d+"";
+        return  Integer.parseInt(strD.substring(0, strD.lastIndexOf(".")));
     }
 
 }

CODE/smart-community/property-api/pom.xml

@@ -152,8 +152,14 @@
 			<artifactId>okhttp</artifactId>
 			<version>3.11.0</version>
 		</dependency>
-
-	</dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.1.3.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
 
 	<dependencyManagement>
 		<dependencies>

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

@@ -4,6 +4,7 @@ package com.community.huiju.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.commom.utils.PayPriceUtils;
 import com.community.huiju.common.base.BaseController;
 import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBillService;
@@ -162,8 +163,8 @@ public class BillInvoiceController extends BaseController {
     public ResponseBean updateBillInvoiceIdPayPrice(HttpSession session,@PathVariable Integer billId, @RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        Integer payPrice = JSONObject.parseObject(parameter).getInteger("payPrice");
-        responseBean = iBillInvoiceService.updateBillInvoiceIdPayPrice(billId, payPrice , userElement);
+        Double payPrice = JSONObject.parseObject(parameter).getDouble("payPrice");
+        responseBean = iBillInvoiceService.updateBillInvoiceIdPayPrice(billId, PayPriceUtils.yuanConversionPoints(payPrice) , userElement);
         return responseBean;
     }
 

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

@@ -6,13 +6,19 @@ import com.community.huiju.service.ImageServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.tomcat.util.http.fileupload.FileItem;
+import org.apache.tomcat.util.http.fileupload.disk.DiskFileItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import sun.misc.BASE64Decoder;
 
+import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,4 +49,25 @@ public class ImageController extends BaseController {
         responseBean.addSuccess(urls);
         return responseBean;
     }
+
+    @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
+    @PostMapping(value = "/uploadimageBase64", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean uploadImgBase64AndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) String[] uploadFiles) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        List<String> urls = new ArrayList<String>();
+//        for (MultipartFile uploadFile : uploadFiles){
+//            String url = imageService.getImageUrl(uploadFile);
+//            urls.add(url);
+//        }
+        for (String base64Url : uploadFiles) {
+            BASE64Decoder base64Decoder = new BASE64Decoder();
+            byte[] bytes = base64Decoder.decodeBuffer(base64Url);
+            ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
+            MultipartFile multipartFil = new MockMultipartFile(String.valueOf(System.currentTimeMillis()), byteArrayInputStream);
+            String url = imageService.getImageUrl(multipartFil);
+            urls.add(url);
+        }
+        responseBean.addSuccess(urls);
+        return responseBean;
+    }
 }

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

@@ -10,10 +10,7 @@ import com.community.commom.session.UserElement;
 import com.community.commom.utils.PayPriceUtils;
 import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
-import com.community.huiju.model.Bill;
-import com.community.huiju.model.BillInvoice;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.*;
 import com.community.huiju.service.IBillInvoiceService;
 import com.google.common.collect.Maps;
 import org.apache.poi.hssf.usermodel.*;
@@ -153,7 +150,36 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
             }
 
             billInvoice.setBillStatus("2");
-            billInvoiceMapper.updateById(billInvoice);
+            int rows = billInvoiceMapper.updateById(billInvoice);
+            if (rows > 0) {
+                TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(billInvoice.getBuildingOwnerInfoId());
+
+                // 插入流水
+                BillStatement billStatement = new BillStatement();
+                billStatement.setCommunityId(userElement.getCommunityId());
+                billStatement.setBillInvoiceId(billInvoice.getId());
+                billStatement.setTaUserId(billInvoice.getTaUserId());
+                billStatement.setPayPrice(billInvoice.getPayPrice());
+                billStatement.setPayName(buildingOwnerInfo.getOwnerName());
+                billStatement.setPayRemark(billInvoice.getBillInvoiceExplain());
+                billStatement.setPayType("1");
+                billStatement.setCreateTime(new Date());
+                billStatementMapper.insert(billStatement);
+
+                // 更新缴费单信息
+                billInvoice.setBillStatementId(billStatement.getId());
+                billInvoice.setPayName(billStatement.getPayName());
+                billInvoice.setPayDate(new Date());
+                billInvoice.setOutTradeNo(String.valueOf(System.currentTimeMillis()) + billInvoice.getId());
+                billInvoiceMapper.updateById(billInvoice);
+
+                // 修改缴费户数
+                Bill bill = billMapper.selectById(billInvoice.getBillId());
+                bill.setPayedNum(bill.getPayedNum() + 1);
+                bill.setUnpayedNum(bill.getUnpayedNum() - 1);
+                billMapper.updateById(bill);
+
+            }
         });
 
         responseBean.addSuccess("操作成功");
@@ -181,7 +207,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         // 收费单说明
         String billInvoiceExplain = jsonObject.getString("billInvoiceExplain");
         // 收费金额
-        Integer payPrice = jsonObject.getInteger("payPrice");
+        Double payPrice = jsonObject.getDouble("payPrice");
 
         // 楼栋资料库
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
@@ -198,6 +224,11 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         userQueryWrapper.eq("login_name", buildingOwnerInfo.getOwnerTel());
         TaUser taUser = taUserMapper.selectOne(userQueryWrapper);
 
+        if (null == taUser) {
+            responseBean.addError("该业主未绑定app, 无法操作!");
+            return responseBean;
+        }
+
 
         BillInvoice billInvoice = new BillInvoice();
         billInvoice.setBillId(billId);
@@ -210,6 +241,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         billInvoice.setCreateUser(userElement.getId());
         billInvoice.setCreateDate(new Date());
         billInvoice.setStatus(0);
+        billInvoice.setOutTradeNo("");
 
         int result = billInvoiceMapper.insert(billInvoice);
         billInvoice.setOutTradeNo(String.valueOf(System.currentTimeMillis()) + billInvoice.getId());
@@ -236,6 +268,12 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         }).collect(Collectors.toList());
 
         boolean b = this.updateBatchById(billInvoices);
+        // 修改为有效时, 修改应缴费户数
+        Bill bill = billMapper.selectById(billInvoices.get(0).getBillId());
+        bill.setPayTotalNum(bill.getPayTotalNum() + billInvoices.size());
+        bill.setUnpayedNum(bill.getUnpayedNum() + billInvoices.size());
+        billMapper.updateById(bill);
+
         if (b == false) {
             throw new WisdomException("操作失败");
         }
@@ -287,7 +325,8 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
             responseBean.addError("不能修改已缴费");
             return responseBean;
         }
-        billInvoice.setPayPrice(PayPriceUtils.yuanConversionPoints(payPrice));
+        // 此处存储的是已经转换过的金额
+        billInvoice.setPayPrice(payPrice);
         billInvoice.setUpdateUser(userElement.getId());
         billInvoice.setUpdateDate(new Date());
 

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

@@ -182,6 +182,8 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         bill.setCreateUser(userElement.getId());
         bill.setCreateDate(new Date());
         bill.setCommunityId(userElement.getCommunityId());
+        bill.setPayTotalNum(tempBills.size());
+        bill.setUnpayedNum(tempBills.size());
 
         int rows = billMapper.insert(bill);
         if (rows > 0) {
@@ -200,6 +202,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 queryWrapper.eq("community_id", userElement.getCommunityId());
                 TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
 
+                // TODO 如果用户不在 app 里面,没有关联, 怎么处理?
                 // 查询app用户id
                 QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
                 userQueryWrapper.eq("community_id", userElement.getCommunityId());

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

@@ -23,7 +23,7 @@
             :data="ruleForm"
             name="file"
             class="upload-demo"
-            action="http://localhost:8086/property-api/bill/uploadExcel/get"
+            action="http://106.14.20.193:8086/property-api/bill/uploadExcel/get"
             multiple>
             <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           </el-upload>

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

@@ -23,7 +23,7 @@
             :data="ruleForm"
             name="file"
             class="upload-demo"
-            action="http://localhost:8086/property-api/bill/uploadExcel/get"
+            action="http://106.14.20.193:8086/property-api/bill/uploadExcel/get"
             multiple>
             <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           </el-upload>
@@ -68,7 +68,11 @@
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
-      <el-form-item style="margin-top: 20px;">
+      <el-form-item v-if="isUpload" style="margin-top: 20px;">
+        <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>
@@ -119,7 +123,8 @@ export default {
       total: 0,
       list: [], // 数据
       tempList: [], // 临时数据
-      files: '' // 文件
+      files: '', // 文件
+      isUpload: false // 是否上传
     }
   },
   created() {
@@ -170,6 +175,7 @@ export default {
       this.tempList = response.data.list
       this.total = response.data.total
       this.list = this.getList()
+      this.isUpload = true
       console.log(response)
     },
     handleExceed(files, fileList) {
@@ -198,6 +204,35 @@ export default {
         }
       })
     },
+    submitFormAdd(formName, status) { // 提交添加
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.ruleForm.billStatus = status
+          // const data = this.ruleForm
+          // data.files = this.files
+          const formData = new FormData()
+          formData.append('billExplain', this.ruleForm.billExplain)
+          formData.append('billName', this.ruleForm.billName)
+          formData.append('endDate', this.ruleForm.endDate)
+          formData.append('billStatus', this.ruleForm.billStatus)
+          formData.append('file', this.files)
+          this.$store.dispatch('bill/BillUploadExcelAdd', formData).then(res => {
+            const resCode = res.code
+            if (resCode === '0') {
+              this.$message.success(res.message)
+              this.$router.push({ name: 'bill-index' })
+              return
+            }
+            this.$message.error(res.message)
+          }).catch(() => {
+            console.log('BillUploadExcelAdd error')
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
     billInvoiceGetInvoiceInvalid() { // 保存
       this.$store.dispatch('BillInvoiceGetInvoiceInvalid', this.listQuery).then(res => {
         const resData = res.data

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

@@ -128,6 +128,38 @@ export default {
   },
   methods: {
     onSubmit() {
+      if (this.formInline.phase === '') {
+        this.$message.error('期/区')
+        return
+      }
+      if (this.formInline.building === '') {
+        this.$message.error('栋')
+        return
+      }
+      // if (this.formInline.building === '') {
+      //   this.$message.error('单元')
+      //   return
+      // }
+      if (this.formInline.unit === '') {
+        this.$message.error('楼层')
+        return
+      }
+      if (this.formInline.roomNo === '') {
+        this.$message.error('户号')
+        return
+      }
+      if (this.formInline.worthOf === '') {
+        this.$message.error('催缴日期')
+        return
+      }
+      if (this.formInline.billInvoiceExplain === '') {
+        this.$message.error('收费单说明')
+        return
+      }
+      if (this.formInline.payPrice === '') {
+        this.$message.error('收费金额')
+        return
+      }
       this.$store.dispatch('AddTempBillInvoice', this.formInline).then(res => {
         const resCode = res.code
         if (resCode === '0') {

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

@@ -112,7 +112,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="billStatement"
+        prop="billStatementId"
         label="流水"
         align="center"/>
       <el-table-column
@@ -314,6 +314,9 @@ export default {
       }
     },
     formatDate(val) {
+      if (val === null) {
+        return ''
+      }
       var value = new Date(val)
       var year = value.getFullYear()
       var month = value.getMonth() + 1
@@ -366,6 +369,9 @@ export default {
         case '2':
           str = '已线下缴费'
           break
+        case '3':
+          str = '正在支付中'
+          break
       }
       return str
     },
@@ -384,11 +390,11 @@ export default {
     },
     ediPayPrice(obj) { // 修改金额
       const payPrice = obj.payPrice
-      this.$prompt('请输入金额(不含角、分)', '提示', {
+      this.$prompt('请输入金额', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         inputPlaceholder: payPrice / 100,
-        inputPattern: /^\d+$/, // /^\d+\.?\d{0,2}$/
+        inputPattern: /^\d+\.?\d{0,2}$/, // /^\d+\.?\d{0,2}$/ 保留两位小数, /^\d+$/ 不保留小数
         inputErrorMessage: '请输入有效的金额'
       }).then(({ value }) => {
         // this.$message({