diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 12090a017..dcbeab866 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -257,6 +257,6 @@ public class MemberService { throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING); } relation.setPhoneNumber(dto.getPhoneNumber()); - memberPlateNumberRelationService.insertMemberLicensePlateNumberRelation(relation); + memberPlateNumberRelationService.insertMemberPlateNumberRelation(relation); } } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index 938958346..1a3e5f098 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -10,8 +10,10 @@ import com.jsowell.common.enums.BusinessType; import com.jsowell.common.enums.uniapp.BalanceChangesEnum; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; +import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; import com.jsowell.pile.service.IMemberBasicInfoService; +import com.jsowell.pile.service.IMemberPlateNumberRelationService; import com.jsowell.pile.service.IMemberTransactionRecordService; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; @@ -45,6 +47,8 @@ public class MemberBasicInfoController extends BaseController { @Autowired private IMemberTransactionRecordService memberTransactionRecordService; + @Autowired + private IMemberPlateNumberRelationService memberPlateNumberRelationService; /** * 查询会员基础信息列表 */ @@ -156,4 +160,15 @@ public class MemberBasicInfoController extends BaseController { List list = memberTransactionRecordService.selectMemberTransactionRecordList(dto.getMemberId()); return getDataTable(list); } + /** + * 删除会员绑定的车牌号信息 + */ + @PreAuthorize("@ss.hasPermi('member:info:remove')") + @Log(title = "会员绑定的车牌号信息", businessType = BusinessType.DELETE) + @PostMapping("/deletePlateNumber") + public AjaxResult deletePlateNumber(@RequestBody MemberPlateNumberRelation relation){ + int i = memberPlateNumberRelationService.unbindingPlateNumber(relation.getMemberId(), relation.getLicensePlateNumber()); + logger.info("后管接触绑定用户:{} 的车牌号:{}", relation.getMemberId(), relation.getPhoneNumber()); + return toAjax(i); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java index 0cc6f98ac..ad60799fe 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java @@ -20,31 +20,34 @@ public interface MemberPlateNumberRelationMapper { * @param id 用户车牌对应关系主键 * @return 用户车牌对应关系 */ - public MemberPlateNumberRelation selectMemberLicensePlateNumberRelationById(Integer id); + public MemberPlateNumberRelation selectMemberPlateNumberRelationById(Integer id); /** * 查询用户车牌对应关系列表 * - * @param memberLicensePlateNumberRelation 用户车牌对应关系 + * @param memberPlateNumberRelation 用户车牌对应关系 * @return 用户车牌对应关系集合 */ - public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberLicensePlateNumberRelation); + public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation); /** * 新增用户车牌对应关系 * - * @param memberLicensePlateNumberRelation 用户车牌对应关系 + * @param memberPlateNumberRelation 用户车牌对应关系 * @return 结果 */ - public int insertMemberLicensePlateNumberRelation(MemberPlateNumberRelation memberLicensePlateNumberRelation); + public int insertMemberPlateNumberRelation(MemberPlateNumberRelation memberPlateNumberRelation); /** * 修改用户车牌对应关系 * - * @param memberLicensePlateNumberRelation 用户车牌对应关系 + * @param memberPlateNumberRelation 用户车牌对应关系 * @return 结果 */ - public int updateMemberLicensePlateNumberRelation(MemberPlateNumberRelation memberLicensePlateNumberRelation); + public int updateMemberPlateNumberRelation(MemberPlateNumberRelation memberPlateNumberRelation); + + + int updatePlateNumber(MemberPlateNumberRelation memberPlateNumberRelation); // /** // * 删除用户车牌对应关系 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java index f5a4b3302..41bc7f653 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java @@ -18,31 +18,33 @@ public interface IMemberPlateNumberRelationService * @param id 用户车牌对应关系主键 * @return 用户车牌对应关系 */ - public MemberPlateNumberRelation selectMemberLicensePlateNumberRelationById(Integer id); + public MemberPlateNumberRelation selectMemberPlateNumberRelationById(Integer id); /** * 查询用户车牌对应关系列表 * - * @param memberLicensePlateNumberRelation 用户车牌对应关系 + * @param memberPlateNumberRelation 用户车牌对应关系 * @return 用户车牌对应关系集合 */ - public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberLicensePlateNumberRelation); + public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation); /** * 新增用户车牌对应关系 * - * @param memberLicensePlateNumberRelation 用户车牌对应关系 + * @param memberPlateNumberRelation 用户车牌对应关系 * @return 结果 */ - public int insertMemberLicensePlateNumberRelation(MemberPlateNumberRelation memberLicensePlateNumberRelation); + public int insertMemberPlateNumberRelation(MemberPlateNumberRelation memberPlateNumberRelation); /** * 修改用户车牌对应关系 * - * @param memberLicensePlateNumberRelation 用户车牌对应关系 + * @param memberPlateNumberRelation 用户车牌对应关系 * @return 结果 */ - public int updateMemberLicensePlateNumberRelation(MemberPlateNumberRelation memberLicensePlateNumberRelation); + public int updateMemberPlateNumberRelation(MemberPlateNumberRelation memberPlateNumberRelation); + + int updatePlateNumber(MemberPlateNumberRelation memberPlateNumberRelation); // /** // * 批量删除用户车牌对应关系 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java index 33e1388bd..af56d8f2a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java @@ -17,7 +17,7 @@ import com.jsowell.pile.service.IMemberPlateNumberRelationService; @Service public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberRelationService { @Autowired - private MemberPlateNumberRelationMapper memberLicensePlateNumberRelationMapper; + private MemberPlateNumberRelationMapper memberPlateNumberRelationMapper; /** * 查询用户车牌对应关系 @@ -26,41 +26,46 @@ public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberR * @return 用户车牌对应关系 */ @Override - public MemberPlateNumberRelation selectMemberLicensePlateNumberRelationById(Integer id) { - return memberLicensePlateNumberRelationMapper.selectMemberLicensePlateNumberRelationById(id); + public MemberPlateNumberRelation selectMemberPlateNumberRelationById(Integer id) { + return memberPlateNumberRelationMapper.selectMemberPlateNumberRelationById(id); } /** * 查询用户车牌对应关系列表 * - * @param memberLicensePlateNumberRelation 用户车牌对应关系 + * @param memberPlateNumberRelation 用户车牌对应关系 * @return 用户车牌对应关系 */ @Override - public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberLicensePlateNumberRelation) { - return memberLicensePlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberLicensePlateNumberRelation); + public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation) { + return memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation); } /** * 新增用户车牌对应关系 * - * @param memberLicensePlateNumberRelation 用户车牌对应关系 + * @param memberPlateNumberRelation 用户车牌对应关系 * @return 结果 */ @Override - public int insertMemberLicensePlateNumberRelation(MemberPlateNumberRelation memberLicensePlateNumberRelation) { - return memberLicensePlateNumberRelationMapper.insertMemberLicensePlateNumberRelation(memberLicensePlateNumberRelation); + public int insertMemberPlateNumberRelation(MemberPlateNumberRelation memberPlateNumberRelation) { + return memberPlateNumberRelationMapper.insertMemberPlateNumberRelation(memberPlateNumberRelation); } /** * 修改用户车牌对应关系 * - * @param memberLicensePlateNumberRelation 用户车牌对应关系 + * @param memberPlateNumberRelation 用户车牌对应关系 * @return 结果 */ @Override - public int updateMemberLicensePlateNumberRelation(MemberPlateNumberRelation memberLicensePlateNumberRelation) { - return memberLicensePlateNumberRelationMapper.updateMemberLicensePlateNumberRelation(memberLicensePlateNumberRelation); + public int updateMemberPlateNumberRelation(MemberPlateNumberRelation memberPlateNumberRelation) { + return memberPlateNumberRelationMapper.updateMemberPlateNumberRelation(memberPlateNumberRelation); + } + + @Override + public int updatePlateNumber(MemberPlateNumberRelation memberPlateNumberRelation) { + return memberPlateNumberRelationMapper.updatePlateNumber(memberPlateNumberRelation); } // /** @@ -93,11 +98,11 @@ public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberR */ @Override public int deleteCarNoByParams(List ids){ - return memberLicensePlateNumberRelationMapper.deleteCarNoByParams(ids); + return memberPlateNumberRelationMapper.deleteCarNoByParams(ids); } @Override public int unbindingPlateNumber(String memberId, String plateNumber) { - return memberLicensePlateNumberRelationMapper.unbindingPlateNumber(memberId, plateNumber); + return memberPlateNumberRelationMapper.unbindingPlateNumber(memberId, plateNumber); } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml index 88f4408b1..6332757d3 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml @@ -34,12 +34,12 @@ and del_flag = '0' - where id = #{id} - + insert into member_plate_number_relation member_id, @@ -53,7 +53,7 @@ - + update member_plate_number_relation member_id = #{memberId}, @@ -89,4 +89,9 @@ where member_id = #{memberId,jdbcType=VARCHAR} and license_plate_number = #{plateNumber,jdbcType=VARCHAR} + + + update set license_plate_number = #{licensePlateNumber,jdbcType=VARCHAR} + where member_id = #{memberId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/jsowell-ui/src/api/member/info.js b/jsowell-ui/src/api/member/info.js index 94f80e563..ae93c1041 100644 --- a/jsowell-ui/src/api/member/info.js +++ b/jsowell-ui/src/api/member/info.js @@ -77,3 +77,12 @@ export function getMemberTransactionRecordList(data) { data: data }) } + +// 删除车牌号信息 +export function deletePlateNumber(data) { + return request({ + url: '/member/info/deletePlateNumber', + method: 'post', + data: data + }) +} diff --git a/jsowell-ui/src/views/member/info/detail.vue b/jsowell-ui/src/views/member/info/detail.vue index 0f5790f32..51ac6adc8 100644 --- a/jsowell-ui/src/views/member/info/detail.vue +++ b/jsowell-ui/src/views/member/info/detail.vue @@ -24,8 +24,22 @@ {{memberInfo.nickName}} - - {{plateNumber}} + + {{item}} + 修改 + 删除 {{memberInfo.principalBalance}} @@ -243,12 +257,15 @@ import { getInfo, getMemberBalanceChanges, getMemberPersonPileInfo, - getMemberTransactionRecordList + getMemberTransactionRecordList, + deletePlateNumber } from "@/api/member/info"; import {listOrder} from "@/api/order/order"; +import Template from "@/views/billing/template"; export default { name: "memberDetail", + components: {Template}, dicts: ['order_status', 'start_mode', 'pay_mode', 'pay_status', 'pile_status'], data() { return { @@ -316,7 +333,23 @@ export default { console.log("personalPileInfoList==", response); }); }, - + /** 删除车牌号信息按钮操作 */ + handleDelete(plateNumber) { + // console.log("licensePlateNumber:" + plateNumber); + const param = { + memberId: this.memberId, + licensePlateNumber: plateNumber + }; + console.log("memberId:" + this.memberId); + console.log("licensePlateNumber:" + plateNumber); + this.$modal + .confirm('是否确认删除车牌号"' + plateNumber + '"').then(function() { + return deletePlateNumber(param); + }).then(() => { + this.getMemberInfo(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => {}); + }, // 查询会员充电订单 getOrderList() { // this.orderListLoading = true;