小程序查询用户信息新增默认充电金额字段

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -693,6 +693,9 @@ public class MemberService {
 			if (StringUtils.isNotBlank(dto.getNickName())) {
 				memberBasicInfo.setNickName(dto.getNickName());
 			}
+			if (StringUtils.isNotBlank(dto.getDefaultChargeAmount())) {
+				memberBasicInfo.setDefaultChargeAmount(new BigDecimal(dto.getDefaultChargeAmount()));
+			}
 			memberBasicInfoService.updateMemberBasicInfo(memberBasicInfo);
 		}
 

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java

@@ -346,7 +346,11 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler {
         }
         dto.setConnectorCode(connectorCode);
         dto.setTransactionCode(transactionCode);
-        dto.setChargeAmount(new BigDecimal(accountBalance));
+        if (memberWalletVO.getDefaultChargeAmount() != null && memberWalletVO.getDefaultChargeAmount().compareTo(BigDecimal.ZERO) > 0) {
+            dto.setChargeAmount(memberWalletVO.getDefaultChargeAmount());
+        }else {
+            dto.setChargeAmount(new BigDecimal(accountBalance));
+        }
         dto.setPayMode(payMode);
         dto.setStartMode(StringUtils.equals("01", startMode) ? "2" : "5");
         dto.setMemberId(memberWalletVO.getMemberId());

jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberBasicInfo.java

@@ -94,6 +94,12 @@ public class MemberBasicInfo extends BaseEntity {
 	@Excel(name = "所属运营商")
 	private Long merchantId;
 
+	/**
+	 * 默认充电金额
+	 */
+	@Excel(name = "默认充电金额")
+	private BigDecimal defaultChargeAmount;
+
 	/**
 	 * 删除标识（0-正常；1-删除）
 	 */
@@ -111,6 +117,7 @@ public class MemberBasicInfo extends BaseEntity {
 				.append("avatarUrl", avatarUrl)
 				.append("mobileNumber", mobileNumber)
 				.append("merchantId", merchantId)
+				.append("defaultChargeAmount", defaultChargeAmount)
 				.append("delFlag", delFlag)
 				.toString();
 	}

jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberRegisterDTO.java

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 /**
  * 用户注册前台参数
  *
@@ -35,4 +37,9 @@ public class MemberRegisterDTO {
      * 手机号码
      */
     private String mobileNumber;
+
+    /**
+     * 默认充电启动金额
+     */
+    private String defaultChargeAmount;
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java

@@ -22,6 +22,11 @@ public class ConfirmStartChargingMemberVO {
      */
     private String plateNumber;
 
+    /**
+     * 默认充电金额
+     */
+    private BigDecimal defaultChargeAmount;
+
     /**
      * 本金金额
      */

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberVO.java

@@ -44,6 +44,11 @@ public class MemberVO {
      */
     private String merchantId;
 
+    /**
+     * 默认充电金额
+     */
+    private BigDecimal defaultChargeAmount;
+
     /**
      * 运营商名称
      */

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

@@ -17,6 +17,7 @@
         <result property="avatarUrl"    column="avatar_url"    />
         <result property="mobileNumber"    column="mobile_number"    />
         <result property="merchantId"    column="merchant_id"    />
+        <result property="defaultChargeAmount" column="default_charge_amount"/>
         <result property="remark"    column="remark"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
@@ -34,7 +35,7 @@
     <sql id="Base_Column_List">
         <!--@mbg.generated PileBillingTemplate-->
         id, member_id, open_id, buyer_id, license_plate_number, nick_name,logic_card, physics_card, status, avatar_url,
-        mobile_number, merchant_id, remark,
+        mobile_number, merchant_id, default_charge_amount, remark,
         create_time, create_by, update_time, update_by, del_flag
     </sql>
 
@@ -70,6 +71,7 @@
             <if test="avatarUrl != null">avatar_url,</if>
             <if test="mobileNumber != null">mobile_number,</if>
             <if test="merchantId != null">merchant_id,</if>
+            <if test="defaultChargeAmount != null">default_charge_amount,</if>
             <if test="remark != null">remark,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
@@ -88,6 +90,7 @@
             <if test="avatarUrl != null">#{avatarUrl},</if>
             <if test="mobileNumber != null">#{mobileNumber},</if>
             <if test="merchantId != null">#{merchantId},</if>
+            <if test="defaultChargeAmount != null">#{defaultChargeAmount},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -110,6 +113,7 @@
             <if test="avatarUrl != null">avatar_url = #{avatarUrl},</if>
             <if test="mobileNumber != null">mobile_number = #{mobileNumber},</if>
             <if test="merchantId != null">merchant_id = #{merchantId},</if>
+            <if test="defaultChargeAmount != null">default_charge_amount = #{defaultChargeAmount},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -201,6 +205,7 @@
             t1.avatar_url as avatarUrl,
             t1.mobile_number as mobileNumber,
             t1.merchant_id as merchantId,
+            t1.default_charge_amount as defaultChargeAmount,
             t1.create_time as createTime
             <!--t2.principal_balance as principalBalance,
             t2.gift_balance as giftBalance-->
@@ -327,6 +332,7 @@
     <select id="queryMemberInfoByVinCode" resultType="com.jsowell.pile.vo.base.ConfirmStartChargingMemberVO">
         select
             t1.member_id as memberId,
+            t1.default_charge_amount as defaultChargeAmount,
             t2.license_plate_number as plateNumber,
             t3.principal_balance as principalBalance,
             t3.gift_balance as giftBalance