|
|
|
@@ -10,6 +10,8 @@ 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.exception.MallinkException; |
|
|
|
@@ -78,7 +80,16 @@ public class WxCreditHistoryController extends BaseController { |
|
|
|
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); |
|
|
|
wxCreditHistory.setTenantId(getTenantId()); |
|
|
|
wxCreditHistory.setOperatorId(getUser().getId()); |
|
|
|
wxCreditHistory.setMerchantId(getUser().getMerchantId()); |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
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 { |
|
|
|
wxCreditHistory.setMerchantId(getUser().getMerchantId()); |
|
|
|
} |
|
|
|
//B端操作用户 |
|
|
|
wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); |
|
|
|
try { |
|
|
|
|