Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java

@@ -160,6 +160,16 @@ public class MemberBasicInfoController extends BaseController {
 		List<MemberTransactionVO> list = memberTransactionRecordService.selectMemberTransactionRecordList(dto.getMemberId());
 		return getDataTable(list);
 	}
+
+	@PreAuthorize("@ss.hasPermi('member:info:remove')")
+	@Log(title = "修改车牌号信息", businessType = BusinessType.UPDATE)
+	@PostMapping("/updatePlateNumber")
+	public AjaxResult updatePlateNumber(@RequestBody MemberPlateNumberRelation relation){
+		int i = memberPlateNumberRelationService.updatePlateNumber(relation);
+		logger.info("后管修改用户：{} 的车牌号：{}", relation.getMemberId(), relation.getLicensePlateNumber());
+		return toAjax(i);
+	}
+
 	/**
 	 * 删除会员绑定的车牌号信息
 	 */
@@ -168,7 +178,7 @@ public class MemberBasicInfoController extends BaseController {
 	@PostMapping("/deletePlateNumber")
 	public AjaxResult deletePlateNumber(@RequestBody MemberPlateNumberRelation relation){
 		int i = memberPlateNumberRelationService.unbindingPlateNumber(relation.getMemberId(), relation.getLicensePlateNumber());
-		logger.info("后管接触绑定用户：{} 的车牌号：{}", relation.getMemberId(), relation.getPhoneNumber());
+		logger.info("后管解除绑定用户：{} 的车牌号：{}", relation.getMemberId(), relation.getPhoneNumber());
 		return toAjax(i);
 	}
 }

jsowell-ui/src/api/member/info.js

@@ -86,3 +86,13 @@ export function deletePlateNumber(data) {
     data: data
   })
 }
+
+ //修改车牌号
+export function updatePlateNumber(data){
+  return request({
+    url: '/member/info/updatePlateNumber',
+    method: 'post',
+    data: data
+  })
+}
+

jsowell-ui/src/views/member/info/detail.vue

@@ -250,6 +250,22 @@
         </el-card>
       </el-col>
     </el-row>
+
+    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
+      <el-form ref="form" :model="form" label-width="150px" label-position="right">
+<!--        <el-form-item label="会员id" prop="memberId" >-->
+<!--          <el-input v-model="form.memberId" placeholder="memberId" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="车牌号" prop="toUpdatePlateNumber">
+          <el-input v-model="form.plateNumber" placeholder="请输入车牌号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -258,7 +274,7 @@ import {
   getMemberBalanceChanges,
   getMemberPersonPileInfo,
   getMemberTransactionRecordList,
-  deletePlateNumber
+  deletePlateNumber, updatePlateNumber
 } from "@/api/member/info";
 import {listOrder} from "@/api/order/order";
 import Template from "@/views/billing/template";
@@ -279,6 +295,11 @@ export default {
       // 会员充电订单
       orderList: [],
       orderTotal: 0,
+      // 弹出层
+      title: '',
+      open: false,
+      // 表单参数
+      form: {},
       // 查询订单列表参数
       queryOrderParams: {
         pageNum: 1,
@@ -333,6 +354,40 @@ export default {
         console.log("personalPileInfoList==", response);
       });
     },
+    // 修改车牌号
+    handleUpdate(plateNumber){
+      this.reset()
+      this.title = '修改车牌号信息'
+      this.open = true;
+      this.form.plateNumber = plateNumber;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      const param = {
+        memberId: this.memberId,
+        licensePlateNumber: this.form
+      }
+      this.$refs['form'].validate((valid) => {
+        updatePlateNumber(param).then((response) => {
+          this.$modal.msgSuccess('修改成功')
+          this.open = false
+          this.getMemberInfo()
+        })
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        memberId: null,
+        tpUpdatePlateNumber: null
+      }
+      this.resetForm('form')
+    },
     /** 删除车牌号信息按钮操作 */
     handleDelete(plateNumber) {
       // console.log("licensePlateNumber:" + plateNumber);