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

fix:开店流程网商开通失败标识缓存；小程序账户列表返回对象修改；根据门店编码查询开通基础信息逻辑修改；网商账户提交逻辑修改；

Browse Source 
feat:网商激活接口
This commit is contained in:
wangff
2025-11-20 16:44:24 +08:00
parent 4581aeb85a
commit 38a669dff9
17 changed files with 314 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ public class WalletController {
@ApiOperation("账户列表")
@GetMapping("/accountList")
public ResponseResult<List<AccountInfoVO>> getAccountList(AccountQueryRequest request) {
return ResponseResult.success(walletService.getAccountList(request));
return ResponseResult.success(walletService.getAccountList(request).getAccountList());
}
@ApiOperation("账户详情")

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

@@ -8,13 +8,14 @@ import com.cool.store.service.wallet.WalletService;
import com.cool.store.vo.wallet.*;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* <p>
@@ -58,7 +59,7 @@ public class MiniWalletController {
@ApiOperation("账户列表")
@GetMapping("/accountList")
public ResponseResult<List<AccountInfoVO>> getAccountList(AccountQueryRequest request) {
public ResponseResult<AccountDataVO> getAccountList(AccountQueryRequest request) {
return ResponseResult.success(walletService.getAccountList(request));
}
@@ -111,8 +112,13 @@ public class MiniWalletController {
}
@ApiOperation("根据门店编码查询开通基础信息")
@GetMapping("/getOpenBasicInfo")
public ResponseResult<OpenBasicInfoDTO> getOpenBasicInfo(@NotBlank(message = "门店编码不能为空") String storeCode) {
return ResponseResult.success(walletService.getOpenBasicInfo(storeCode));
@ApiImplicitParams({
@ApiImplicitParam(name = "storeId", value = "门店id", required = true, dataType = "String"),
@ApiImplicitParam(name = "storeCode", value = "门店编号", required = true, dataType = "String"),
})
public ResponseResult<OpenBasicInfoDTO> getOpenBasicInfo(@NotBlank(message = "门店id不能为空") String storeId,
@NotBlank(message = "门店编码不能为空") String storeCode) {
return ResponseResult.success(walletService.getOpenBasicInfo(storeId, storeCode));
}
@ApiOperation("提交开通")
@@ -121,4 +127,10 @@ public class MiniWalletController {
return ResponseResult.success(walletService.openOnlineBankAccount(request));
}
@ApiOperation("网商账户激活")
@PostMapping("/onlineBankActive")
public ResponseResult<Boolean> onlineBankActive(@RequestBody @Validated StoreShopRequest request) {
return ResponseResult.success(walletService.onlineBankActive(request));
}
}

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

@@ -403,7 +403,7 @@ public class TestController {
@ApiOperation("根据门店编码查询开通基础信息")
@GetMapping("/getOpenBasicInfo")
public ResponseResult<OpenBasicInfoDTO> getOpenBasicInfo(@NotBlank(message = "门店编码不能为空") String storeCode) {
return ResponseResult.success(walletService.getOpenBasicInfo(storeCode));
return ResponseResult.success(walletService.getOpenBasicInfo(null, storeCode));
}
@ApiOperation("提交开通")