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

Merge #98 into master from cc_20260408_trans

Browse Source 
feat:mock 处理

* cc_20260408_trans: (22 commits squashed)

  - feat：分账

  - feat：分账接口

  - feat：分账单管理

  - feat：分账管理

  - feat：分账管理

  - feat：userIdName

  - feat：提现

  - feat：调整

  - feat：accountName

  - feat：accountName

  - feat：mock

  - feat：关联门店

  - feat：待充值待认款

  - feat：待充值待认款

  - feat：payer_account_no

  - feat：payeeAccountName

  - feat：payeeAccountNo

  - feat：page

  - feat：枚举

  - feat：接口请求方式调整get->post

  - feat:mock 处理

  - Merge branch 'master' into cc_20260408_trans
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/98
This commit is contained in:
正新
2026-04-14 09:55:00 +00:00
parent 9ad7fa0f5a
commit 1bbb6f7097
80 changed files with 4204 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AdjustmentOrderController.java Normal file
View File

@@ -0,0 +1,79 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.request.*;
import com.cool.store.response.AdjustmentOrderResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.AdjustmentOrderService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
/**
* 费用调整单 Controller
*/
@RequestMapping("/pc/adjustmentOrder")
@RestController
@Api(tags = "费用调整单管理")
@Slf4j
public class AdjustmentOrderController {
@Resource
private AdjustmentOrderService adjustmentOrderService;
@PostMapping("/add")
@ApiOperation("新增费用调整单")
public ResponseResult<Boolean> add(@Valid @RequestBody AdjustmentOrderRequest request) {
return ResponseResult.success(adjustmentOrderService.add(request));
}
@PostMapping("/update")
@ApiOperation("编辑费用调整单")
public ResponseResult<Boolean> update(@Valid @RequestBody AdjustmentOrderRequest request) {
return ResponseResult.success(adjustmentOrderService.update(request));
}
@PostMapping("/recognizePayment")
@ApiOperation("认领")
public ResponseResult<Boolean> recognizePayment(@Valid @RequestBody RecognizePaymentRequest request) {
return ResponseResult.success(adjustmentOrderService.recognizePayment(request, CurrentUserHolder.getUser()));
}
@PostMapping("/delete")
@ApiOperation("删除费用调整单")
public ResponseResult<Boolean> delete(@ApiParam("调整单ID") @RequestParam Long id) {
return ResponseResult.success(adjustmentOrderService.delete(id));
}
@GetMapping("/getById")
@ApiOperation("根据ID查询费用调整单详情")
public ResponseResult<AdjustmentOrderResponse> getById(@ApiParam("调整单ID") @RequestParam Long id) {
return ResponseResult.success(adjustmentOrderService.getById(id));
}
@PostMapping("/page")
@ApiOperation("分页查询费用调整单")
public ResponseResult<PageInfo<AdjustmentOrderResponse>> page(@RequestBody AdjustmentOrderPageRequest request) {
return ResponseResult.success(adjustmentOrderService.page(request));
}
@PostMapping("/getSpecialStatusData")
@ApiOperation("选择关联费用单费用调整单列表")
public ResponseResult<PageInfo<AdjustmentOrderResponse>> getSpecialStatusData(@RequestBody AdjustmentSpecialPageRequest request) {
return ResponseResult.success(adjustmentOrderService.getSpecialStatusData(request));
}
@PostMapping("/generateSplitOrder")
@ApiOperation("生成分账单")
public ResponseResult<String> generateSplitOrder(@Valid @RequestBody GenerateSplitOrderRequest request) {
return ResponseResult.success(adjustmentOrderService.generateSplitOrder(request));
}
}

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

@@ -845,6 +845,27 @@ public class PCTestController {
return ResponseResult.success(accountList);
}
@ApiOperation("账户分账接口")
@PostMapping("/accountTransfer")
public ResponseResult<AccountTransferDTO> accountTransfer(@RequestBody AccountTransferRequest request) {
AccountTransferDTO accountList = walletApiService.accountTransfer(request);
return ResponseResult.success(accountList);
}
@ApiOperation("组织账户查询接口")
@PostMapping("/findOrgAccount")
public ResponseResult<OrgAccountDTO> findOrgAccount(@RequestBody AccountPageRequest request) {
OrgAccountDTO accountList = walletApiService.findOrgAccount(request);
return ResponseResult.success(accountList);
}
@ApiOperation("账户提现接口")
@PostMapping("/accountWithdrawer")
public ResponseResult<AccountWithdrawerDTO> accountWithdrawer(@RequestBody AccountWithdrawerRequest request) {
AccountWithdrawerDTO accountList = walletApiService.accountWithdrawer(request);
return ResponseResult.success(accountList);
}
@Value("${cool.api.rsa.private.key}")

