[营销结算][修改][总计]

mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java

@@ -63,7 +63,9 @@ public class WxMerchantSubsidyController extends BaseController {
         if (null == wxMerchantSubsidy) {
             wxMerchantSubsidy = new WxMerchantSubsidyVo();
         }
-        wxMerchantSubsidy.setTenantId(getTenantId());
+        WxMerchantBUser user = getUser();
+        wxMerchantSubsidy.setTenantId(user.getTenantId());
+        wxMerchantSubsidy.setMerchantId(user.getMerchantId());
         Map<String, Long> data = wxMerchantSubsidyService.summary(wxMerchantSubsidy);
         return new ResultData(data);
     }