suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #9 into master from cc_20251208_bank

Browse Source 
feat:老店开通 V2

* cc_20251208_bank: (6 commits squashed)

  - feat:银行的接口

  - feat:银行的接口

  - feat:bank

  - fix:网商提交开通新增法人银行卡信息

  - fix:小程序新增字典接口

  - feat:老店开通 V2

Signed-off-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>
Merged-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/9
This commit is contained in:
苏竹红
2025-12-09 08:55:37 +00:00
parent aaaa40f2c8
commit 1b0fb1b034
15 changed files with 252 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-dao/src/main/java/com/cool/store/dao/wallet/OpenBankInfoDAO.java
View File

@@ -26,7 +26,10 @@ public class OpenBankInfoDAO {
}
public int updateByStoreCode(OpenBankInfoDO openBankInfoDO){
return openBankInfoMapper.updateByStoreCode(openBankInfoDO);
Example example = new Example(OpenBankInfoDO.class);
example.createCriteria()
.andEqualTo("storeCode", openBankInfoDO.getStoreCode());
return openBankInfoMapper.updateByExampleSelective(openBankInfoDO, example);
}
public OpenBankInfoDO getOpenBankInfo(String storeCode){

9
coolstore-partner-dao/src/main/java/com/cool/store/mapper/wallet/OpenBankInfoMapper.java
View File

@@ -14,13 +14,4 @@ public interface OpenBankInfoMapper extends Mapper<OpenBankInfoDO> {
*/
OpenBankInfoDO getOpenBankInfo(@Param("storeCode") String storeCode);
/**
* 根据门店编码更新
* @param openBankInfoDO
* @return
*/
Integer updateByStoreCode(@Param("dto") OpenBankInfoDO openBankInfoDO);
}

75
coolstore-partner-dao/src/main/resources/mapper/wallet/OpenBankInfoMapper.xml
View File

@@ -27,80 +27,15 @@
<result column="bank_branch_code" jdbcType="VARCHAR" property="bankBranchCode" />
<result column="bank_reserved_phone" jdbcType="VARCHAR" property="bankReservedPhone" />
<result column="source" jdbcType="TINYINT" property="source" />
<result column="legal_bank_card" jdbcType="VARCHAR" property="legalBankCard" />
<result column="legal_bank_branch_name" jdbcType="VARCHAR" property="legalBankBranchName" />
<result column="legal_bank_branch_code" jdbcType="VARCHAR" property="legalBankBranchCode" />
<result column="legal_bank_reserved_phone" jdbcType="VARCHAR" property="legalBankReservedPhone" />
<result column="legal_signer_relation" jdbcType="VARCHAR" property="legalSignerRelation" />
</resultMap>
<select id="getOpenBankInfo" resultMap="BaseResultMap">
select * from zxjp_open_bank_info where store_code = #{storeCode}
</select>
<update id="updateByStoreCode" parameterType="com.cool.store.entity.wallet.OpenBankInfoDO">
UPDATE zxjp_open_bank_info
<set>
<if test="dto.storeId != null and dto.storeId != ''">
store_id = #{dto.storeId},
</if>
<if test="dto.signerName != null and dto.signerName != ''">
signer_name = #{dto.signerName},
</if>
<if test="dto.signerIdCard != null and dto.signerIdCard != ''">
signer_id_card = #{dto.signerIdCard},
</if>
<if test="dto.signerPhone != null and dto.signerPhone != ''">
signer_phone = #{dto.signerPhone},
</if>
<if test="dto.signerIdCardFront != null and dto.signerIdCardFront != ''">
signer_id_card_front = #{dto.signerIdCardFront},
</if>
<if test="dto.signerIdCardBack != null and dto.signerIdCardBack != ''">
signer_id_card_back = #{dto.signerIdCardBack},
</if>
<if test="dto.businessLicenseName != null and dto.businessLicenseName != ''">
business_license_name = #{dto.businessLicenseName},
</if>
<if test="dto.businessLicenseCode != null and dto.businessLicenseCode != ''">
business_license_code = #{dto.businessLicenseCode},
</if>
<if test="dto.businessLicensePhoto != null and dto.businessLicensePhoto != ''">
business_license_photo = #{dto.businessLicensePhoto},
</if>
<if test="dto.legalIsSigner != null">
legal_is_signer = #{dto.legalIsSigner},
</if>
<if test="dto.legalName != null and dto.legalName != ''">
legal_name = #{dto.legalName},
</if>
<if test="dto.legalIdCard != null and dto.legalIdCard != ''">
legal_id_card = #{dto.legalIdCard},
</if>
<if test="dto.legalIdCardExpireTime != null and dto.legalIdCardExpireTime != ''">
legal_id_card_expire_time = #{dto.legalIdCardExpireTime},
</if>
<if test="dto.legalPhone != null and dto.legalPhone != ''">
legal_phone = #{dto.legalPhone},
</if>
<if test="dto.legalIdCardFront != null and dto.legalIdCardFront != ''">
legal_id_card_front = #{dto.legalIdCardFront},
</if>
<if test="dto.legalIdCardBack != null and dto.legalIdCardBack != ''">
legal_id_card_back = #{dto.legalIdCardBack},
</if>
<if test="dto.settlementCard != null and dto.settlementCard != ''">
settlement_card = #{dto.settlementCard},
</if>
<if test="dto.bankBranchName != null and dto.bankBranchName != ''">
bank_branch_name = #{dto.bankBranchName},
</if>
<if test="dto.bankBranchCode != null and dto.bankBranchCode != ''">
bank_branch_code = #{dto.bankBranchCode},
</if>
<if test="dto.bankReservedPhone != null and dto.bankReservedPhone != ''">
bank_reserved_phone = #{dto.bankReservedPhone},
</if>
<if test="dto.source != null">
source = #{dto.source},
</if>
</set>
WHERE store_code = #{dto.storeCode}
</update>
</mapper>

17
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankInfoDTO.java Normal file
View File

@@ -0,0 +1,17 @@
package com.cool.store.dto.wallet;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/12/8 11:14
* @Version 1.0
*/
@Data
public class BankInfoDTO {
private String headName;
private String headCode;
}

35
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/OpenBasicInfoDTO.java
View File

@@ -1,10 +1,9 @@
package com.cool.store.dto.wallet;
import com.cool.store.annotation.DictField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
/**
* 开通网商需要的基本信息
@@ -117,24 +116,32 @@ public class OpenBasicInfoDTO {
@ApiModelProperty(value = "legal_name")
private String legalName;
/**
* 法人身份证号码
*/
@ApiModelProperty(value = "legal_id_card")
@ApiModelProperty(value = "法人身份证号码")
private String legalIdCard;
/**
* 法人身份证有效期字段
*/
@ApiModelProperty(value = "legal_id_card_expire_time")
@ApiModelProperty(value = "法人身份证有效期字段")
private String legalIdCardExpireTime;
/**
* 法人手机号
*/
@ApiModelProperty(value = "legal_phone")
@ApiModelProperty(value = "法人手机号")
private String legalPhone;
@ApiModelProperty("法人银行卡")
private String legalBankCard;
@ApiModelProperty("法人开户支行名称")
private String legalBankBranchName;
@ApiModelProperty("法人开户支行编号")
private String legalBankBranchCode;
@ApiModelProperty("银行预留手机号")
private String legalBankReservedPhone;
@ApiModelProperty("法人签约人关系，字典表legalSignerRelation")
private String legalSignerRelation;
@ApiModelProperty("法人签约人关系名称")
@DictField
private String legalSignerRelationName;
}