93
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SplitOrderController.java Normal file
View File

@@ -0,0 +1,93 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.dto.wallet.TradeRecordDTO;
import com.cool.store.job.XxlJobHandler;
import com.cool.store.request.SplitOrderPageRequest;
import com.cool.store.request.SplitOrderRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.SplitOrderResponse;
import com.cool.store.service.SplitOrderService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
/**
* 分账主表 Controller
*/
@RequestMapping("/pc/splitOrder")
@RestController
@Api(tags = "分账单管理")
@Slf4j
public class SplitOrderController {
@Resource
private SplitOrderService splitOrderService;
@Resource
private XxlJobHandler xxlJobHandler;
@PostMapping("/add")
@ApiOperation("新增分账单")
public ResponseResult<Boolean> add(@Valid @RequestBody SplitOrderRequest request) {
return ResponseResult.success(splitOrderService.add(request));
}
@PostMapping("/update")
@ApiOperation("编辑分账单")
public ResponseResult<Boolean> update(@Valid @RequestBody SplitOrderRequest request) {
return ResponseResult.success(splitOrderService.update(request));
}
@PostMapping("/delete")
@ApiOperation("删除分账单")
public ResponseResult<Boolean> delete(@ApiParam("分账单ID") @RequestParam Long id) {
return ResponseResult.success(splitOrderService.delete(id));
}
@GetMapping("/getById")
@ApiOperation("根据ID查询分账单详情")
public ResponseResult<SplitOrderResponse> getById(@ApiParam("分账单ID") @RequestParam Long id) {
return ResponseResult.success(splitOrderService.getById(id));
}
@PostMapping("/page")
@ApiOperation("分页查询分账单")
public ResponseResult<PageInfo<SplitOrderResponse>> page(@RequestBody SplitOrderPageRequest request) {
return ResponseResult.success(splitOrderService.page(request));
}
@PostMapping("/batchUpdateStatus")
@ApiOperation("批量更新状态")
public ResponseResult<Boolean> batchUpdateStatus(
@ApiParam("分账单ID列表") @RequestParam List<Long> ids,
@ApiParam("目标状态") @RequestParam String status) {
return ResponseResult.success(splitOrderService.batchUpdateStatus(ids, status));
}
@PostMapping("/confirmSplitOrder")
@ApiOperation("确认分账")
public ResponseResult<Boolean> confirmSplitOrder(@ApiParam("分账单ID") @RequestParam Long id) {
return ResponseResult.success(splitOrderService.confirmSplitOrder(id, CurrentUserHolder.getUser()));
}
@ApiOperation("交易付款详情")
@GetMapping("/billDetail")
public ResponseResult<TradeRecordDTO> getBillDetail( @RequestParam Long id) {
return ResponseResult.success(splitOrderService.getBillDetail(id));
}
@ApiOperation("刷新分账单状态")
@GetMapping("/refreshStatus")
public ResponseResult<Boolean> refreshStatus() {
xxlJobHandler.transfer();
return ResponseResult.success(Boolean.TRUE);
}
}

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

