diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index 3322b65fc..6f4541f02 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -23,6 +23,7 @@ import com.jsowell.pile.dto.WechatLoginDTO; import com.jsowell.pile.dto.WeixinPayDTO; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IMemberPlateNumberRelationService; +import com.jsowell.pile.vo.MemberPlateNumberVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.service.MemberService; @@ -227,7 +228,7 @@ public class MemberController extends BaseController { try { MemberPlateNumberRelation info = new MemberPlateNumberRelation(); info.setMemberId(memberId); - List resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info); + List resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info); response = new RestApiResponse<>(resultList); } catch (Exception e) { logger.error("通过 memberId 查询用户个人基本信息 error", e); 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 63c4f784f..c5c84b474 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -45,6 +45,7 @@ import com.jsowell.pile.service.IPileAuthCardService; import com.jsowell.pile.service.IPileMerchantInfoService; import com.jsowell.pile.transaction.dto.MemberTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; +import com.jsowell.pile.vo.MemberPlateNumberVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; @@ -312,7 +313,7 @@ public class MemberService { MemberPlateNumberRelation relation = new MemberPlateNumberRelation(); relation.setMemberId(dto.getMemberId()); relation.setLicensePlateNumber(dto.getCarNo()); - List list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation); + List list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation); if (CollectionUtils.isNotEmpty(list)) { // 不为空说明该用户绑定过此车牌号 throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java index ab22f71d2..b0ba6494d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; /** * 用户车牌对应关系对象 member_license_plate_number_relation - * + * * @author jsowell * @date 2023-03-06 */ @@ -16,25 +16,34 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -public class MemberPlateNumberRelation -{ +public class MemberPlateNumberRelation { private static final long serialVersionUID = 1L; - /** 主键 */ + /** + * 主键 + */ private Integer id; - /** 会员id */ + /** + * 会员id + */ @Excel(name = "会员id") private String memberId; - /** 手机号码 */ + /** + * 手机号码 + */ private String phoneNumber; - /** 车牌号 */ + /** + * 车牌号 + */ @Excel(name = "车牌号") private String licensePlateNumber; - /** 创建时间 */ + /** + * 创建时间 + */ private String createTime; /** 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 ad60799fe..3d24b953c 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 @@ -3,6 +3,7 @@ package com.jsowell.pile.mapper; import java.util.List; import com.jsowell.pile.domain.MemberPlateNumberRelation; +import com.jsowell.pile.vo.MemberPlateNumberVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -28,7 +29,7 @@ public interface MemberPlateNumberRelationMapper { * @param memberPlateNumberRelation 用户车牌对应关系 * @return 用户车牌对应关系集合 */ - public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation); + public List selectMemberPlateNumberRelationList(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 41bc7f653..ddb7debdd 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 @@ -2,6 +2,7 @@ package com.jsowell.pile.service; import java.util.List; import com.jsowell.pile.domain.MemberPlateNumberRelation; +import com.jsowell.pile.vo.MemberPlateNumberVO; import org.apache.ibatis.annotations.Param; /** @@ -26,7 +27,7 @@ public interface IMemberPlateNumberRelationService * @param memberPlateNumberRelation 用户车牌对应关系 * @return 用户车牌对应关系集合 */ - public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation); + public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation); /** * 新增用户车牌对应关系 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarVinInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarVinInfoServiceImpl.java index 40ded08e3..7326b101e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarVinInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarVinInfoServiceImpl.java @@ -153,9 +153,7 @@ public class CarVinInfoServiceImpl implements ICarVinInfoService { if (carVinInfo != null) { throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL); } - if (!StringUtils.equals("1", carVinInfo.getStatus())) { - throw new BusinessException("", ""); - } + carVinInfo = new CarVinInfo(); // 绑定操作 carVinInfo.setVinCode(dto.getVinCode()); carVinInfo.setStatus("1"); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index a34ded99f..633fd7e5f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -13,6 +13,7 @@ import com.jsowell.pile.mapper.MemberWalletInfoMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.vo.MemberPlateNumberVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; @@ -249,9 +250,9 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { // 查询用户车牌号 MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation(); memberPlateNumberRelation.setMemberId(memberId); - List list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation); + List list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation); List plateNumberList = list.stream() - .map(MemberPlateNumberRelation::getLicensePlateNumber) + .map(MemberPlateNumberVO::getLicensePlateNumber) .collect(Collectors.toList()); vo.setPlateNumberList(plateNumberList); return vo; 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 b6899ad45..83c5048da 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 @@ -4,6 +4,7 @@ import java.util.List; import java.util.Locale; import com.jsowell.common.util.StringUtils; +import com.jsowell.pile.vo.MemberPlateNumberVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper; @@ -39,7 +40,7 @@ public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberR * @return 用户车牌对应关系 */ @Override - public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation) { + public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation) { return memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java new file mode 100644 index 000000000..7d4f086d6 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java @@ -0,0 +1,42 @@ +package com.jsowell.pile.vo; + +import com.jsowell.common.annotation.Excel; +import lombok.Data; + +@Data +public class MemberPlateNumberVO { + /** + * 主键 + */ + private Integer id; + + /** + * 会员id + */ + private String memberId; + + /** + * 手机号码 + */ + private String phoneNumber; + + /** + * 车牌号 + */ + private String licensePlateNumber; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 删除标识 + */ + private String delFlag; + + /** + * 车辆vin码 + */ + private String vinCode; +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/CarVinInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/CarVinInfoMapper.xml index b87a8c70c..88e9d1305 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/CarVinInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/CarVinInfoMapper.xml @@ -112,8 +112,18 @@ diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml index 03dc8e386..6f8cd410d 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml @@ -22,10 +22,17 @@ id, member_id, phone_number, license_plate_number, create_time, del_flag - select - - from member_plate_number_relation + t1.id, + t1.member_id as memberId, + t1.phone_number as phoneNumber, + t1.license_plate_number as licensePlateNumber, + t1.create_time as createTime, + t1.del_flag as delFlag, + t2.vin_code as vinCode + from member_plate_number_relation t1 + join car_vin_info t2 on t1.member_id = t2.member_id where del_flag = '0' and member_id = #{memberId} and phone_number = #{phoneNumber} diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue index 3ee2ab05b..d69cc918c 100644 --- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue +++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue @@ -2,24 +2,158 @@
汇付会员
-
+
没有查询到汇付会员配置,请点击按钮创建汇付会员 创建汇付会员
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提交 + +
汇付结算账户
-
+
没有查询到汇付结算账户配置,请点击按钮创建汇付结算账户 创建汇付结算账户
+ + + + 对公 + 对私 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提交 + + @@ -304,7 +438,6 @@ export default { console.log("新增", response); this.openCreateAdapayMember =false this.selectAdapayMember() - // this.getList(); }); } else { console.log("提交表格失败");