30
coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/OpenBankInfoDO.java
View File

@@ -145,4 +145,34 @@ public class OpenBankInfoDO {
*/
@Column(name = "source")
private Integer source;
/**
* 法人银行卡
*/
@Column(name = "legal_bank_card")
private String legalBankCard;
/**
* 法人开户支行名称
*/
@Column(name = "legal_bank_branch_name")
private String legalBankBranchName;
/**
* 法人开户支行编号
*/
@Column(name = "legal_bank_branch_code")
private String legalBankBranchCode;
/**
* 银行预留手机号
*/
@Column(name = "legal_bank_reserved_phone")
private String legalBankReservedPhone;
/**
* 法人签约人关系 myself-本人，friend-朋友，具体参考枚举
*/
@Column(name = "legal_signer_relation")
private String legalSignerRelation;
}

3
coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BankListRequest.java
View File

@@ -17,6 +17,9 @@ public class BankListRequest extends PageBasicInfo {
@ApiModelProperty("银行名称")
private String headName;
@ApiModelProperty("银行编号")
private String headCode;
@ApiModelProperty("关键字查询")
private String keyword;
}

13
coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CoolOpenBasicInfoRequest.java
View File

@@ -140,5 +140,18 @@ public class CoolOpenBasicInfoRequest {
@NotBlank(message = "银行预留手机号不能为空")
private String bankReservedPhone;
@ApiModelProperty("法人银行卡")
private String legalBankCard;
@ApiModelProperty("法人开户支行名称")
private String legalBankBranchName;
@ApiModelProperty("法人开户支行编号")
private String legalBankBranchCode;
@ApiModelProperty("银行预留手机号")
private String legalBankReservedPhone;
@ApiModelProperty("法人签约人关系，字典表legalSignerRelation")
private String legalSignerRelation;
}

