[积分][修改]:普通商户只会调用自己的id返回

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

@@ -54,7 +54,7 @@ public class WxCreditHistoryController extends BaseController  {
         wxMerchant = wxMerchantService.findOne(wxMerchant);
         //普通商户只允许查询自己的消费金额所增加的积分
         if (wxMerchant.getIsAdmin() != EnumYesOrNo.YES.getCode() && merchantId.longValue() != getUser().getMerchantId().longValue()) {
-            throw new MallinkException(ErrorCode.USER_NO_PERMISSION);
+            return new ResultData(ErrorCode.USER_NO_PERMISSION);
         }
         return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,getTenantId()));
     }