czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangw
2025-10-29 17:29:39 +08:00
parent 242ccbf95e 54d7d73b25
commit f078333d37
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/BaseWx.java
View File

@@ -364,14 +364,14 @@ public abstract class BaseWx {
Map<String, Object> params = new java.util.HashMap<>(Map.of( Map<String, Object> params = new java.util.HashMap<>(Map.of(
"appid", config.appId, "appid", config.appId,
"out_bill_no", billNo, "out_bill_no", billNo,
"transfer_scene_id", "1005", "transfer_scene_id", "1000",
"openid", openId, "openid", openId,
"transfer_amount", amount.multiply(BigDecimal.valueOf(100)).intValue(), "transfer_amount", amount.multiply(BigDecimal.valueOf(100)).intValue(),
"transfer_remark", remark, "transfer_remark", remark,
"notify_url", config.transferNotifyUrl, "notify_url", config.transferNotifyUrl,
"transfer_scene_report_infos", new Object[]{ "transfer_scene_report_infos", new Object[]{
Map.of("info_type", "岗位类型", "info_content", "加盟商"), Map.of("info_type", "活动名称", "info_content", "分销奖励"),
Map.of("info_type", "报酬说明", "info_content", "测试") Map.of("info_type", "奖励说明", "info_content", "用户提现")
} }
)); ));
if (amount.compareTo(BigDecimal.valueOf(0.3)) >= 0) { if (amount.compareTo(BigDecimal.valueOf(0.3)) >= 0) {

1
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
View File

@@ -689,6 +689,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void withdrawNotify(String outBillNo, String state) { public void withdrawNotify(String outBillNo, String state) {
MkDistributionWithdrawFlow flow = withdrawFlowService.getOne(new QueryWrapper().eq(MkDistributionWithdrawFlow::getBillNo, outBillNo)); MkDistributionWithdrawFlow flow = withdrawFlowService.getOne(new QueryWrapper().eq(MkDistributionWithdrawFlow::getBillNo, outBillNo));
AssertUtil.isNull(flow, "提现记录不存在"); AssertUtil.isNull(flow, "提现记录不存在");