2
coolstore-partner-model/src/main/java/com/cool/store/request/wallet/GetBankRequest.java
View File

@@ -13,6 +13,8 @@ public class GetBankRequest {
@ApiModelProperty("银行名称")
private String headName;
@ApiModelProperty("银行编号")
private String headCode;
@ApiModelProperty("关键字查询")
private String keyword;
@ApiModelProperty("分页查询参数")

97
coolstore-partner-model/src/main/java/com/cool/store/request/wallet/OldStoreAccountCreateV2Request.java Normal file
View File

@@ -0,0 +1,97 @@
package com.cool.store.request.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/12/9 9:31
* @Version 1.0
*/
@Data
public class OldStoreAccountCreateV2Request {
@ApiModelProperty(value = "CRM门店编号", required = true)
private String outStoreId;
@ApiModelProperty(value = "联系电话", required = true)
private String phoneNumber;
@ApiModelProperty(value = "结算卡业务类型 枚举值：1：对公 2：对私(结算类型)", required = true, example = "1")
private Integer legalAccountType;
@ApiModelProperty(value = "营业执照号码,与企业证件类型对应的企业注册号(企业与个体户必传)")
private String licenseNo;
@ApiModelProperty(value = "工商注册名称（与注册工商信息时一致）(企业与个体户必传)")
private String licenseName;
@ApiModelProperty(value = "法人姓名", required = true)
private String legalName;
@ApiModelProperty(value = "法人证件号码", required = true)
private String legalNo;
@ApiModelProperty("法人身份证有效期字段")
private String legalIdcardExpireTime;
@ApiModelProperty(value = "法人联系电话(企业与个体户必传)")
private String legalPhone;
@ApiModelProperty(value = "账户简称", required = true)
private String accountAliasName;
@ApiModelProperty(value = "法人结算银行卡号", required = true)
private String legalAccountCardNo;
@ApiModelProperty(value = "法人结算卡银行预留手机号（存量门店可能没有）", required = true)
private String legalAccountPhone;
@ApiModelProperty(value = "法人开户支行", required = true)
private String legalBankNo;
@ApiModelProperty(value = "法人开户支行名称", required = true)
private String legalBankName;
@ApiModelProperty(value = "开户许可证图片链接,企业必选")
private String industryLicensePhoto;
@ApiModelProperty(value = "法人代表证件人像面图片链接", required = true)
private String certPhotoA;
@ApiModelProperty(value = "法人代表证件国徽面图片链接", required = true)
private String certPhotoB;
@ApiModelProperty(value = "营业执照图片链接", required = true)
private String licensePhoto;
@ApiModelProperty(value = "签约人姓名", required = true)
private String signatoryName;
@ApiModelProperty(value = "签约人身份证", required = true)
private String signatoryNo;
@ApiModelProperty(value = "签约人联系电话", required = true)
private String signatoryPhone;
@ApiModelProperty(value = "签约人证件人像面图片链接", required = true)
private String signatoryPhotoA;
@ApiModelProperty(value = "签约人证件国徽面图片链接", required = true)
private String signatoryPhotoB;
@ApiModelProperty(value = "签约人结算卡业务类型 枚举值：1：对公 2：对私(结算类型)", required = true, example = "1")
private Integer signatoryAccountType;
@ApiModelProperty(value = "签约人结算银行卡号")
private String signatoryAccountCardNo;
@ApiModelProperty(value = "签约人结算卡银行预留手机号")
private String signatoryAccountPhone;
@ApiModelProperty(value = "签约人开户支行")
private String signatoryBankNo;
@ApiModelProperty(value = "签约人开户支行名称")
private String signatoryBankName;
}

3
coolstore-partner-service/src/main/java/com/cool/store/http/WalletHttpClientRest.java
View File

@@ -230,6 +230,9 @@ public class WalletHttpClientRest {
*/
@SuppressWarnings("unchecked")
private Map<String, Object> convertToMap(Object obj) {
if (obj == null){
return new HashMap<>();
}
if (obj instanceof Map) {
return (Map<String, Object>) obj;
}

22
coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletApiService.java
View File

@@ -201,6 +201,16 @@ public class WalletApiService {
return walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/account/ws/v1/create", request, StoreIdDTO.class);
}
/**
* 老店创建门店网商账户V2
* @param request
* @return
*/
public StoreIdDTO oldStoreOpenAccountV2(OldStoreAccountCreateV2Request request){
return walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/account/ws/v2/create", request, StoreIdDTO.class);
}
/**
* 获取交易记录列表
* @param request
@@ -228,4 +238,16 @@ public class WalletApiService {
public PasswordDTO passwordIsExist(OutStoreIdRequest request){
return walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/account/v1/existPwd", request, PasswordDTO.class);
}
/**
* 查询所有的银行名称
* @return
*/
public List<BankInfoDTO> findBankHeadName(){
String bankHeadName = walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/base/v1/findBankHeadName", null, String.class);
if (StringUtil.isNotEmpty(bankHeadName)){
return JSONObject.parseArray(bankHeadName, BankInfoDTO.class);
}
return null;
}
}

6
coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java
View File

@@ -186,4 +186,10 @@ public interface WalletService {
* @return 是否成功
*/
Boolean onlineBankActive(StoreShopRequest request);
/**
* 网商银行查询银行名称
* @return
*/
List<BankInfoDTO> findBankHeadName();
}

28
coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
View File

@@ -26,6 +26,7 @@ import com.cool.store.enums.wechat.WalletTypeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.ApplyLicenseMapper;
import com.cool.store.request.wallet.*;
import com.cool.store.service.dict.impl.DictService;
import com.cool.store.service.wallet.WalletApiService;
import com.cool.store.service.wallet.WalletService;
import com.cool.store.utils.BeanUtil;
@@ -73,6 +74,7 @@ public class WalletServiceImpl implements WalletService {
private final StoreMasterSignerInfoDAO storeMasterSignerInfoDAO;
private final TempOpenWalletInfoDAO tempOpenWalletInfoDAO;
private final OpenBankInfoDAO openBankInfoDAO;
private final DictService dictService;
private final static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -158,6 +160,7 @@ public class WalletServiceImpl implements WalletService {
getBankRequest.setPage(pageParam);
getBankRequest.setHeadName(request.getHeadName());
getBankRequest.setKeyword(request.getKeyword());
getBankRequest.setHeadCode(request.getHeadCode());
BankListDTO bankListDTO = walletApiService.getBankList(getBankRequest);
return toPageInfo(bankListDTO.getPageData(), BankVO.class, bankListDTO.getPage());
}
@@ -524,6 +527,7 @@ public class WalletServiceImpl implements WalletService {
openBasicInfoDTO.setBankBranchCode(openBankInfo.getBankBranchCode());
openBasicInfoDTO.setBankReservedPhone(openBankInfo.getBankReservedPhone());
BeanUtil.copyProperties(openBankInfo, openBasicInfoDTO);
dictService.fillDictField(openBasicInfoDTO);
return openBasicInfoDTO;
}
//先查询当前门店
@@ -571,11 +575,20 @@ public class WalletServiceImpl implements WalletService {
onlineBankFailReOpen(request);
return true;
}
OldStoreAccountCreateRequest oldStoreAccountCreateRequest = new OldStoreAccountCreateRequest();
OldStoreAccountCreateV2Request oldStoreAccountCreateRequest = new OldStoreAccountCreateV2Request();
StoreDO store = storeDao.getByStoreNum(request.getStoreCode());
oldStoreAccountCreateRequest.setOutStoreId(store.getStoreId());
oldStoreAccountCreateRequest.setPhoneNumber(request.getSignerPhone());
oldStoreAccountCreateRequest.setAccountType(2);
oldStoreAccountCreateRequest.setLegalAccountType(2);
oldStoreAccountCreateRequest.setLegalAccountCardNo(request.getLegalBankCard());
oldStoreAccountCreateRequest.setLegalAccountPhone(request.getLegalPhone());
oldStoreAccountCreateRequest.setLegalBankNo(request.getLegalBankBranchCode());
oldStoreAccountCreateRequest.setLegalBankName(request.getLegalBankBranchName());
oldStoreAccountCreateRequest.setSignatoryAccountType(2);
oldStoreAccountCreateRequest.setSignatoryAccountCardNo(request.getSettlementCard());
oldStoreAccountCreateRequest.setSignatoryAccountPhone(request.getBankReservedPhone());
oldStoreAccountCreateRequest.setSignatoryBankNo(request.getBankBranchCode());
oldStoreAccountCreateRequest.setSignatoryBankName(request.getBankBranchName());
oldStoreAccountCreateRequest.setLicenseNo(request.getBusinessLicenseCode());
oldStoreAccountCreateRequest.setLicenseName(request.getBusinessLicenseName());
oldStoreAccountCreateRequest.setLegalName(request.getLegalName());
@@ -586,10 +599,6 @@ public class WalletServiceImpl implements WalletService {
String code = StringUtils.isNotBlank(store.getStoreNum())?store.getStoreNum():"";
String name = StringUtils.isNotBlank(store.getMiniProgramOrderStoreName())?store.getMiniProgramOrderStoreName():store.getStoreName();
oldStoreAccountCreateRequest.setAccountAliasName(code+name);
oldStoreAccountCreateRequest.setAccountCardNo(request.getSettlementCard());
oldStoreAccountCreateRequest.setAccountPhone(request.getBankReservedPhone());
oldStoreAccountCreateRequest.setBankNo(request.getBankBranchCode());
oldStoreAccountCreateRequest.setBankName(request.getBankBranchName());
oldStoreAccountCreateRequest.setCertPhotoA(request.getLegalIdCardFront());
oldStoreAccountCreateRequest.setCertPhotoB(request.getLegalIdCardBack());
oldStoreAccountCreateRequest.setLicensePhoto(request.getBusinessLicensePhoto());
@@ -598,7 +607,7 @@ public class WalletServiceImpl implements WalletService {
oldStoreAccountCreateRequest.setSignatoryNo(request.getSignerIdCard());
oldStoreAccountCreateRequest.setSignatoryPhotoA(request.getSignerIdCardFront());
oldStoreAccountCreateRequest.setSignatoryPhotoB(request.getSignerIdCardBack());
walletApiService.oldStoreOpenAccount(oldStoreAccountCreateRequest);
walletApiService.oldStoreOpenAccountV2(oldStoreAccountCreateRequest);
// 网商创建成功，记录已激活状态
redisUtilPool.setString(MessageFormat.format(RedisConstant.WALLET_ONLINE_BANK_ACTIVATED, store.getStoreId()), "1");
return Boolean.TRUE;
@@ -641,6 +650,11 @@ public class WalletServiceImpl implements WalletService {
return true;
}
@Override
public List<BankInfoDTO> findBankHeadName() {
return walletApiService.findBankHeadName();
}
public String getStoreId(StoreShopRequest request) {
String storeId = request.getStoreId();
if (StringUtils.isBlank(storeId) && Objects.nonNull(request.getShopId())) {

12
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java
View File

@@ -1,9 +1,6 @@
package com.cool.store.controller.webc;
import com.cool.store.dto.wallet.OpenBasicInfoDTO;
import com.cool.store.dto.wallet.PasswordDTO;
import com.cool.store.dto.wallet.TradeRecordDTO;
import com.cool.store.dto.wallet.WithDrawerDTO;
import com.cool.store.dto.wallet.*;
import com.cool.store.request.wallet.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.wallet.WalletService;
@@ -18,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* <p>
@@ -143,4 +141,10 @@ public class MiniWalletController {
public ResponseResult<Boolean> onlineBankActive(@RequestBody @Validated StoreShopRequest request) {
return ResponseResult.success(walletService.onlineBankActive(request));
}
@ApiOperation("银行列表")
@GetMapping("/findBankHeadName")
public ResponseResult<List<BankInfoDTO>> findBankHeadName() {
return ResponseResult.success(walletService.findBankHeadName());
}
}