Просмотр исходного кода

//activity v.2

release_toaliyun_real
xiaohu 1 год назад
Родитель
Сommit
b55de37399
15 измененных файлов: 33 добавлений и 38 удалений
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java
  2. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityUserController.java
  3. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java
  4. +8
    -8
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java
  5. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java
  6. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java
  7. +0
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java
  8. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityOrderController.java
  9. +4
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityUserController.java
  10. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java
  11. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java
  12. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivitySpecialTopicServiceImpl.java
  13. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java
  14. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java
  15. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java

+ 4
- 4
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卡号");
}



+ 0
- 1
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;


+ 0
- 1
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;


+ 8
- 8
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){


+ 2
- 2
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();


+ 0
- 1
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;


+ 0
- 1
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;


+ 3
- 3
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();


+ 4
- 4
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();


+ 2
- 2
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() ) {


+ 0
- 1
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;


+ 2
- 2
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<WxVtwoAct
if (specialTopic == null) {
return null;
}
if(StringUtil.isNotBlank(specialTopic.getCreditConfig())){
if(StringUtils.isNotBlank(specialTopic.getCreditConfig())){
specialTopic.setCreditConfigObject(JSONObject.parseObject(specialTopic.getCreditConfig(), WxVtwoActivityCreditRule.class));
}



+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java Просмотреть файл

@@ -17,7 +17,7 @@ import com.iformall.mapper.*;
import com.iformall.service.WxVtwoActivityAwardService;
import com.iformall.service.WxVtwoActivityMerchantService;
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -172,10 +172,10 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl<WxVtwoAmoun
if (amountGiftActivity == null) {
return null;
}
if(StringUtil.isNotBlank(amountGiftActivity.getAmountRules())){
if(StringUtils.isNotBlank(amountGiftActivity.getAmountRules())){
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));
}



+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java Просмотреть файл

@@ -15,7 +15,7 @@ import com.iformall.service.WxVtwoActivityAwardService;
import com.iformall.service.WxVtwoActivityMerchantService;
import com.iformall.service.WxVtwoCashBackActivityService;
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -171,7 +171,7 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl<WxVtwoCashBac
return null;
}

if(StringUtil.isNotBlank(cashBackActivity.getTaxDeductionRules())){
if(StringUtils.isNotBlank(cashBackActivity.getTaxDeductionRules())){
cashBackActivity.setTaxDeductionRulesObject(JSONObject.parseObject(cashBackActivity.getTaxDeductionRules(), WxVtwoActivityTaxDeductionRule.class));
}



+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java Просмотреть файл

@@ -21,7 +21,7 @@ import com.iformall.mapper.*;
import com.iformall.service.WxVtwoActivityAwardService;
import com.iformall.service.WxVtwoActivityMerchantService;
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -177,10 +177,10 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD
if (prizeDrawActivity == null) {
return null;
}
if(StringUtil.isNotBlank(prizeDrawActivity.getAmountRules())){
if(StringUtils.isNotBlank(prizeDrawActivity.getAmountRules())){
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));
}



Загрузка…
Отмена
Сохранить