fix

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();
     }