From 299189104747bfa345f70c2ae83f669020d844d6 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 3 Mar 2024 22:39:49 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/WxCashBackActivityController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java index 45ee38c43..6d6baa525 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java @@ -172,7 +172,6 @@ public class WxCashBackActivityController extends BaseController { @ApiOperation("新增修改接口") @PostMapping("saveOrUpdateRecord") public ResultData saveOrUpdate(@RequestBody WxCashBackActivityRecord wxCashBackActivityRecord) { - if (null == wxCashBackActivityRecord.getOrderMoney() ) { return new ResultData(Result.ERROR,"订单金额不能为空"); } @@ -185,6 +184,7 @@ public class WxCashBackActivityController extends BaseController { if (wxCashBackActivityRecord.getOrderMoney().compareTo(a.getLimitMoney()) < 0) { return new ResultData(Result.ERROR,"该金额低于活动标准"); } + wxCashBackActivityRecord.setMerchantId(getLoginBUser().getMerchantId()); wxCashBackActivityService.saveOrUpdateRecord(wxCashBackActivityRecord); return new ResultData(); }