|
|
|
@@ -10,10 +10,7 @@ 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.EnumMerchantStatus; |
|
|
|
import com.iformall.enums.EnumMerchantType; |
|
|
|
import com.iformall.enums.EnumUserType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.enums.*; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.WxCUserBasicInfoService; |
|
|
|
import com.iformall.service.WxCreditHistoryService; |
|
|
|
@@ -84,11 +81,17 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
wxMerchant.setId(getUser().getMerchantId()); |
|
|
|
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
WxMerchant merchant = wxMerchantService.findOne(wxMerchant); |
|
|
|
//如果为商管商户 则消费商户按前端传入的进行记录 |
|
|
|
if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { |
|
|
|
wxCreditHistory.setMerchantId(wxCreditHistory.getMerchantId()); |
|
|
|
}else { |
|
|
|
//消费积分:取当前人的商户ID |
|
|
|
if (wxCreditHistory.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) { |
|
|
|
wxCreditHistory.setMerchantId(getUser().getMerchantId()); |
|
|
|
} else { |
|
|
|
//新增积分: |
|
|
|
//如果为商管商户 则消费商户按前端传入的进行记录 |
|
|
|
if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { |
|
|
|
wxCreditHistory.setMerchantId(wxCreditHistory.getMerchantId()); |
|
|
|
} else { |
|
|
|
wxCreditHistory.setMerchantId(getUser().getMerchantId()); |
|
|
|
} |
|
|
|
} |
|
|
|
//B端操作用户 |
|
|
|
wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); |
|
|
|
|