@@ -54,7 +54,7 @@ public class WalletController {
@ApiOperation("分页查询所有流水列表 支持条件查询")
@PostMapping("/getTradeRecordList")
public ResponseResult<PageInfo<TradeRecordDTO>> getTradeRecordList(@RequestBody CoolTradeRecodePageRequest request) {
return ResponseResult.success(walletService.getTradeRecordList(request));
return ResponseResult.success(walletService.getTradeRecordList(request,Boolean.FALSE));
}
@ApiOperation("账户流水")
@@ -68,4 +68,23 @@ public class WalletController {
public ResponseResult<TradeRecordDTO> getBillDetail(BillDetailRequest request) {
return ResponseResult.success(walletService.getBillDetail(request));
}
@ApiOperation("查询收款账户 支持条件查询")
@PostMapping("/getOrgAccountInfoList")
public ResponseResult<PageInfo<AccountInfoDTO>> getOrgAccountInfoList(@RequestBody CoolAccountPageRequest request) {
return ResponseResult.success(walletService.getOrgAccountInfoList(request));
}
@ApiOperation("分页查询门店充值流水列表 支持条件查询")
@PostMapping("/getRechargeTradeRecordList")
public ResponseResult<PageInfo<TradeRecordDTO>> getRechargeTradeRecordList(@RequestBody CoolTradeRecodeRequest request) {
return ResponseResult.success(walletService.getRechargeTradeRecordList(request));
}
@ApiOperation("分页立规组织下所有账号流水列表 支持条件查询")
@PostMapping("/getLiGuiTradeRecordList")
public ResponseResult<PageInfo<TradeRecordDTO>> getLiGuiTradeRecordList(@RequestBody CoolTradeRecodePageRequest request) {
return ResponseResult.success(walletService.getTradeRecordList(request,Boolean.TRUE));
}
}

47
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WithdrawApplicationController.java Normal file
View File

@@ -0,0 +1,47 @@
package com.cool.store.controller.webb;
import com.cool.store.dto.wallet.WithdrawApplicationDTO;
import com.cool.store.request.WithdrawApplicationPageRequest;
import com.cool.store.request.WithdrawApplicationRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.WithdrawApplicationResponse;
import com.cool.store.service.WithdrawApplicationService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
/**
* 提现申请 Controller
*/
@RequestMapping("/pc/withdrawApplication")
@RestController
@Api(tags = "提现申请管理")
@Slf4j
public class WithdrawApplicationController {
@Resource
private WithdrawApplicationService withdrawApplicationService;
@PostMapping("/add")
@ApiOperation("新增提现申请")
public ResponseResult<Boolean> add(@Valid @RequestBody WithdrawApplicationRequest request) {
return ResponseResult.success(withdrawApplicationService.add(request));
}
@PostMapping("/page")
@ApiOperation("分页查询提现申请")
public ResponseResult<PageInfo<WithdrawApplicationDTO>> page(@RequestBody WithdrawApplicationPageRequest request) {
return ResponseResult.success(withdrawApplicationService.page(request));
}
@PostMapping("/confirmWithdraw")
@ApiOperation("确认提现")
public ResponseResult<Boolean> confirmWithdraw(@RequestParam Long id) {
return ResponseResult.success(withdrawApplicationService.confirmWithdraw(id));
}
}

52
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniAdjustmentOrderController.java Normal file
View File

@@ -0,0 +1,52 @@
package com.cool.store.controller.webc;
import com.cool.store.request.AdjustmentOrderPageRequest;
import com.cool.store.request.wallet.ConfirmRechargeRequest;
import com.cool.store.response.AdjustmentOrderResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.AdjustmentOrderService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 费用调整单
* @Auther zx_szh
* @Date 2026/4/12 16:03
* @Version 1.0
*/
@RequestMapping("/mini/adjustmentOrder")
@RestController
@Api(tags = "Mini费用调整单管理")
@Slf4j
public class MiniAdjustmentOrderController {
@Resource
private AdjustmentOrderService adjustmentOrderService;
@GetMapping("/getById")
@ApiOperation("根据ID查询费用调整单详情")
public ResponseResult<AdjustmentOrderResponse> getById(@ApiParam("调整单ID") @RequestParam Long id) {
return ResponseResult.success(adjustmentOrderService.getById(id));
}
@PostMapping("/confirmRecharge")
@ApiOperation("确认已充值")
public ResponseResult<Boolean> confirmRecharge(@RequestBody ConfirmRechargeRequest request) {
return ResponseResult.success(adjustmentOrderService.confirmRecharge(request));
}
@PostMapping("/page")
@ApiOperation("分页查询费用调整单")
public ResponseResult<PageInfo<AdjustmentOrderResponse>> page(@RequestBody AdjustmentOrderPageRequest request) {
return ResponseResult.success(adjustmentOrderService.page(request));
}
}

57
coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
View File

@@ -10,6 +10,7 @@ import com.cool.store.dto.*;
import com.cool.store.dto.store.StoreOrderTimeDTO;
import com.cool.store.entity.*;
import com.cool.store.entity.tp.TpApplyFormDO;
import com.cool.store.entity.wallet.WalletTradeDO;
import com.cool.store.enums.*;
import com.cool.store.enums.tp.TpFormStatusEnum;
import com.cool.store.enums.close.CloseTypeEnum;
@@ -134,6 +135,10 @@ public class XxlJobHandler {
WalletTradeDAO walletTradeDAO;
@Resource
PreAllocationRecordService preAllocationRecordService;
@Resource
SplitOrderService splitOrderService;
@Resource
WithdrawApplicationService withdrawApplicationService;
/**
@@ -672,4 +677,56 @@ public class XxlJobHandler {
}
log.info("------end batchTransferStandardStore------");
}
@XxlJob("transfer")
public void transfer() {
MDCUtils.put(CommonConstants.REQUEST_ID, UUID.randomUUID().toString());
log.info("------start transfer------");
boolean hasNext = true;
int pageNum = 1;
int pageSize = CommonConstants.BATCH_SIZE;
while (hasNext) {
PageHelper.startPage(pageNum, pageSize);
List<WalletTradeDO> walletTradeDOS = walletTradeDAO.transferTradeList(WalletTradeModuleEnum.STANDARD_STORE.getModule(), 1);
hasNext = walletTradeDOS.size() >= pageSize;
if (CollectionUtils.isEmpty(walletTradeDOS)) {
break;
}
for (WalletTradeDO walletTradeDO : walletTradeDOS) {
try {
splitOrderService.updateWalletTrade(walletTradeDO);
} catch (Exception e) {
log.error("钱包转账分账支付状态查询失败, transfer:{}", walletTradeDO.getTradeId(), e);
}
}
pageNum++;
}
log.info("------end transfer------");
}
@XxlJob("withdrawUpdate")
public void withdrawUpdate() {
MDCUtils.put(CommonConstants.REQUEST_ID, UUID.randomUUID().toString());
log.info("------start withdrawUpdate------");
boolean hasNext = true;
int pageNum = 1;
int pageSize = CommonConstants.BATCH_SIZE;
while (hasNext) {
PageHelper.startPage(pageNum, pageSize);
List<WalletTradeDO> walletTradeDOS = walletTradeDAO.transferTradeList(WalletTradeModuleEnum.STANDARD_STORE.getModule(), 2);
hasNext = walletTradeDOS.size() >= pageSize;
if (CollectionUtils.isEmpty(walletTradeDOS)) {
break;
}
for (WalletTradeDO walletTradeDO : walletTradeDOS) {
try {
withdrawApplicationService.updateTrade(walletTradeDO);
} catch (Exception e) {
log.error("钱包提现支付状态查询失败, withdrawUpdate:{}", walletTradeDO.getTradeId(), e);
}
}
pageNum++;
}
log.info("------end withdrawUpdate------");
}
}

1
coolstore-partner-web/src/main/resources/application-ab.properties
View File

@@ -176,3 +176,4 @@ wallet.api.yzt.key=360155690205317
cool.api.rsa.private.key=MIIEpQIBAAKCAQEA0erPAWesjkp9J4htmfCyqKS9npmT9dW3KqWTfb4c7x/QBUtKuokWOO0XikHd4bGUa9kl+twSv/5A3kYz1B9eg6wRuDJoads+G5U7rVQjzdoUtLaf3lNXkuSehl4uHUPQfNa6vcmvzraXPxJjEpYzj9WZh7uJqq2oSgw42H1qdbFCXSaE5BwsOb+2vZXjzh4RO10Sy3Qb1UqGsoZoxVzrtDeEctCjrecFyQr96L2UtYa4NTxSTfu4rgObrwIOMvqqnLsXEzK/rd6kIHYjkZYQCOa48AedWp2YKQ7Ldclj+VMLnXvl42J9exVkbs++8k3P5sI9fdZX4Ey2RBjnSoAo/QIDAQABAoIBACbBGi8I+CE77M+13wAu4RkD8xL7CQc3ic2ojGqIRPi7r5CuphD6mpzvXqtyfhd7DKr9h8bAxwBlnQ28ObjVgsI96/aM7dxvMs/uVPpqwIJyWuTDG5A05EPVC9REQnC6Mp09mnPL7rZz3Mfy6dIGY2YQWfwmWiPl1B45k+wZ+WPZPI0JVnvRzM881kf4aAhEAt08i9VoihylwVAjWIPmLuhf6ZcqI5q8iUsjfO22wZJsudVTCA/dsJdNxv+1RDKeYnSLJL79cZQcodqEhFqTy6vnn2dMsaHH7dpphU27barxUjeL482SR7kFfMqEXn5sltRn/3ep+3sf4Ph2vMtoZeECgYEA6gXzEtT9ZOeAMp4BRGmfNZ0TQLprPPVSwudz/uUBE4j/vyhfXkh9p7hqwyoxN+Z8b65yINvx8yP6hge6ek/MyAwBCZyfIRxZAPZu1eEGoYKl391ubFt2EIVqrN2DtAvzHMr5B/E2VHBq6AJm/rERFX5oKsg6zHS9tPLhgGnWVd0CgYEA5aFWOrtiqZJlp1MHQ4OeWBJatBSynkORdxCW7ic0CKbkYus0NSz1SsvskpbnfEXNB53x98qJxRhSopg/DC4m7XqxjSf9lY3HH4Y/9907olj33yGAnLWC88GivVndt577u/XhYRCk33vOQ3GoibEdjnpMOkWmOfwYG/FsRWWQvaECgYEA1N2siEisZIgel+wZAv2AD+hchtgKi1wqd5bIb+Yl4HsRBfPXK4+MnG6mzfcm5c4FCiEHNtRZc+waCKgm+vJzNtOUbgXEyP1cCAAgOPOCcI7CCqsDshRPhB+XNL4Y+kCUVnBZrNu/q3bGB1uIC8tL2t0sKx4OPcNCe8EhVQjwKRECgYEA4uothdhKRPtwDIsVsHfN74Yjr7SMVay7gIcaPrjqyGnzYnS+oJWOx50AaFNK6Rko5JAF3jF9NxE0B4yfMPAic6Y88hpEkpcJ4HMPn2Y1WdbFCu/WYgVUJICCys6VNLCcXj85umtyIY38Y9VbEMW/SV49GZBeFQqy4FoP/fvBrkECgYEAnfjTDYwgdmJdsUqyNzAocwcJXG2rVtYc7Txrl0TltcwuJmgoSywdzyOP2R9+NZsfoxWDzG0/yr15ApMvUcnnTwHN/8bGQ9SLatFLKqS4EtdwDKKS1JvNbs7V1myQGpt7jbShZOI0e6Fs4xP8ujxsLeGgiq9mZrS9UdRj5XKDoVM=
cool.api.rsa.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0erPAWesjkp9J4htmfCyqKS9npmT9dW3KqWTfb4c7x/QBUtKuokWOO0XikHd4bGUa9kl+twSv/5A3kYz1B9eg6wRuDJoads+G5U7rVQjzdoUtLaf3lNXkuSehl4uHUPQfNa6vcmvzraXPxJjEpYzj9WZh7uJqq2oSgw42H1qdbFCXSaE5BwsOb+2vZXjzh4RO10Sy3Qb1UqGsoZoxVzrtDeEctCjrecFyQr96L2UtYa4NTxSTfu4rgObrwIOMvqqnLsXEzK/rd6kIHYjkZYQCOa48AedWp2YKQ7Ldclj+VMLnXvl42J9exVkbs++8k3P5sI9fdZX4Ey2RBjnSoAo/QIDAQAB
wallet.api.rsa.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvU5WUX5MaZhS4MRfZ5OeqmSxTgjNi64SEwTiDYS++DRHRFTEguk1g5AbiW3l9eEdATeVk0WX+T6ZIIa2do3bQOKhlMtRwWMWQIucjGa7ySOCuicvnCD2HAQ2EThfqQdSpAW5UpcyodrhcyUkuevBA4fQQ06k9lB4FjqWtao2+aYFIPFPu8Wu28KI/9QIMLI02Q1YY3duJ67QW4EM4I2oS0t3sWJeZtIJPRHFWW1EaLJz2FdbJJq+z6D2p++9pmkHsvdnktUUO+nPL3PCLtxGYxEwr/AqTYR/1yXfkVWe3nHXc+qvRt967X1hDHC+gEPJItr7kUk3pQTGBv9kNu75DwIDAQAB
wallet.org.id=140732221567301

1
coolstore-partner-web/src/main/resources/application-local.properties
View File

@@ -153,6 +153,7 @@ wallet.api.yzt.key=360155690205317
cool.api.rsa.private.key=MIIEpQIBAAKCAQEA0erPAWesjkp9J4htmfCyqKS9npmT9dW3KqWTfb4c7x/QBUtKuokWOO0XikHd4bGUa9kl+twSv/5A3kYz1B9eg6wRuDJoads+G5U7rVQjzdoUtLaf3lNXkuSehl4uHUPQfNa6vcmvzraXPxJjEpYzj9WZh7uJqq2oSgw42H1qdbFCXSaE5BwsOb+2vZXjzh4RO10Sy3Qb1UqGsoZoxVzrtDeEctCjrecFyQr96L2UtYa4NTxSTfu4rgObrwIOMvqqnLsXEzK/rd6kIHYjkZYQCOa48AedWp2YKQ7Ldclj+VMLnXvl42J9exVkbs++8k3P5sI9fdZX4Ey2RBjnSoAo/QIDAQABAoIBACbBGi8I+CE77M+13wAu4RkD8xL7CQc3ic2ojGqIRPi7r5CuphD6mpzvXqtyfhd7DKr9h8bAxwBlnQ28ObjVgsI96/aM7dxvMs/uVPpqwIJyWuTDG5A05EPVC9REQnC6Mp09mnPL7rZz3Mfy6dIGY2YQWfwmWiPl1B45k+wZ+WPZPI0JVnvRzM881kf4aAhEAt08i9VoihylwVAjWIPmLuhf6ZcqI5q8iUsjfO22wZJsudVTCA/dsJdNxv+1RDKeYnSLJL79cZQcodqEhFqTy6vnn2dMsaHH7dpphU27barxUjeL482SR7kFfMqEXn5sltRn/3ep+3sf4Ph2vMtoZeECgYEA6gXzEtT9ZOeAMp4BRGmfNZ0TQLprPPVSwudz/uUBE4j/vyhfXkh9p7hqwyoxN+Z8b65yINvx8yP6hge6ek/MyAwBCZyfIRxZAPZu1eEGoYKl391ubFt2EIVqrN2DtAvzHMr5B/E2VHBq6AJm/rERFX5oKsg6zHS9tPLhgGnWVd0CgYEA5aFWOrtiqZJlp1MHQ4OeWBJatBSynkORdxCW7ic0CKbkYus0NSz1SsvskpbnfEXNB53x98qJxRhSopg/DC4m7XqxjSf9lY3HH4Y/9907olj33yGAnLWC88GivVndt577u/XhYRCk33vOQ3GoibEdjnpMOkWmOfwYG/FsRWWQvaECgYEA1N2siEisZIgel+wZAv2AD+hchtgKi1wqd5bIb+Yl4HsRBfPXK4+MnG6mzfcm5c4FCiEHNtRZc+waCKgm+vJzNtOUbgXEyP1cCAAgOPOCcI7CCqsDshRPhB+XNL4Y+kCUVnBZrNu/q3bGB1uIC8tL2t0sKx4OPcNCe8EhVQjwKRECgYEA4uothdhKRPtwDIsVsHfN74Yjr7SMVay7gIcaPrjqyGnzYnS+oJWOx50AaFNK6Rko5JAF3jF9NxE0B4yfMPAic6Y88hpEkpcJ4HMPn2Y1WdbFCu/WYgVUJICCys6VNLCcXj85umtyIY38Y9VbEMW/SV49GZBeFQqy4FoP/fvBrkECgYEAnfjTDYwgdmJdsUqyNzAocwcJXG2rVtYc7Txrl0TltcwuJmgoSywdzyOP2R9+NZsfoxWDzG0/yr15ApMvUcnnTwHN/8bGQ9SLatFLKqS4EtdwDKKS1JvNbs7V1myQGpt7jbShZOI0e6Fs4xP8ujxsLeGgiq9mZrS9UdRj5XKDoVM=
cool.api.rsa.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0erPAWesjkp9J4htmfCyqKS9npmT9dW3KqWTfb4c7x/QBUtKuokWOO0XikHd4bGUa9kl+twSv/5A3kYz1B9eg6wRuDJoads+G5U7rVQjzdoUtLaf3lNXkuSehl4uHUPQfNa6vcmvzraXPxJjEpYzj9WZh7uJqq2oSgw42H1qdbFCXSaE5BwsOb+2vZXjzh4RO10Sy3Qb1UqGsoZoxVzrtDeEctCjrecFyQr96L2UtYa4NTxSTfu4rgObrwIOMvqqnLsXEzK/rd6kIHYjkZYQCOa48AedWp2YKQ7Ldclj+VMLnXvl42J9exVkbs++8k3P5sI9fdZX4Ey2RBjnSoAo/QIDAQAB
wallet.api.rsa.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvU5WUX5MaZhS4MRfZ5OeqmSxTgjNi64SEwTiDYS++DRHRFTEguk1g5AbiW3l9eEdATeVk0WX+T6ZIIa2do3bQOKhlMtRwWMWQIucjGa7ySOCuicvnCD2HAQ2EThfqQdSpAW5UpcyodrhcyUkuevBA4fQQ06k9lB4FjqWtao2+aYFIPFPu8Wu28KI/9QIMLI02Q1YY3duJ67QW4EM4I2oS0t3sWJeZtIJPRHFWW1EaLJz2FdbJJq+z6D2p++9pmkHsvdnktUUO+nPL3PCLtxGYxEwr/AqTYR/1yXfkVWe3nHXc+qvRt967X1hDHC+gEPJItr7kUk3pQTGBv9kNu75DwIDAQAB
wallet.org.id=140732221567301
huoMa.token.url = https://www.huoMayunping.com/api/SAASLogin/merchant
huoMa.id.url = https://www.huomayunping.com/api/reportCenter/executeSql

1
coolstore-partner-web/src/main/resources/application-online.properties
View File

@@ -171,3 +171,4 @@ wallet.api.yzt.key=375393764171845
cool.api.rsa.private.key=MIIEoQIBAAKCAQEAleyT39qxm9Vi4d3f/pF4yI3EATtLlP870dFfk5Rwj1MEM4OVTUeoBrld5GwTARQYzuyZETTZPh9taFCVtLFVsQv4waTqDf/7vnfBbvrTZ2mvZv6H/M6BTQnTx5UmOIP1RsA933ce7v/hmG/DlMaHU3JVC840Ae1q7uJZ2yA6+r6aAGdTGMSH4oQ+U9omJOJbgbuti9DsBuGDDKZ1uMhrWW/l4El5y2Qdu/71wIQuI08kPegmuGl4+FLRJ2OnoGsp+BRXKpFbN0fq0YwPQhjzSHsKg64qimmzRRr5Ewd+4w1/27dJ6mopQd4zvf7+VQ4wEZgATTe/hjBw1njOOBD/WQIDAQABAoIBACSFU0ZSEzbXRbWoo0JzdF1Cb28vXwuGGy/S1XnxTHQVcG4ODSYcoPk2WYFltEFsgFiTuPvAiHUCGdgx3S39jtbIiEm/nwZXB5+Ps46RykKkM4ae1UiHk2bNUIoLMprMxkh8VvYjIeVtbqp/+0A4FkoFDWOJURDxIT3c5K+ky8k9mKz59SiOkNoiayPQTEjzZPgKSsT64286PGmE9v4BlpyxQ1bLXeZaQGAkQ7YVtU5XJgbMM86hgmFlTcHVMGeMoQvJTfcsLlRg8ucX/zzBTHR7fZP6i5OJl5CYLbzHbTyHN9KRYDYv066SvbGLNa+4NO2cY+L6NehiwAkkFxSGKkMCgYEAoVgEjOqLyL1CpeaW7ckWQSbcae0a6J61b6meCkRaKrwcWi7ut9OfmvkCae2qsMsHQlitFM8blrnhtJxMt3EhWKYHI1seZto6YR0mzEEz5IVM3OStIZN7RY4Fg6AyB0C5Gure3GgGHaSs5J8AbCpJyLjTWuOdcnThgHHe4Mw2dGsCgYEA7eF0TpAbdYn8xjqNEgeRSSXYpwtRQ1zrpH0b1KQBxx/fvoZPzWG0SYIi6eYV5bxV5EDnCKlXXFD3ztMfThPFUGt8hHAG6CKpsiVNvYDVhAzXN18JQJtRQRO/4S0f42C8os87ToL1nlM83c8hegrsGO+JnoTzKf8KkpYqTNrvrEsCf1HuYGEuuc02TqHwdrRJaQOsuEESJpf6ACiz+Y09KIyK+drR+mdfD62ixZcFGaitcQJABaSLh3cC7ZrJxCtjR4u8w+MwYj/Ykcy/APS4J6HkDyQc+84RFog7lpFAyCbmtxj0LDfAm1pyRVnTZGOJFe7X7Hw7GbkFoX2YVZXSHdUCgYEA6rCuYPxIOxSicKg/mfQhYLuYHmZKDF3WlnhgRtBweJZ31q8IeKbWild8PqukGv5O910ZEzCPYiL3+fPNROi4mPkS5k7oYYohRgMLydUb0qYghx6aMEWMStpDStOMTHaaZT5zUqhdz5Br0qKScqfn+0oIyn58sYhQVAMXRLAUGjUCgYAYiuiTme9S9gSt1pZrDbPxXlbVm6PjlkP/OKrmBj5gq8iYeKzmYKp66UKFo6ZeeRcKiXLWdQS0i0rKBPux8kmfIwbrfbuYAVGE0GmUdEMNsBQvEjxpwo3afyB5F70tdnm4EBo0qeqJxuBK8DLpBFka2yfzEo/3Z6i0X/XqIwq/7A==
cool.api.rsa.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAleyT39qxm9Vi4d3f/pF4yI3EATtLlP870dFfk5Rwj1MEM4OVTUeoBrld5GwTARQYzuyZETTZPh9taFCVtLFVsQv4waTqDf/7vnfBbvrTZ2mvZv6H/M6BTQnTx5UmOIP1RsA933ce7v/hmG/DlMaHU3JVC840Ae1q7uJZ2yA6+r6aAGdTGMSH4oQ+U9omJOJbgbuti9DsBuGDDKZ1uMhrWW/l4El5y2Qdu/71wIQuI08kPegmuGl4+FLRJ2OnoGsp+BRXKpFbN0fq0YwPQhjzSHsKg64qimmzRRr5Ewd+4w1/27dJ6mopQd4zvf7+VQ4wEZgATTe/hjBw1njOOBD/WQIDAQAB
wallet.api.rsa.public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvU5WUX5MaZhS4MRfZ5OeqmSxTgjNi64SEwTiDYS++DRHRFTEguk1g5AbiW3l9eEdATeVk0WX+T6ZIIa2do3bQOKhlMtRwWMWQIucjGa7ySOCuicvnCD2HAQ2EThfqQdSpAW5UpcyodrhcyUkuevBA4fQQ06k9lB4FjqWtao2+aYFIPFPu8Wu28KI/9QIMLI02Q1YY3duJ67QW4EM4I2oS0t3sWJeZtIJPRHFWW1EaLJz2FdbJJq+z6D2p++9pmkHsvdnktUUO+nPL3PCLtxGYxEwr/AqTYR/1yXfkVWe3nHXc+qvRt967X1hDHC+gEPJItr7kUk3pQTGBv9kNu75DwIDAQAB
wallet.org.id=420289242456261

1
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -171,6 +171,7 @@ huoMa.franchise.stores.password = Huoma@123456.
huoMa.restaurant.stores.account = 15167817007
huoMa.restaurant.stores.password = Huoma@123456.
wallet.org.id=140732221567301
wallet.url=https://api.dev.wenmatech.com:443
wallet.api.yzt.key=360155690205317
cool.api.rsa.private.key=MIIEpQIBAAKCAQEA0erPAWesjkp9J4htmfCyqKS9npmT9dW3KqWTfb4c7x/QBUtKuokWOO0XikHd4bGUa9kl+twSv/5A3kYz1B9eg6wRuDJoads+G5U7rVQjzdoUtLaf3lNXkuSehl4uHUPQfNa6vcmvzraXPxJjEpYzj9WZh7uJqq2oSgw42H1qdbFCXSaE5BwsOb+2vZXjzh4RO10Sy3Qb1UqGsoZoxVzrtDeEctCjrecFyQr96L2UtYa4NTxSTfu4rgObrwIOMvqqnLsXEzK/rd6kIHYjkZYQCOa48AedWp2YKQ7Ldclj+VMLnXvl42J9exVkbs++8k3P5sI9fdZX4Ey2RBjnSoAo/QIDAQABAoIBACbBGi8I+CE77M+13wAu4RkD8xL7CQc3ic2ojGqIRPi7r5CuphD6mpzvXqtyfhd7DKr9h8bAxwBlnQ28ObjVgsI96/aM7dxvMs/uVPpqwIJyWuTDG5A05EPVC9REQnC6Mp09mnPL7rZz3Mfy6dIGY2YQWfwmWiPl1B45k+wZ+WPZPI0JVnvRzM881kf4aAhEAt08i9VoihylwVAjWIPmLuhf6ZcqI5q8iUsjfO22wZJsudVTCA/dsJdNxv+1RDKeYnSLJL79cZQcodqEhFqTy6vnn2dMsaHH7dpphU27barxUjeL482SR7kFfMqEXn5sltRn/3ep+3sf4Ph2vMtoZeECgYEA6gXzEtT9ZOeAMp4BRGmfNZ0TQLprPPVSwudz/uUBE4j/vyhfXkh9p7hqwyoxN+Z8b65yINvx8yP6hge6ek/MyAwBCZyfIRxZAPZu1eEGoYKl391ubFt2EIVqrN2DtAvzHMr5B/E2VHBq6AJm/rERFX5oKsg6zHS9tPLhgGnWVd0CgYEA5aFWOrtiqZJlp1MHQ4OeWBJatBSynkORdxCW7ic0CKbkYus0NSz1SsvskpbnfEXNB53x98qJxRhSopg/DC4m7XqxjSf9lY3HH4Y/9907olj33yGAnLWC88GivVndt577u/XhYRCk33vOQ3GoibEdjnpMOkWmOfwYG/FsRWWQvaECgYEA1N2siEisZIgel+wZAv2AD+hchtgKi1wqd5bIb+Yl4HsRBfPXK4+MnG6mzfcm5c4FCiEHNtRZc+waCKgm+vJzNtOUbgXEyP1cCAAgOPOCcI7CCqsDshRPhB+XNL4Y+kCUVnBZrNu/q3bGB1uIC8tL2t0sKx4OPcNCe8EhVQjwKRECgYEA4uothdhKRPtwDIsVsHfN74Yjr7SMVay7gIcaPrjqyGnzYnS+oJWOx50AaFNK6Rko5JAF3jF9NxE0B4yfMPAic6Y88hpEkpcJ4HMPn2Y1WdbFCu/WYgVUJICCys6VNLCcXj85umtyIY38Y9VbEMW/SV49GZBeFQqy4FoP/fvBrkECgYEAnfjTDYwgdmJdsUqyNzAocwcJXG2rVtYc7Txrl0TltcwuJmgoSywdzyOP2R9+NZsfoxWDzG0/yr15ApMvUcnnTwHN/8bGQ9SLatFLKqS4EtdwDKKS1JvNbs7V1myQGpt7jbShZOI0e6Fs4xP8ujxsLeGgiq9mZrS9UdRj5XKDoVM=