update 用户总余额字段名

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java

@@ -27,7 +27,6 @@ import com.jsowell.pile.mapper.MemberWalletLogMapper;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.util.MerchantUtils;
 import com.jsowell.pile.util.UserUtils;
-import com.jsowell.pile.vo.base.LoginUserDetailVO;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.uniapp.*;
 import com.jsowell.pile.vo.web.PlatformTesterVO;
@@ -456,7 +455,7 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
 			vo.setRegistrationDays(days);
 			vo.setPrincipalBalance(principalBalance);
 			vo.setGiftBalance(giftBalance);
-			vo.setTotalAccountAmount(vo.getPrincipalBalance().add(vo.getGiftBalance()));
+			vo.setTotalBalance(vo.getPrincipalBalance().add(vo.getGiftBalance()));
 		} catch (Exception e) {
 			log.error("查询用户余额异常 memberId:{}, merchantId:{}", memberId, merchantId, e);
 		}

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -14,7 +14,6 @@ import com.jsowell.adapay.response.*;
 import com.jsowell.adapay.service.AdapayService;
 import com.jsowell.adapay.vo.OrderSettleResult;
 import com.jsowell.adapay.vo.PaymentInfo;
-import com.jsowell.common.UserAgentUtils;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
@@ -31,7 +30,6 @@ import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum;
 import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
 import com.jsowell.common.enums.ykc.*;
 import com.jsowell.common.exception.BusinessException;
-import com.jsowell.common.util.BytesUtil;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
@@ -39,7 +37,6 @@ import com.jsowell.common.util.bean.BeanUtils;
 import com.jsowell.common.util.id.IdUtils;
 import com.jsowell.common.util.id.SnowflakeIdWorker;
 import com.jsowell.pile.domain.*;
-import com.jsowell.pile.domain.ykcCommond.ReservationChargingCommand;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
 import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO;
@@ -2421,7 +2418,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
             if (memberVO == null) {
                 throw new BusinessException(ReturnCodeEnum.CODE_GET_MEMBER_ACCOUNT_AMOUNT_ERROR);
             }
-            accountBalance = memberVO.getTotalAccountAmount();
+            accountBalance = memberVO.getTotalBalance();
             if (accountBalance.compareTo(BigDecimal.ZERO) <= 0) {
                 logger.info("充电桩主动申请启动充电生成订单 余额不足, memberId:{}, MemberVO:{}", dto.getMemberId(), JSON.toJSONString(memberVO));
                 throw new BusinessException(ReturnCodeEnum.CODE_BALANCE_IS_INSUFFICIENT);

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java

@@ -11,10 +11,8 @@ import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.ykc.*;
-import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
-import com.jsowell.common.util.id.IdUtils;
 import com.jsowell.pile.domain.*;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.service.*;
@@ -23,7 +21,6 @@ import com.jsowell.pile.vo.uniapp.MemberVO;
 import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;
 import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO;
 import com.jsowell.pile.vo.web.*;
-import com.jsowell.wxpay.dto.WechatSendMsgDTO;
 import com.jsowell.wxpay.service.WxAppletRemoteService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
@@ -744,7 +741,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
     protected Map<String, BigDecimal> calculateTheAmount(MemberVO memberVO) {
         BigDecimal principalBalancePay;
         BigDecimal giftBalancePay;
-        BigDecimal totalAccountAmount = memberVO.getTotalAccountAmount();
+        BigDecimal totalAccountAmount = memberVO.getTotalBalance();
         // 余额支付最大下发200
         BigDecimal defaultAmount = Constants.BALANCE_PAY_MAX_AMOUNT;
         if (totalAccountAmount.compareTo(defaultAmount) < 0) {

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java

@@ -253,7 +253,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         // 查询该会员的余额 在所属运营商的余额
         MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId(), merchantId);
         // 总余额
-        BigDecimal totalAccountAmount = memberVO.getTotalAccountAmount();
+        BigDecimal totalAccountAmount = memberVO.getTotalBalance();
         if (totalAccountAmount.compareTo(chargeAmount) < 0) {
             // 总余额小于充电金额
             throw new BusinessException(ReturnCodeEnum.CODE_BALANCE_IS_INSUFFICIENT);

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java

@@ -237,7 +237,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
         // 查询该会员的余额 在所属运营商的余额
         MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(memberId, merchantId);
         // 总余额
-        BigDecimal totalAccountAmount = memberVO.getTotalAccountAmount();
+        BigDecimal totalAccountAmount = memberVO.getTotalBalance();
         if (totalAccountAmount.compareTo(chargeAmount) < 0) {
             // 总余额小于充电金额
             throw new BusinessException(ReturnCodeEnum.CODE_BALANCE_IS_INSUFFICIENT);

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

@@ -63,7 +63,7 @@ public class MemberVO {
     /**
      * 总账户余额
      */
-    private BigDecimal totalAccountAmount;
+    private BigDecimal totalBalance;
 
     /**
      * 注册天数