|
|
|
@@ -1,6 +1,7 @@ |
|
|
|
package com.iformall.controller; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.WxCUserBasicInfo; |
|
|
|
@@ -8,7 +9,10 @@ import com.iformall.domain.po.WxCreditHistory; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxMerchantBUser; |
|
|
|
import com.iformall.domain.vo.WxCreditHistoryVo; |
|
|
|
import com.iformall.domain.vo.WxMerchantVo; |
|
|
|
import com.iformall.enums.EnumUserType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.WxCUserBasicInfoService; |
|
|
|
import com.iformall.service.WxCreditHistoryService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
@@ -44,6 +48,14 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
@ApiImplicitParam(name="spend",value="消费金额",dataType="int", paramType = "query",required=true)}) |
|
|
|
public ResultData findByMerchantIdAndSpend(@RequestParam Long merchantId, @RequestParam String spendStr) { |
|
|
|
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend"); |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setStatus(EnumYesOrNo.YES.getCode()); |
|
|
|
wxMerchant.setId(getUser().getMerchantId()); |
|
|
|
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(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,getTenantId())); |
|
|
|
} |
|
|
|
|
|
|
|
|