| @@ -22,7 +22,7 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -122,7 +122,7 @@ public class WxLegionActivityOrderController extends BaseController { | |||||
| if(wxLegionActivityOrder == null){ | if(wxLegionActivityOrder == null){ | ||||
| return new ResultData(Result.ERROR,"id 不能为空"); | return new ResultData(Result.ERROR,"id 不能为空"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxLegionActivityOrder.getAuditRemark())){ | |||||
| if(StringUtils.isBlank(wxLegionActivityOrder.getAuditRemark())){ | |||||
| return new ResultData(Result.ERROR,"驳回意见不能为空"); | return new ResultData(Result.ERROR,"驳回意见不能为空"); | ||||
| } | } | ||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| @@ -153,8 +153,8 @@ public class WxLegionActivityOrderController extends BaseController { | |||||
| if(wxLegionActivityOrder.getActivityId() == null){ | if(wxLegionActivityOrder.getActivityId() == null){ | ||||
| return new ResultData(Result.ERROR,"活动ID不能为空"); | return new ResultData(Result.ERROR,"活动ID不能为空"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxLegionActivityOrder.getCusPhone()) | |||||
| && StringUtil.isBlank(wxLegionActivityOrder.getCusVipNum())){ | |||||
| if(StringUtils.isBlank(wxLegionActivityOrder.getCusPhone()) | |||||
| && StringUtils.isBlank(wxLegionActivityOrder.getCusVipNum())){ | |||||
| return new ResultData(Result.ERROR,"请输入用户手机号或vip卡号"); | return new ResultData(Result.ERROR,"请输入用户手机号或vip卡号"); | ||||
| } | } | ||||
| @@ -19,7 +19,6 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -19,7 +19,6 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -13,7 +13,7 @@ import com.iformall.service.WxOfflineActivityGrantAwardService; | |||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -43,7 +43,7 @@ public class WxOfflineActivityGrantController extends BaseController { | |||||
| if(wxOfflineActivityRecord.getActivityId() == null){ | if(wxOfflineActivityRecord.getActivityId() == null){ | ||||
| return new ResultData(Result.ERROR,"请选择活动"); | return new ResultData(Result.ERROR,"请选择活动"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxOfflineActivityRecord.getCusPhone())){ | |||||
| if(StringUtils.isBlank(wxOfflineActivityRecord.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"请输入用户手机号"); | return new ResultData(Result.ERROR,"请输入用户手机号"); | ||||
| } | } | ||||
| @@ -60,7 +60,7 @@ public class WxOfflineActivityGrantController extends BaseController { | |||||
| if(wxOfflineActivityRecord.getActivityId() == null){ | if(wxOfflineActivityRecord.getActivityId() == null){ | ||||
| return new ResultData(Result.ERROR,"请选择活动"); | return new ResultData(Result.ERROR,"请选择活动"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxOfflineActivityRecord.getCusPhone())){ | |||||
| if(StringUtils.isBlank(wxOfflineActivityRecord.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"请输入用户手机号"); | return new ResultData(Result.ERROR,"请输入用户手机号"); | ||||
| } | } | ||||
| @@ -78,7 +78,7 @@ public class WxOfflineActivityGrantController extends BaseController { | |||||
| if(wxOfflineActivityRecord.getActivityId() == null){ | if(wxOfflineActivityRecord.getActivityId() == null){ | ||||
| throw new MallinkException(Result.ERROR,"请选择活动"); | throw new MallinkException(Result.ERROR,"请选择活动"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxOfflineActivityRecord.getCusPhone())){ | |||||
| if(StringUtils.isBlank(wxOfflineActivityRecord.getCusPhone())){ | |||||
| throw new MallinkException(Result.ERROR,"请输入用户手机号"); | throw new MallinkException(Result.ERROR,"请输入用户手机号"); | ||||
| } | } | ||||
| @@ -97,7 +97,7 @@ public class WxOfflineActivityGrantController extends BaseController { | |||||
| // if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){ | // if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){ | ||||
| // return new ResultData(Result.ERROR,"请选择订单"); | // return new ResultData(Result.ERROR,"请选择订单"); | ||||
| // } | // } | ||||
| if(StringUtil.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ | |||||
| if(StringUtils.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ | |||||
| throw new MallinkException(Result.ERROR,"用户手机号为空"); | throw new MallinkException(Result.ERROR,"用户手机号为空"); | ||||
| } | } | ||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| @@ -124,10 +124,10 @@ public class WxOfflineActivityGrantController extends BaseController { | |||||
| // if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){ | // if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){ | ||||
| // return new ResultData(Result.ERROR,"请选择订单"); | // return new ResultData(Result.ERROR,"请选择订单"); | ||||
| // } | // } | ||||
| if(StringUtil.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ | |||||
| if(StringUtils.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ | |||||
| throw new MallinkException(Result.ERROR,"用户手机号为空"); | throw new MallinkException(Result.ERROR,"用户手机号为空"); | ||||
| } | } | ||||
| // if(StringUtil.isBlank(wxOfflineActivityGrantAward.getSignImg())){ | |||||
| // if(StringUtils.isBlank(wxOfflineActivityGrantAward.getSignImg())){ | |||||
| // return new ResultData(Result.ERROR,"签名为空"); | // return new ResultData(Result.ERROR,"签名为空"); | ||||
| // } | // } | ||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| @@ -152,7 +152,7 @@ public class WxOfflineActivityGrantController extends BaseController { | |||||
| if(wxOfflineActivityGrantAward.getActivityId() == null){ | if(wxOfflineActivityGrantAward.getActivityId() == null){ | ||||
| return new ResultData(Result.ERROR,"活动ID为空"); | return new ResultData(Result.ERROR,"活动ID为空"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ | |||||
| if(StringUtils.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ | |||||
| throw new MallinkException(Result.ERROR,"用户手机号为空"); | throw new MallinkException(Result.ERROR,"用户手机号为空"); | ||||
| } | } | ||||
| // if(wxOfflineActivityGrantAward.getRecordId() == null){ | // if(wxOfflineActivityGrantAward.getRecordId() == null){ | ||||
| @@ -18,7 +18,7 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -119,7 +119,7 @@ public class WxOfflineActivityRecordController extends BaseController { | |||||
| if(wxOfflineActivityRecord == null){ | if(wxOfflineActivityRecord == null){ | ||||
| return new ResultData(Result.ERROR,"id 不能为空"); | return new ResultData(Result.ERROR,"id 不能为空"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxOfflineActivityRecord.getAuditRemark())){ | |||||
| if(StringUtils.isBlank(wxOfflineActivityRecord.getAuditRemark())){ | |||||
| return new ResultData(Result.ERROR,"驳回意见不能为空"); | return new ResultData(Result.ERROR,"驳回意见不能为空"); | ||||
| } | } | ||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| @@ -17,7 +17,6 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -15,7 +15,6 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -17,7 +17,7 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -64,7 +64,7 @@ public class WxLegionActivityOrderController extends BaseController { | |||||
| if(wxLegionActivityOrder.getActivityId() == null){ | if(wxLegionActivityOrder.getActivityId() == null){ | ||||
| return new ResultData(Result.ERROR,"活动ID不能为空"); | return new ResultData(Result.ERROR,"活动ID不能为空"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxLegionActivityOrder.getOrderNo())){ | |||||
| if(StringUtils.isBlank(wxLegionActivityOrder.getOrderNo())){ | |||||
| return new ResultData(Result.ERROR,"订单号不能为空"); | return new ResultData(Result.ERROR,"订单号不能为空"); | ||||
| } | } | ||||
| if (null == wxLegionActivityOrder.getOrderMoney() ) { | if (null == wxLegionActivityOrder.getOrderMoney() ) { | ||||
| @@ -73,7 +73,7 @@ public class WxLegionActivityOrderController extends BaseController { | |||||
| if(wxLegionActivityOrder.getCusId() == null){ | if(wxLegionActivityOrder.getCusId() == null){ | ||||
| return new ResultData(Result.ERROR,"未查询到用户,请先进行VIP卡绑定"); | return new ResultData(Result.ERROR,"未查询到用户,请先进行VIP卡绑定"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxLegionActivityOrder.getCusPhone())){ | |||||
| if(StringUtils.isBlank(wxLegionActivityOrder.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"客户手机号不能为空"); | return new ResultData(Result.ERROR,"客户手机号不能为空"); | ||||
| } | } | ||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| @@ -18,7 +18,7 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -66,10 +66,10 @@ public class WxLegionActivityUserController extends BaseController { | |||||
| if(wxLegionActivityUser.getActivityId() == null){ | if(wxLegionActivityUser.getActivityId() == null){ | ||||
| return new ResultData(Result.ERROR,"活动ID不能为空"); | return new ResultData(Result.ERROR,"活动ID不能为空"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxLegionActivityUser.getPhone())){ | |||||
| if(StringUtils.isBlank(wxLegionActivityUser.getPhone())){ | |||||
| return new ResultData(Result.ERROR,"客户手机号不能为空"); | return new ResultData(Result.ERROR,"客户手机号不能为空"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxLegionActivityUser.getVipNum())){ | |||||
| if(StringUtils.isBlank(wxLegionActivityUser.getVipNum())){ | |||||
| return new ResultData(Result.ERROR,"vip卡号不能为空"); | return new ResultData(Result.ERROR,"vip卡号不能为空"); | ||||
| } | } | ||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| @@ -122,7 +122,7 @@ public class WxLegionActivityUserController extends BaseController { | |||||
| if(wxLegionActivityUser.getActivityId() == null){ | if(wxLegionActivityUser.getActivityId() == null){ | ||||
| return new ResultData(Result.ERROR,"活动ID不能为空"); | return new ResultData(Result.ERROR,"活动ID不能为空"); | ||||
| } | } | ||||
| if(StringUtil.isBlank(wxLegionActivityUser.getPhone())){ | |||||
| if(StringUtils.isBlank(wxLegionActivityUser.getPhone())){ | |||||
| return new ResultData(Result.ERROR,"客户手机号不能为空"); | return new ResultData(Result.ERROR,"客户手机号不能为空"); | ||||
| } | } | ||||
| TenantEntity tenantInfo = getTenantInfo(); | TenantEntity tenantInfo = getTenantInfo(); | ||||
| @@ -13,7 +13,7 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -53,7 +53,7 @@ public class WxOfflineActivityRecordController extends BaseController { | |||||
| @ApiOperation("新增修改接口") | @ApiOperation("新增修改接口") | ||||
| @PostMapping("saveOrUpdate") | @PostMapping("saveOrUpdate") | ||||
| public ResultData saveOrUpdate(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { | public ResultData saveOrUpdate(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { | ||||
| if(StringUtil.isBlank(wxOfflineActivityRecord.getCusPhone())){ | |||||
| if(StringUtils.isBlank(wxOfflineActivityRecord.getCusPhone())){ | |||||
| return new ResultData(Result.ERROR,"客户手机号不能为空"); | return new ResultData(Result.ERROR,"客户手机号不能为空"); | ||||
| } | } | ||||
| if (null == wxOfflineActivityRecord.getOrderMoney() ) { | if (null == wxOfflineActivityRecord.getOrderMoney() ) { | ||||
| @@ -16,7 +16,6 @@ import com.iformall.exception.MallinkException; | |||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import com.iformall.utils.DateUtils; | import com.iformall.utils.DateUtils; | ||||
| import jodd.util.StringUtil; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
| @@ -19,7 +19,7 @@ import com.iformall.mapper.WxVtwoSpecialTopicActivityMapper; | |||||
| import com.iformall.service.WxVtwoActivitySpecialTopicService; | import com.iformall.service.WxVtwoActivitySpecialTopicService; | ||||
| import com.iformall.mapper.WxVtwoActivitySpecialTopicMapper; | import com.iformall.mapper.WxVtwoActivitySpecialTopicMapper; | ||||
| import com.iformall.service.WxVtwoSpecialTopicActivityService; | import com.iformall.service.WxVtwoSpecialTopicActivityService; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
| @@ -124,7 +124,7 @@ public class WxVtwoActivitySpecialTopicServiceImpl extends ServiceImpl<WxVtwoAct | |||||
| if (specialTopic == null) { | if (specialTopic == null) { | ||||
| return null; | return null; | ||||
| } | } | ||||
| if(StringUtil.isNotBlank(specialTopic.getCreditConfig())){ | |||||
| if(StringUtils.isNotBlank(specialTopic.getCreditConfig())){ | |||||
| specialTopic.setCreditConfigObject(JSONObject.parseObject(specialTopic.getCreditConfig(), WxVtwoActivityCreditRule.class)); | specialTopic.setCreditConfigObject(JSONObject.parseObject(specialTopic.getCreditConfig(), WxVtwoActivityCreditRule.class)); | ||||
| } | } | ||||
| @@ -17,7 +17,7 @@ import com.iformall.mapper.*; | |||||
| import com.iformall.service.WxVtwoActivityAwardService; | import com.iformall.service.WxVtwoActivityAwardService; | ||||
| import com.iformall.service.WxVtwoActivityMerchantService; | import com.iformall.service.WxVtwoActivityMerchantService; | ||||
| import com.iformall.service.WxVtwoAmountGiftActivityService; | import com.iformall.service.WxVtwoAmountGiftActivityService; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
| @@ -172,10 +172,10 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl<WxVtwoAmoun | |||||
| if (amountGiftActivity == null) { | if (amountGiftActivity == null) { | ||||
| return null; | return null; | ||||
| } | } | ||||
| if(StringUtil.isNotBlank(amountGiftActivity.getAmountRules())){ | |||||
| if(StringUtils.isNotBlank(amountGiftActivity.getAmountRules())){ | |||||
| amountGiftActivity.setAmountRulesObject(JSONObject.parseArray(amountGiftActivity.getAmountRules(), WxVtwoActivityRuleDetail.class)); | amountGiftActivity.setAmountRulesObject(JSONObject.parseArray(amountGiftActivity.getAmountRules(), WxVtwoActivityRuleDetail.class)); | ||||
| } | } | ||||
| if(StringUtil.isNotBlank(amountGiftActivity.getRelatedRules())){ | |||||
| if(StringUtils.isNotBlank(amountGiftActivity.getRelatedRules())){ | |||||
| amountGiftActivity.setRelatedRulesObject(JSONObject.parseArray(amountGiftActivity.getRelatedRules(), WxVtwoActivityRuleDetail.class)); | amountGiftActivity.setRelatedRulesObject(JSONObject.parseArray(amountGiftActivity.getRelatedRules(), WxVtwoActivityRuleDetail.class)); | ||||
| } | } | ||||
| @@ -15,7 +15,7 @@ import com.iformall.service.WxVtwoActivityAwardService; | |||||
| import com.iformall.service.WxVtwoActivityMerchantService; | import com.iformall.service.WxVtwoActivityMerchantService; | ||||
| import com.iformall.service.WxVtwoCashBackActivityService; | import com.iformall.service.WxVtwoCashBackActivityService; | ||||
| import com.iformall.service.WxVtwoCashBackAwardService; | import com.iformall.service.WxVtwoCashBackAwardService; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
| @@ -171,7 +171,7 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl<WxVtwoCashBac | |||||
| return null; | return null; | ||||
| } | } | ||||
| if(StringUtil.isNotBlank(cashBackActivity.getTaxDeductionRules())){ | |||||
| if(StringUtils.isNotBlank(cashBackActivity.getTaxDeductionRules())){ | |||||
| cashBackActivity.setTaxDeductionRulesObject(JSONObject.parseObject(cashBackActivity.getTaxDeductionRules(), WxVtwoActivityTaxDeductionRule.class)); | cashBackActivity.setTaxDeductionRulesObject(JSONObject.parseObject(cashBackActivity.getTaxDeductionRules(), WxVtwoActivityTaxDeductionRule.class)); | ||||
| } | } | ||||
| @@ -21,7 +21,7 @@ import com.iformall.mapper.*; | |||||
| import com.iformall.service.WxVtwoActivityAwardService; | import com.iformall.service.WxVtwoActivityAwardService; | ||||
| import com.iformall.service.WxVtwoActivityMerchantService; | import com.iformall.service.WxVtwoActivityMerchantService; | ||||
| import com.iformall.service.WxVtwoPrizeDrawActivityService; | import com.iformall.service.WxVtwoPrizeDrawActivityService; | ||||
| import jodd.util.StringUtil; | |||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
| @@ -177,10 +177,10 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD | |||||
| if (prizeDrawActivity == null) { | if (prizeDrawActivity == null) { | ||||
| return null; | return null; | ||||
| } | } | ||||
| if(StringUtil.isNotBlank(prizeDrawActivity.getAmountRules())){ | |||||
| if(StringUtils.isNotBlank(prizeDrawActivity.getAmountRules())){ | |||||
| prizeDrawActivity.setAmountRulesObject(JSONObject.parseObject(prizeDrawActivity.getAmountRules(), WxVtwoActivityRule.class)); | prizeDrawActivity.setAmountRulesObject(JSONObject.parseObject(prizeDrawActivity.getAmountRules(), WxVtwoActivityRule.class)); | ||||
| } | } | ||||
| if(StringUtil.isNotBlank(prizeDrawActivity.getRelatedRules())){ | |||||
| if(StringUtils.isNotBlank(prizeDrawActivity.getRelatedRules())){ | |||||
| prizeDrawActivity.setRelatedRulesObject(JSONObject.parseArray(prizeDrawActivity.getRelatedRules(), WxVtwoActivityRuleDetail.class)); | prizeDrawActivity.setRelatedRulesObject(JSONObject.parseArray(prizeDrawActivity.getRelatedRules(), WxVtwoActivityRuleDetail.class)); | ||||
| } | } | ||||