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

Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet

Browse Source 
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AddTagCallbackNoticeRequest.java
This commit is contained in:
wangff
2025-11-18 18:44:32 +08:00
parent ac5a06bdad f40cfb5c92
commit 0781a4059f
11 changed files with 214 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,20 @@
package com.cool.store.dto.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/11/18 17:55
* @Version 1.0
*/
@Data
public class AccountActiveUrlDTO {
@ApiModelProperty(value = "商户门店编号",required = true)
private String outStoreId;
@ApiModelProperty(value = "H5 激活页短链（商户需访问此链接完成操作，非公网可直接访问需确认权限）",required = true)
private String activateUrl;
@ApiModelProperty(value = "短链失效时间（格式：YYYY-MM-DD HH:mm:ss，过期后需重新调用接口生成）",required = true)
private String expireTime;
}

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

@@ -0,0 +1,16 @@
package com.cool.store.dto.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/11/18 18:20
* @Version 1.0
*/
@Data
public class StoreIdDTO {
@ApiModelProperty(value = "商户门店编号",required = true)
private String outStoreId;
}

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

@@ -54,4 +54,32 @@ public class AccountAddTagRequest {
@ApiModelProperty(value = "法人联系电话", required = true)
@NotBlank(message = "法人联系电话不能为空")
private String legalPhone;
@ApiModelProperty(value = "开户许可证图片链接,企业必选", required = true)
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;
}

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

@@ -17,6 +17,8 @@ public class AddTagCallbackNoticeRequest {
private Integer status;
@ApiModelProperty(name = "1.法人 2.非法人", required = true)
private Integer addTagType;
@ApiModelProperty(name = "失败原因")
private String errorMsg;
@ApiModelProperty(name = "失败原因", required = false)
private Integer errorMsg;
}

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

@@ -19,10 +19,6 @@ public class CreateStoreAndAccountRequest {
@ApiModelProperty(name = "CRM门店编号", required = true)
private String outStoreId;
@ApiModelProperty(name = "组织编号", required = true)
private String orgCode;
@ApiModelProperty(name = "组织名称", required = true)
private String orgName;
@ApiModelProperty(name = "联系电话", required = true)
private String phoneNumber;
@ApiModelProperty(name = "结算卡业务类型 枚举值：1：对公 2：对私", required = true)

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

@@ -0,0 +1,83 @@
package com.cool.store.request.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/11/18 18:16
* @Version 1.0
*/
@Data
public class OldStoreAccountCreateRequest {
@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 accountType;
@ApiModelProperty(value = "开户类型:1企业 2个体工商户 3个人(小微商户)", required = true, example = "1")
private Integer businessType;
@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(value = "法人联系电话(企业与个体户必传)")
private String legalPhone;
@ApiModelProperty(value = "账户简称", required = true)
private String accountAliasName;
@ApiModelProperty(value = "结算银行卡号", required = true)
private String accountCardNo;
@ApiModelProperty(value = "结算卡银行预留手机号（存量门店可能没有）", required = true)
private String accountPhone;
@ApiModelProperty(value = "开户支行", required = true)
private String bankNo;
@ApiModelProperty(value = "开户支行名称", required = true)
private String bankName;
@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;
}

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

@@ -0,0 +1,25 @@
package com.cool.store.request.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/11/18 18:00
* @Version 1.0
*/
@Data
public class OnlineCommercialBankCallbackRequest {
@ApiModelProperty(name = "CRM门店编号", required = true)
private String outStoreId;
@ApiModelProperty(name = "网商账户编号", required = true)
private String accountNo;
@ApiModelProperty(name = "4.已开通 5.开通失败", required = true)
private Integer accountStatus;
@ApiModelProperty(name = "开户失败原因", required = true)
private String failReason;
@ApiModelProperty(name = "钱包类型 1.平安 2.网商 目前只有网商是创建账户异步的 预留字段", required = true)
private int walletType;
}

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

@@ -183,6 +183,25 @@ public class WalletApiService {
return walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/account/v1/findAccountPage", request, AccountPageDTO.class);
}
/**
* 获取账户激活链接
* @param request
* @return
*/
public AccountActiveUrlDTO pushAccountActiveUrl(OutStoreIdRequest request){
return walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/account/ws/v1/create", request, AccountActiveUrlDTO.class);
}
/**
* 老店创建门店网商账户
* @param request
* @return
*/
public StoreIdDTO oldStoreOpenAccount(OldStoreAccountCreateRequest request){
return walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/account/ws/v1/create", request, StoreIdDTO.class);
}

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

@@ -66,6 +66,13 @@ public interface WalletService {
*/
Boolean largePaymentCallback(PaymentDTO request);
/**
* 网商银行 回调接口
* @param request
* @return
*/
Boolean onlineCommercialBankCallback(OnlineCommercialBankCallbackRequest request);
/**
* 账户交易回调
* @param request

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

@@ -79,8 +79,6 @@ public class WalletServiceImpl implements WalletService {
}
CreateStoreAndAccountRequest accountRequest = CreateStoreAndAccountRequest.builder()
.outStoreId(shopInfo.getStoreId())
.orgCode(String.valueOf(regionDO.getId()))
.orgName(regionDO.getName())
.phoneNumber(request.getMobile())
.accountType(BankAccountTypeEnum.PRIVATE.getType())
.businessType(BankBusinessTypeEnum.PERSONAL.getType())
@@ -222,6 +220,11 @@ public class WalletServiceImpl implements WalletService {
return Boolean.TRUE;
}
@Override
public Boolean onlineCommercialBankCallback(OnlineCommercialBankCallbackRequest request) {
return Boolean.TRUE;
}
@Override
public Boolean accountTradeCallback(AccountTradeCallbackRequest request) {
return Boolean.TRUE;

7
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
View File

@@ -14,6 +14,7 @@ import com.cool.store.request.notice.ThirdHandleMessageRequest;
import com.cool.store.request.notice.ThirdMatterRequest;
import com.cool.store.request.wallet.AccountTradeCallbackRequest;
import com.cool.store.request.wallet.AddTagCallbackNoticeRequest;
import com.cool.store.request.wallet.OnlineCommercialBankCallbackRequest;
import com.cool.store.request.xgj.FranchiseFeeCallBackRequest;
import com.cool.store.request.xgj.ReceiptCallBackRequest;
import com.cool.store.response.ResponseResult;
@@ -239,4 +240,10 @@ public class OpenApiController {
return ApiResponse.successByWallet(walletService.accountTradeCallback(request));
}
@ApiOperation("网商银行通知接口")
@PostMapping("/wallet/onlineCommercialBankCallback")
public ApiResponse<Boolean> accountTradeCallback(@RequestBody @Validated OnlineCommercialBankCallbackRequest request) {
return ApiResponse.successByWallet(walletService.onlineCommercialBankCallback(request));
}
}