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

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<MemberPlateNumberRelation> resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info);
+			List<MemberPlateNumberVO> resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info);
 			response = new RestApiResponse<>(resultList);
 		} catch (Exception e) {
 			logger.error("通过 memberId 查询用户个人基本信息 error", e);

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<MemberPlateNumberRelation> list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation);
+		List<MemberPlateNumberVO> list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation);
 		if (CollectionUtils.isNotEmpty(list)) {
 			// 不为空说明该用户绑定过此车牌号
 			throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING);

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;
 
     /**

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<MemberPlateNumberRelation> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation);
+    public List<MemberPlateNumberVO> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation);
 
     /**
      * 新增用户车牌对应关系

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<MemberPlateNumberRelation> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation);
+    public List<MemberPlateNumberVO> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation);
 
     /**
      * 新增用户车牌对应关系

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())) {
+        carVinInfo = new CarVinInfo();
-            throw new BusinessException("", "");
-        }
         // 绑定操作
         carVinInfo.setVinCode(dto.getVinCode());
         carVinInfo.setStatus("1");

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<MemberPlateNumberRelation> list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation);
+		List<MemberPlateNumberVO> list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation);
 		List<String> plateNumberList = list.stream()
-				.map(MemberPlateNumberRelation::getLicensePlateNumber)
+				.map(MemberPlateNumberVO::getLicensePlateNumber)
 				.collect(Collectors.toList());
 		vo.setPlateNumberList(plateNumberList);
 		return vo;

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<MemberPlateNumberRelation> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation) {
+    public List<MemberPlateNumberVO> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation) {
         return memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation);
     }
 

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;
+}

jsowell-pile/src/main/resources/mapper/pile/CarVinInfoMapper.xml

@@ -112,8 +112,18 @@
     </select>
 
     <select id="getCarVinListByMemberId" resultType="com.jsowell.pile.vo.CarVinInfoVO">
-        select <include refid="Base_Column_List"/>
+        select
-        from car_vin_info
+            t1.id,
+            t1.vin_code as vinCode,
+            t1.status,
+            t1.member_id as memberId,
+            t2.mobile_number as phoneNumber,
+            t3.principal_balance as principalBalance,
+            t3.gift_balance as giftBalance
+        from
+            car_vin_info t1
+        join member_basic_info t2 on t1.member_id = t2.member_id and t1.del_flag = '0'
+        join member_wallet_info t3 on t2.member_id = t3.member_id and t2.status = '1'
         where member_id = #{memberId,jdbcType=VARCHAR}
             and del_flag = '0'
     </select>

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
     </sql>
 
-    <select id="selectMemberPlateNumberRelationList" parameterType="com.jsowell.pile.domain.MemberPlateNumberRelation" resultMap="MemberLicensePlateNumberRelationResult">
+    <select id="selectMemberPlateNumberRelationList" parameterType="com.jsowell.pile.domain.MemberPlateNumberRelation" resultType="com.jsowell.pile.vo.MemberPlateNumberVO">
         select
-            <include refid="Base_Column_List"/>
+            t1.id,
-        from member_plate_number_relation
+            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'
         <if test="memberId != null  and memberId != ''"> and member_id = #{memberId}</if>
         <if test="phoneNumber != null  and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>

jsowell-ui/src/views/pile/merchant/components/adapayMember.vue

@@ -2,24 +2,158 @@
     <div>
         <el-card class="box-card" shadow="hover">
             <div style="margin: 12px 0">汇付会员</div>
-            <div style="margin: 12px 0">
+            <div style="margin: 12px 0" v-if="ruleForm.nickname == ''">
                 没有查询到汇付会员配置，请点击按钮创建汇付会员
                 <!-- 刷新按钮 -->
                 <el-button size="medium" type="primary" @click="openCreateAdapayMember = true">
                     创建汇付会员
                 </el-button>
             </div>
+            <el-form
+                :model="ruleForm"
+                :rules="rules"
+                ref="ruleForm"
+                label-width="250px"
+                class="demo-ruleForm"
+                v-else
+            >
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="会员昵称" prop="nickname">
+                            <el-input v-model="ruleForm.nickname"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="会员邮箱" prop="email">
+                            <el-input v-model="ruleForm.email"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="会员性别" prop="gender">
+                            <el-radio-group v-model="ruleForm.gender">
+                                <el-radio label="MALE">男</el-radio>
+                                <el-radio label="FEMALE">女</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="会员地址" prop="location">
+                            <!-- type="textarea" -->
+                            <el-input v-model="ruleForm.location"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-form-item v-if="ruleForm.nickname == ''">
+                    <el-button
+                        type="primary"
+                        @click="submitForm('ruleForm')"
+                    >提交</el-button>
+                </el-form-item>
+            </el-form>
         </el-card>
 
         <el-card class="box-card" shadow="hover">
             <div style="margin: 12px 0">汇付结算账户</div>
-            <div style="margin: 12px 0">
+            <div style="margin: 12px 0" v-if="ruleForm.bank_acct_type == ''">
                 没有查询到汇付结算账户配置，请点击按钮创建汇付结算账户
                 <!-- 刷新按钮 -->
                 <el-button size="medium" type="primary" @click="openCreateAdapaySettleAccount = true">
                     创建汇付结算账户
                 </el-button>
             </div>
+            <el-form
+                :model="ruleForm"
+                :rules="rules"
+                ref="ruleForm"
+                label-width="250px"
+                class="demo-ruleForm"
+                v-else
+            >
+                <el-form-item label="银行账户类型" prop="bank_acct_type">
+                    <el-radio-group v-model="ruleForm.bank_acct_type">
+                        <el-radio label="1">对公</el-radio>
+                        <el-radio label="2">对私</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+
+                <el-form-item label="银行卡号" prop="card_id">
+                    <el-input v-model="ruleForm.card_id"></el-input>
+                </el-form-item>
+                <el-form-item label="银行卡对应的户名" prop="card_name">
+                    <el-input v-model="ruleForm.card_name"></el-input>
+                </el-form-item>
+                <el-form-item
+                    label="证件号"
+                    prop="cert_id"
+                    :rules="
+                            ruleForm.bank_acct_type === '2'
+                                ? rules.cert_id
+                                : [{ required: false }]
+                        "
+                >
+                    <el-input v-model="ruleForm.cert_id"></el-input>
+                </el-form-item>
+
+                <el-form-item
+                    label="证件类型"
+                    prop="cert_type"
+                    :rules="
+                            ruleForm.bank_acct_type === '2'
+                                ? rules.cert_type
+                                : [{ required: false }]
+                        "
+                >
+                    <el-input v-model="ruleForm.cert_type"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" prop="tel_no">
+                    <el-input v-model="ruleForm.tel_no"></el-input>
+                </el-form-item>
+                <el-form-item
+                    label="银行编码"
+                    prop="bank_code"
+                    :rules="
+                            ruleForm.bank_acct_type === '1'
+                                ? rules.bank_code
+                                : [{ required: false }]
+                        "
+                >
+                    <el-input v-model="ruleForm.bank_code"></el-input>
+                </el-form-item>
+                <el-form-item label="开户银行名称" prop="bank_name">
+                    <el-input v-model="ruleForm.bank_name"></el-input>
+                </el-form-item>
+                <el-form-item
+                    label="银行账户开户银行所在省份编码"
+                    prop="prov_code"
+                    :rules="
+                            ruleForm.bank_acct_type === '1'
+                                ? rules.prov_code
+                                : [{ required: false }]
+                        "
+                >
+                    <el-input v-model="ruleForm.prov_code"></el-input>
+                </el-form-item>
+                <el-form-item
+                    label="银行账户开户银行所在地区编码"
+                    prop="area_code"
+                    :rules="
+                            ruleForm.bank_acct_type === '1'
+                                ? rules.area_code
+                                : [{ required: false }]
+                        "
+                >
+                    <el-input v-model="ruleForm.area_code"></el-input>
+                </el-form-item>
+                <el-form-item v-if="ruleForm.bank_acct_type == ''">
+                    <el-button
+                        type="primary"
+                        @click="submitForm('ruleForm')"
+                    >提交</el-button
+                    >
+                </el-form-item>
+            </el-form>
         </el-card>
 
         <el-dialog title="创建汇付会员" :visible.sync="openCreateAdapayMember" width="150" append-to-body>
@@ -304,7 +438,6 @@ export default {
                         console.log("新增", response);
                         this.openCreateAdapayMember =false
                         this.selectAdapayMember()
-                        // this.getList();
                     });
                 } else {
                     console.log("提交表格失败");