From b55de37399e247b4093d967c8d8c6de8356f9b24 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Wed, 21 May 2025 13:14:28 +0800 Subject: [PATCH] //activity v.2 --- .../market/WxLegionActivityOrderController.java | 8 ++++---- .../market/WxLegionActivityUserController.java | 1 - .../market/WxOfflineActivityController.java | 1 - .../market/WxOfflineActivityGrantController.java | 16 ++++++++-------- .../WxOfflineActivityRecordController.java | 4 ++-- .../WxOfflineActivitySettlementController.java | 1 - .../controller/WxLegionActivityController.java | 1 - .../WxLegionActivityOrderController.java | 6 +++--- .../WxLegionActivityUserController.java | 8 ++++---- .../WxOfflineActivityRecordController.java | 4 ++-- .../impl/WxLegionActivityOrderServiceImpl.java | 1 - .../WxVtwoActivitySpecialTopicServiceImpl.java | 4 ++-- .../WxVtwoAmountGiftActivityServiceImpl.java | 6 +++--- .../impl/WxVtwoCashBackActivityServiceImpl.java | 4 ++-- .../impl/WxVtwoPrizeDrawActivityServiceImpl.java | 6 +++--- 15 files changed, 33 insertions(+), 38 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java index 8c7ffdc5c..89423202c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java @@ -22,7 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -122,7 +122,7 @@ public class WxLegionActivityOrderController extends BaseController { if(wxLegionActivityOrder == null){ return new ResultData(Result.ERROR,"id 不能为空"); } - if(StringUtil.isBlank(wxLegionActivityOrder.getAuditRemark())){ + if(StringUtils.isBlank(wxLegionActivityOrder.getAuditRemark())){ return new ResultData(Result.ERROR,"驳回意见不能为空"); } TenantEntity tenantEntity = getTenantInfo(); @@ -153,8 +153,8 @@ public class WxLegionActivityOrderController extends BaseController { if(wxLegionActivityOrder.getActivityId() == null){ 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卡号"); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityUserController.java index cdca4e1ce..9f7cdfcac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityUserController.java @@ -19,7 +19,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java index b7276ff13..d6654f9c3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java @@ -19,7 +19,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java index adf27a1c5..84e16b7f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java @@ -13,7 +13,7 @@ import com.iformall.service.WxOfflineActivityGrantAwardService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -43,7 +43,7 @@ public class WxOfflineActivityGrantController extends BaseController { if(wxOfflineActivityRecord.getActivityId() == null){ return new ResultData(Result.ERROR,"请选择活动"); } - if(StringUtil.isBlank(wxOfflineActivityRecord.getCusPhone())){ + if(StringUtils.isBlank(wxOfflineActivityRecord.getCusPhone())){ return new ResultData(Result.ERROR,"请输入用户手机号"); } @@ -60,7 +60,7 @@ public class WxOfflineActivityGrantController extends BaseController { if(wxOfflineActivityRecord.getActivityId() == null){ return new ResultData(Result.ERROR,"请选择活动"); } - if(StringUtil.isBlank(wxOfflineActivityRecord.getCusPhone())){ + if(StringUtils.isBlank(wxOfflineActivityRecord.getCusPhone())){ return new ResultData(Result.ERROR,"请输入用户手机号"); } @@ -78,7 +78,7 @@ public class WxOfflineActivityGrantController extends BaseController { if(wxOfflineActivityRecord.getActivityId() == null){ throw new MallinkException(Result.ERROR,"请选择活动"); } - if(StringUtil.isBlank(wxOfflineActivityRecord.getCusPhone())){ + if(StringUtils.isBlank(wxOfflineActivityRecord.getCusPhone())){ throw new MallinkException(Result.ERROR,"请输入用户手机号"); } @@ -97,7 +97,7 @@ public class WxOfflineActivityGrantController extends BaseController { // if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){ // return new ResultData(Result.ERROR,"请选择订单"); // } - if(StringUtil.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ + if(StringUtils.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ throw new MallinkException(Result.ERROR,"用户手机号为空"); } TenantEntity tenantEntity = getTenantInfo(); @@ -124,10 +124,10 @@ public class WxOfflineActivityGrantController extends BaseController { // if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){ // return new ResultData(Result.ERROR,"请选择订单"); // } - if(StringUtil.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ + if(StringUtils.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ throw new MallinkException(Result.ERROR,"用户手机号为空"); } -// if(StringUtil.isBlank(wxOfflineActivityGrantAward.getSignImg())){ +// if(StringUtils.isBlank(wxOfflineActivityGrantAward.getSignImg())){ // return new ResultData(Result.ERROR,"签名为空"); // } TenantEntity tenantEntity = getTenantInfo(); @@ -152,7 +152,7 @@ public class WxOfflineActivityGrantController extends BaseController { if(wxOfflineActivityGrantAward.getActivityId() == null){ return new ResultData(Result.ERROR,"活动ID为空"); } - if(StringUtil.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ + if(StringUtils.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ throw new MallinkException(Result.ERROR,"用户手机号为空"); } // if(wxOfflineActivityGrantAward.getRecordId() == null){ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java index 2f4fd23b1..c107814b1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java @@ -18,7 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -119,7 +119,7 @@ public class WxOfflineActivityRecordController extends BaseController { if(wxOfflineActivityRecord == null){ return new ResultData(Result.ERROR,"id 不能为空"); } - if(StringUtil.isBlank(wxOfflineActivityRecord.getAuditRemark())){ + if(StringUtils.isBlank(wxOfflineActivityRecord.getAuditRemark())){ return new ResultData(Result.ERROR,"驳回意见不能为空"); } TenantEntity tenantEntity = getTenantInfo(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java index 717f92204..df55e8396 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java @@ -17,7 +17,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java index 74c8c7c24..86ea640af 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java @@ -15,7 +15,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityOrderController.java index bbb360d50..47e80cdf2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityOrderController.java @@ -17,7 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -64,7 +64,7 @@ public class WxLegionActivityOrderController extends BaseController { if(wxLegionActivityOrder.getActivityId() == null){ return new ResultData(Result.ERROR,"活动ID不能为空"); } - if(StringUtil.isBlank(wxLegionActivityOrder.getOrderNo())){ + if(StringUtils.isBlank(wxLegionActivityOrder.getOrderNo())){ return new ResultData(Result.ERROR,"订单号不能为空"); } if (null == wxLegionActivityOrder.getOrderMoney() ) { @@ -73,7 +73,7 @@ public class WxLegionActivityOrderController extends BaseController { if(wxLegionActivityOrder.getCusId() == null){ return new ResultData(Result.ERROR,"未查询到用户,请先进行VIP卡绑定"); } - if(StringUtil.isBlank(wxLegionActivityOrder.getCusPhone())){ + if(StringUtils.isBlank(wxLegionActivityOrder.getCusPhone())){ return new ResultData(Result.ERROR,"客户手机号不能为空"); } TenantEntity tenantEntity = getTenantInfo(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityUserController.java index 52395fa29..254f1d93f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityUserController.java @@ -18,7 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -66,10 +66,10 @@ public class WxLegionActivityUserController extends BaseController { if(wxLegionActivityUser.getActivityId() == null){ return new ResultData(Result.ERROR,"活动ID不能为空"); } - if(StringUtil.isBlank(wxLegionActivityUser.getPhone())){ + if(StringUtils.isBlank(wxLegionActivityUser.getPhone())){ return new ResultData(Result.ERROR,"客户手机号不能为空"); } - if(StringUtil.isBlank(wxLegionActivityUser.getVipNum())){ + if(StringUtils.isBlank(wxLegionActivityUser.getVipNum())){ return new ResultData(Result.ERROR,"vip卡号不能为空"); } TenantEntity tenantEntity = getTenantInfo(); @@ -122,7 +122,7 @@ public class WxLegionActivityUserController extends BaseController { if(wxLegionActivityUser.getActivityId() == null){ return new ResultData(Result.ERROR,"活动ID不能为空"); } - if(StringUtil.isBlank(wxLegionActivityUser.getPhone())){ + if(StringUtils.isBlank(wxLegionActivityUser.getPhone())){ return new ResultData(Result.ERROR,"客户手机号不能为空"); } TenantEntity tenantInfo = getTenantInfo(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java index ba81c0a51..67ab6e953 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java @@ -13,7 +13,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import jodd.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +53,7 @@ public class WxOfflineActivityRecordController extends BaseController { @ApiOperation("新增修改接口") @PostMapping("saveOrUpdate") public ResultData saveOrUpdate(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { - if(StringUtil.isBlank(wxOfflineActivityRecord.getCusPhone())){ + if(StringUtils.isBlank(wxOfflineActivityRecord.getCusPhone())){ return new ResultData(Result.ERROR,"客户手机号不能为空"); } if (null == wxOfflineActivityRecord.getOrderMoney() ) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java index 384c18f09..29a4785f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java @@ -16,7 +16,6 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; import com.iformall.utils.DateUtils; -import jodd.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivitySpecialTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivitySpecialTopicServiceImpl.java index 6693f67bd..1d573a7dc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivitySpecialTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivitySpecialTopicServiceImpl.java @@ -19,7 +19,7 @@ import com.iformall.mapper.WxVtwoSpecialTopicActivityMapper; import com.iformall.service.WxVtwoActivitySpecialTopicService; import com.iformall.mapper.WxVtwoActivitySpecialTopicMapper; 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.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -124,7 +124,7 @@ public class WxVtwoActivitySpecialTopicServiceImpl extends ServiceImpl