diff --git a/jsowell-admin/src/main/java/com/jsowell/web/core/config/SwaggerConfig.java b/jsowell-admin/src/main/java/com/jsowell/web/core/config/SwaggerConfig.java index 31a8df346..265ed32d4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/core/config/SwaggerConfig.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/core/config/SwaggerConfig.java @@ -110,7 +110,7 @@ public class SwaggerConfig { // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题:举视后台管理系统_接口文档") + .title("标题:有电充后台管理系统_接口文档") // 描述 // .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/SMSUtil.java b/jsowell-common/src/main/java/com/jsowell/common/util/SMSUtil.java index ec3dc4d9e..3b1f9d727 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/SMSUtil.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/SMSUtil.java @@ -35,7 +35,7 @@ public class SMSUtil { private static final int APP_ID = 1400536771; // 签名,使用的是签名内容,而不是签名ID - private static final String SMS_SIGN = "举视新能源"; + private static final String SMS_SIGN = "有电充新能源"; // 国家码 如 86 为中国 private static final String NATION_CODE = "86"; diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index e2f01f133..22d4676e1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -9,6 +9,7 @@ import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.model.Member; import com.huifu.adapay.model.SettleAccount; import com.jsowell.adapay.dto.AdapayMemberInfoDTO; +import com.jsowell.adapay.vo.AdapayAccountBalanceVO; import com.jsowell.adapay.vo.AdapayMemberInfoVO; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.StringUtils; @@ -23,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Map; @Slf4j @@ -126,25 +128,48 @@ public class AdapayMemberService { Map settleCount = SettleAccount.create(settleCountParams); log.info("创建汇付结算账户result:{}", settleCount); - AdapaySettleAccount adapaySettleAccount = new AdapaySettleAccount(); - adapaySettleAccount.setMerchantId(dto.getMerchantId()); - adapaySettleAccount.setAdapayMemberId(dto.getAdapayMemberId()); - adapaySettleAccount.setCardId(dto.getCardId()); - adapaySettleAccount.setCardName(dto.getCardName()); - adapaySettleAccount.setCertId(dto.getCertId()); - adapaySettleAccount.setCertType("00"); - adapaySettleAccount.setTelNo(dto.getTelNo()); - adapaySettleAccount.setBankCode(dto.getBankCode()); - adapaySettleAccount.setBankAcctType(dto.getBankAcctType()); - adapaySettleAccount.setProvCode(dto.getProvCode()); - adapaySettleAccount.setAreaCode(dto.getAreaCode()); - adapaySettleAccountService.insertAdapaySettleAccount(adapaySettleAccount); + if (settleCount != null && StringUtils.equals((String) settleCount.get("status"), "succeeded")) { + AdapaySettleAccount adapaySettleAccount = new AdapaySettleAccount(); + adapaySettleAccount.setSettleAccountId((String) settleCount.get("id")); + adapaySettleAccount.setMerchantId(dto.getMerchantId()); + adapaySettleAccount.setAdapayMemberId(dto.getAdapayMemberId()); + adapaySettleAccount.setCardId(dto.getCardId()); + adapaySettleAccount.setCardName(dto.getCardName()); + adapaySettleAccount.setCertId(dto.getCertId()); + adapaySettleAccount.setCertType("00"); + adapaySettleAccount.setTelNo(dto.getTelNo()); + adapaySettleAccount.setBankCode(dto.getBankCode()); + adapaySettleAccount.setBankAcctType(dto.getBankAcctType()); + adapaySettleAccount.setProvCode(dto.getProvCode()); + adapaySettleAccount.setAreaCode(dto.getAreaCode()); + adapaySettleAccountService.insertAdapaySettleAccount(adapaySettleAccount); + } } /** * 查询汇付会员账户余额 */ - public void queryAdapayAccountBalance() { - + public AdapayAccountBalanceVO queryAdapayAccountBalance(String merchantId) throws BaseAdaPayException { + AdapayAccountBalanceVO vo = AdapayAccountBalanceVO.builder().build(); + // 通过merchantId 查询出汇付会员id 和 结算账户id,用来查询余额 + AdapaySettleAccount adapaySettleAccount = adapaySettleAccountService.selectByMerchantId(merchantId); + if (adapaySettleAccount == null) { + return vo; + } + String settle_account_id = adapaySettleAccount.getAdapayMemberId(); + String member_id = adapaySettleAccount.getAdapayMemberId(); + Map queryParams = Maps.newHashMap(); + queryParams.put("settle_account_id", settle_account_id); + queryParams.put("member_id", member_id); + queryParams.put("app_id", ADAPAY_APP_ID); + Map settleCount = SettleAccount.balance(queryParams); + if (settleCount == null || settleCount.isEmpty() || StringUtils.equals((String)settleCount.get("status"), "succeeded")) { + return vo; + } + vo.setFrzBalance(new BigDecimal((String) settleCount.get("frz_balance"))); + vo.setAcctBalance(new BigDecimal((String) settleCount.get("acct_balance"))); + vo.setAvlBalance(new BigDecimal((String) settleCount.get("avl_balance"))); + vo.setLastAvlBalance(new BigDecimal((String) settleCount.get("last_avl_balance"))); + return vo; } } diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayAccountBalanceVO.java b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayAccountBalanceVO.java new file mode 100644 index 000000000..9d692a1e5 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayAccountBalanceVO.java @@ -0,0 +1,25 @@ +package com.jsowell.adapay.vo; + +import lombok.*; + +import java.math.BigDecimal; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class AdapayAccountBalanceVO { + // 账户余额,账户余额 = 可用余额 + 冻结余额 + private BigDecimal acctBalance; + + // 可用余额,该余额大于0时,才可发起取现。 + private BigDecimal avlBalance; + + // 冻结余额,当配置了自动结算功能,在每日发起结算时会将可用余额转为冻结金额。该部分金额不允许取现。 + private BigDecimal frzBalance; + + // 昨日日终余额。 + private BigDecimal lastAvlBalance; + +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapaySettleAccount.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapaySettleAccount.java index 8a26e46c4..d7759ac23 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapaySettleAccount.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapaySettleAccount.java @@ -2,6 +2,8 @@ package com.jsowell.pile.domain; import com.jsowell.common.annotation.Excel; import com.jsowell.common.core.domain.BaseEntity; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author jsowell * @date 2023-06-12 */ +@Getter +@Setter public class AdapaySettleAccount extends BaseEntity { private static final long serialVersionUID = 1L; @@ -31,6 +35,12 @@ public class AdapaySettleAccount extends BaseEntity { @Excel(name = "汇付会员id") private String adapayMemberId; + /** + * 结算账户对象 id + */ + @Excel(name = "结算账户对象id") + private String settleAccountId; + /** * 银行卡号 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapaySettleAccountMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapaySettleAccountMapper.java index 2cccc848a..2286adb7c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapaySettleAccountMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/AdapaySettleAccountMapper.java @@ -1,6 +1,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.AdapaySettleAccount; +import org.springframework.stereotype.Repository; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @author jsowell * @date 2023-06-12 */ +@Repository public interface AdapaySettleAccountMapper { /** * 查询汇付结算账户 @@ -58,4 +60,6 @@ public interface AdapaySettleAccountMapper { * @return 结果 */ public int deleteAdapaySettleAccountByIds(Long[] ids); + + AdapaySettleAccount selectByMerchantId(String merchantId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapaySettleAccountService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapaySettleAccountService.java index 4924a5f1c..de939b12a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapaySettleAccountService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IAdapaySettleAccountService.java @@ -58,4 +58,6 @@ public interface IAdapaySettleAccountService { * @return 结果 */ public int deleteAdapaySettleAccountById(Long id); + + AdapaySettleAccount selectByMerchantId(String merchantId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapaySettleAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapaySettleAccountServiceImpl.java index 2875a3332..33eebf7e8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapaySettleAccountServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapaySettleAccountServiceImpl.java @@ -87,4 +87,9 @@ public class AdapaySettleAccountServiceImpl implements IAdapaySettleAccountServi public int deleteAdapaySettleAccountById(Long id) { return adapaySettleAccountMapper.deleteAdapaySettleAccountById(id); } + + @Override + public AdapaySettleAccount selectByMerchantId(String merchantId) { + return adapaySettleAccountMapper.selectByMerchantId(merchantId); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapaySettleAccountMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapaySettleAccountMapper.xml index e7e644ace..3438b107a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapaySettleAccountMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/AdapaySettleAccountMapper.xml @@ -8,6 +8,7 @@ + @@ -25,8 +26,14 @@ + + id, merchant_id, adapay_member_id, settle_account_id, card_id, card_name, cert_id, cert_type, tel_no, bank_code, bank_name, bank_acct_type, prov_code, area_code, create_time, create_by, update_time, update_by, del_flag + + - select id, merchant_id, adapay_member_id, card_id, card_name, cert_id, cert_type, tel_no, bank_code, bank_name, bank_acct_type, prov_code, area_code, create_time, create_by, update_time, update_by, del_flag from adapay_settle_account + select + + from adapay_settle_account + select + + from adapay_settle_account + where del_flag = '0' + and merchant_id = #{merchantId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/jsowell-ui/.env.development b/jsowell-ui/.env.development index 8bd201e1c..876d2b8d5 100644 --- a/jsowell-ui/.env.development +++ b/jsowell-ui/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 举视后台管理系统 +VUE_APP_TITLE = 有电充后台管理系统 # 开发环境配置 ENV = 'development' -# 举视后台管理系统/开发环境 +# 有电充后台管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/jsowell-ui/.env.production b/jsowell-ui/.env.production index ce94db862..404271ac3 100644 --- a/jsowell-ui/.env.production +++ b/jsowell-ui/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 举视后台管理系统 +VUE_APP_TITLE = 有电充后台管理系统 # 生产环境配置 ENV = 'production' -# 举视后台管理系统/生产环境 +# 有电充后台管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/jsowell-ui/.env.staging b/jsowell-ui/.env.staging index c740e5668..dc151e18e 100644 --- a/jsowell-ui/.env.staging +++ b/jsowell-ui/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 举视后台管理系统 +VUE_APP_TITLE = 有电充后台管理系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 举视后台管理系统/测试环境 +# 有电充后台管理系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/jsowell-ui/package.json b/jsowell-ui/package.json index f47a91539..ce708521b 100644 --- a/jsowell-ui/package.json +++ b/jsowell-ui/package.json @@ -1,7 +1,7 @@ { "name": "jsowell", "version": "1.0.0", - "description": "举视管理系统", + "description": "有电充管理系统", "scripts": { "dev": "vue-cli-service serve", "build:prod": "vue-cli-service build", diff --git a/jsowell-ui/src/layout/components/Sidebar/Logo.vue b/jsowell-ui/src/layout/components/Sidebar/Logo.vue index bcc14caf0..25c4363b0 100644 --- a/jsowell-ui/src/layout/components/Sidebar/Logo.vue +++ b/jsowell-ui/src/layout/components/Sidebar/Logo.vue @@ -35,7 +35,7 @@ export default { }, data() { return { - title: '举视后台管理系统', + title: '有电充后台管理系统', logo: logoImg } } diff --git a/jsowell-ui/src/views/homeIndex/homeIndex.vue b/jsowell-ui/src/views/homeIndex/homeIndex.vue index 511bef7cc..2ac255561 100644 --- a/jsowell-ui/src/views/homeIndex/homeIndex.vue +++ b/jsowell-ui/src/views/homeIndex/homeIndex.vue @@ -152,7 +152,7 @@ export default { orderInfo: [], tableData: [{ pileSn:'9527', - stationName:'举视充电桩', + stationName:'有电充充电桩', stationAddress:'昆山市黄埔江南路', type:'直流', power:'2131', diff --git a/jsowell-ui/src/views/login.vue b/jsowell-ui/src/views/login.vue index 687a11189..7f22a4a7e 100644 --- a/jsowell-ui/src/views/login.vue +++ b/jsowell-ui/src/views/login.vue @@ -1,7 +1,7 @@